Mercurial > hg > orthanc-stone
annotate Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp @ 1989:e8b9a2ba1df1
Added left/right rotation buttons
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 31 Oct 2022 20:59:59 +0100 |
parents | ba45e1b0812a |
children | 317a53d4fdc6 |
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 |
1989
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
99 #include <algorithm> |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
100 #include <boost/make_shared.hpp> |
1989
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
101 #include <boost/math/constants/constants.hpp> |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
102 #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
|
103 #include <stdio.h> |
1989
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
104 |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
105 static const double PI = boost::math::constants::pi<double>(); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
106 |
1632
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
107 #if !defined(STONE_WEB_VIEWER_EXPORT) |
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
108 // 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
|
109 # define STONE_WEB_VIEWER_EXPORT |
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
110 #endif |
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
111 |
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
112 |
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
113 #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
|
114 |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
115 |
1632
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
116 enum STONE_WEB_VIEWER_EXPORT ThumbnailType |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
117 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
118 ThumbnailType_Image, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
119 ThumbnailType_NoPreview, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
120 ThumbnailType_Pdf, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
121 ThumbnailType_Video, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
122 ThumbnailType_Loading, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
123 ThumbnailType_Unknown |
1668 | 124 }; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
125 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
126 |
1632
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
127 enum STONE_WEB_VIEWER_EXPORT DisplayedFrameQuality |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
128 { |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
129 DisplayedFrameQuality_None, |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
130 DisplayedFrameQuality_Low, |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
131 DisplayedFrameQuality_High |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
132 }; |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
133 |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
134 |
1632
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
135 enum STONE_WEB_VIEWER_EXPORT WebViewerAction |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
136 { |
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
137 WebViewerAction_None, |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
138 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
139 WebViewerAction_Windowing, |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
140 WebViewerAction_Zoom, |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
141 WebViewerAction_Pan, |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
142 WebViewerAction_Rotate, |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
143 WebViewerAction_Crosshair, |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
144 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
145 WebViewerAction_CreateAngle, |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
146 WebViewerAction_CreateCircle, |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
147 WebViewerAction_CreateSegment, |
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
148 WebViewerAction_RemoveMeasure, |
1982
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
149 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
|
150 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
|
151 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
|
152 WebViewerAction_CreateTextAnnotation // New in 2.4 |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
153 }; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
154 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
155 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
156 |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
157 static OrthancStone::MouseAction ConvertWebViewerAction(int action) |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
158 { |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
159 switch (action) |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
160 { |
1701
b5a8bf32d969
new configuration options: "CombinedToolEnabled", "CombinedToolBehaviour" and "DownloadAsJpegEnabled"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1695
diff
changeset
|
161 case WebViewerAction_Windowing: |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
162 return OrthancStone::MouseAction_GrayscaleWindowing; |
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_Zoom: |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
165 return OrthancStone::MouseAction_Zoom; |
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_Pan: |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
168 return OrthancStone::MouseAction_Pan; |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
169 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
170 case WebViewerAction_Rotate: |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
171 return OrthancStone::MouseAction_Rotate; |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
172 |
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
173 case WebViewerAction_None: |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
174 case WebViewerAction_Crosshair: |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
175 case WebViewerAction_CreateAngle: |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
176 case WebViewerAction_CreateCircle: |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
177 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
|
178 case WebViewerAction_RemoveMeasure: |
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1978
diff
changeset
|
179 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
|
180 case WebViewerAction_CreateEllipseProbe: |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
181 case WebViewerAction_CreateRectangleProbe: |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
182 case WebViewerAction_CreateTextAnnotation: |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
183 return OrthancStone::MouseAction_None; |
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 default: |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
186 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
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 } |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
189 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
190 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
191 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
192 static const int PRIORITY_HIGH = -100; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
193 static const int PRIORITY_LOW = 100; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
194 static const int PRIORITY_NORMAL = 0; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
195 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
196 static const unsigned int QUALITY_JPEG = 0; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
197 static const unsigned int QUALITY_FULL = 1; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
198 |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
199 static const unsigned int DEFAULT_CINE_RATE = 30; |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
200 |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
201 |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
202 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
203 class VirtualSeries : public boost::noncopyable |
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 class Item : public boost::noncopyable |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
207 { |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
208 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
|
209 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
|
210 std::list<std::string> sopInstanceUids_; |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
211 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
212 public: |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
213 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
|
214 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
|
215 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
|
216 sopInstanceUids_(sopInstanceUids) |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
217 { |
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 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
220 const std::string& GetSeriesInstanceUid() const |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
221 { |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
222 return seriesInstanceUid_; |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
223 } |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
224 |
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
|
225 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
|
226 { |
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
|
227 return sopInstanceUids_; |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
228 } |
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 |
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
|
231 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
|
232 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
233 Content content_; |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
234 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
235 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
|
236 { |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
237 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
|
238 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
239 if (found == content_.end()) |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
240 { |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
241 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
242 } |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
243 else |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
244 { |
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
|
245 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
|
246 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
|
247 } |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
248 } |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
249 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
250 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
|
251 ~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
|
252 { |
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 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
|
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 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
|
256 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
|
257 } |
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 } |
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
|
259 |
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::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
|
261 const std::string& sopInstanceUid) |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
262 { |
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
|
263 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
|
264 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
|
265 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
|
266 } |
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 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
|
269 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
|
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 // 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
|
272 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
|
273 |
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
|
274 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
|
275 { |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
276 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
277 } |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
278 else |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
279 { |
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
|
280 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
|
281 return virtualSeriesId; |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
282 } |
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 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
285 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
|
286 { |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
287 return GetItem(id).GetSeriesInstanceUid(); |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
288 } |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
289 |
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
|
290 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
|
291 { |
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
|
292 return GetItem(id).GetSopInstanceUids(); |
1849
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 }; |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
295 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
296 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
297 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
298 class ResourcesLoader : public OrthancStone::ObserverBase<ResourcesLoader> |
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 class IObserver : public boost::noncopyable |
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 public: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
304 virtual ~IObserver() |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
305 { |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
308 virtual void SignalResourcesLoaded() = 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 SignalSeriesThumbnailLoaded(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; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
312 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
313 virtual void SignalSeriesMetadataLoaded(const std::string& studyInstanceUid, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
314 const std::string& seriesInstanceUid) = 0; |
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
315 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
316 virtual void SignalSeriesPdfLoaded(const std::string& studyInstanceUid, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
317 const std::string& seriesInstanceUid, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
318 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
|
319 |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
320 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
|
321 const std::string& jpeg) = 0; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
322 }; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
323 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
324 private: |
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
325 OrthancStone::ILoadersContext& context_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
326 std::unique_ptr<IObserver> observer_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
327 OrthancStone::DicomSource source_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
328 size_t pending_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
329 boost::shared_ptr<OrthancStone::LoadedDicomResources> studies_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
330 boost::shared_ptr<OrthancStone::LoadedDicomResources> series_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
331 boost::shared_ptr<OrthancStone::DicomResourcesLoader> resourcesLoader_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
332 boost::shared_ptr<OrthancStone::SeriesThumbnailsLoader> thumbnailsLoader_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
333 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
|
334 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
|
335 VirtualSeries virtualSeries_; |
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
336 std::vector<std::string> skipSeriesFromModalities_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
337 |
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
338 explicit ResourcesLoader(OrthancStone::ILoadersContext& context, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
339 const OrthancStone::DicomSource& source) : |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
340 context_(context), |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
341 source_(source), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
342 pending_(0), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
343 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
|
344 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
|
345 { |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
348 void Handle(const OrthancStone::DicomResourcesLoader::SuccessMessage& message) |
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 const Orthanc::SingleValueObject<Orthanc::ResourceType>& payload = |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
351 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
|
352 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
353 OrthancStone::LoadedDicomResources& dicom = *message.GetResources(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
354 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
355 LOG(INFO) << "resources loaded: " << dicom.GetSize() |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
356 << ", " << Orthanc::EnumerationToString(payload.GetValue()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
357 |
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
358 std::vector<std::string> seriesIdsToRemove; |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
359 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
360 if (payload.GetValue() == Orthanc::ResourceType_Series) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
361 { |
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
362 // 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
|
363 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
364 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
|
365 { |
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
366 std::string studyInstanceUid, seriesInstanceUid, modality; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
367 if (dicom.GetResource(i).LookupStringValue( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
368 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
|
369 dicom.GetResource(i).LookupStringValue( |
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
370 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
|
371 dicom.GetResource(i).LookupStringValue( |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
372 modality, Orthanc::DICOM_TAG_MODALITY, false)) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
373 { |
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
374 // 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
|
375 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
|
376 { |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
377 thumbnailsLoader_->ScheduleLoadThumbnail(source_, "", studyInstanceUid, seriesInstanceUid); |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
378 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
|
379 } |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
380 |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
381 else |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
382 { |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
383 seriesIdsToRemove.push_back(seriesInstanceUid); |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
384 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
385 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
386 } |
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
387 |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
388 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
|
389 { |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
390 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
|
391 dicom.RemoveResource(seriesIdsToRemove[i]); |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
392 } |
1495
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
395 if (pending_ == 0) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
396 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
397 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
398 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
399 else |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
400 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
401 pending_ --; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
402 if (pending_ == 0 && |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
403 observer_.get() != NULL) |
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 observer_->SignalResourcesLoaded(); |
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 } |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
410 void Handle(const OrthancStone::SeriesThumbnailsLoader::SuccessMessage& message) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
411 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
412 if (observer_.get() != NULL) |
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 observer_->SignalSeriesThumbnailLoaded( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
415 message.GetStudyInstanceUid(), message.GetSeriesInstanceUid()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
416 } |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
419 void Handle(const OrthancStone::SeriesMetadataLoader::SuccessMessage& message) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
420 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
421 if (observer_.get() != NULL) |
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 observer_->SignalSeriesMetadataLoaded( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
424 message.GetStudyInstanceUid(), message.GetSeriesInstanceUid()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
425 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
426 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
427 |
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
428 void FetchInternal(const std::string& patientId, |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
429 const std::string& studyInstanceUid, |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
430 const std::string& seriesInstanceUid) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
431 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
432 // Firstly, load the study |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
433 Orthanc::DicomMap filter; |
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
434 |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
435 if (!patientId.empty()) |
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 filter.SetValue(Orthanc::DICOM_TAG_PATIENT_ID, patientId, false); |
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 |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
440 if (!studyInstanceUid.empty()) |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
441 { |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
442 filter.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, studyInstanceUid, false); |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
443 } |
1495
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 std::set<Orthanc::DicomTag> tags; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
446 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
|
447 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
448 resourcesLoader_->ScheduleQido( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
449 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
|
450 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
|
451 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
452 // Secondly, load the series |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
453 if (!seriesInstanceUid.empty()) |
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 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
|
456 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
457 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
458 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
|
459 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
460 resourcesLoader_->ScheduleQido( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
461 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
|
462 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
|
463 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
464 pending_ += 2; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
465 } |
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
466 |
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
467 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
468 class PdfInfo : public Orthanc::IDynamicObject |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
469 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
470 private: |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
471 std::string studyInstanceUid_; |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
472 std::string seriesInstanceUid_; |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
473 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
474 public: |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
475 PdfInfo(const std::string& studyInstanceUid, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
476 const std::string& seriesInstanceUid) : |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
477 studyInstanceUid_(studyInstanceUid), |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
478 seriesInstanceUid_(seriesInstanceUid) |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
479 { |
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 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
482 const std::string& GetStudyInstanceUid() const |
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 return studyInstanceUid_; |
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 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
487 const std::string& GetSeriesInstanceUid() const |
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 return seriesInstanceUid_; |
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 }; |
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 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
494 void Handle(const OrthancStone::ParseDicomSuccessMessage& message) |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
495 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
496 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
|
497 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
498 if (observer_.get() != NULL) |
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 std::string pdf; |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
501 if (message.GetDicom().ExtractPdf(pdf)) |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
502 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
503 observer_->SignalSeriesPdfLoaded(info.GetStudyInstanceUid(), info.GetSeriesInstanceUid(), pdf); |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
504 } |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
505 else |
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 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
|
508 } |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
509 } |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
510 } |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
511 |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
512 void FetchVirtualSeriesThumbnail(const std::string& virtualSeriesId, |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
513 const std::string& studyInstanceUid, |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
514 const std::string& seriesInstanceUid, |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
515 const std::string& sopInstanceUid) |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
516 { |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
517 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
|
518 { |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
519 scheduledVirtualSeriesThumbnails_.insert(virtualSeriesId); |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
520 |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
521 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
|
522 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
|
523 arguments["viewport"] = ( |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
524 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
|
525 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
|
526 headers["Accept"] = Orthanc::MIME_JPEG; |
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 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
|
529 "/instances/" + sopInstanceUid + "/frames/1/rendered"); |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
530 |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
531 { |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
532 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
|
533 lock->Schedule( |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
534 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
|
535 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
|
536 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
537 } |
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 |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
540 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
|
541 { |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
542 if (observer_.get() != NULL) |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
543 { |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
544 const std::string& virtualSeriesId = |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
545 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
|
546 message.GetOrigin().GetPayload()).GetValue(); |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
547 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
|
548 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
549 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
550 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
551 public: |
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
552 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
|
553 { |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
554 skipSeriesFromModalities_ = skipSeriesFromModalities; |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
555 } |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
556 |
1916 | 557 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
|
558 const OrthancStone::DicomSource& source) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
559 { |
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
560 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
|
561 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
562 loader->resourcesLoader_ = OrthancStone::DicomResourcesLoader::Create(lock); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
563 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
|
564 loader->metadataLoader_ = OrthancStone::SeriesMetadataLoader::Create(lock); |
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::DicomResourcesLoader::SuccessMessage>( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
567 *loader->resourcesLoader_, &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::SeriesThumbnailsLoader::SuccessMessage>( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
570 *loader->thumbnailsLoader_, &ResourcesLoader::Handle); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
571 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
572 loader->Register<OrthancStone::SeriesMetadataLoader::SuccessMessage>( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
573 *loader->metadataLoader_, &ResourcesLoader::Handle); |
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
574 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
575 loader->Register<OrthancStone::ParseDicomSuccessMessage>( |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
576 lock.GetOracleObservable(), &ResourcesLoader::Handle); |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
577 |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
578 loader->Register<OrthancStone::HttpCommand::SuccessMessage>( |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
579 lock.GetOracleObservable(), &ResourcesLoader::HandleInstanceThumbnail); |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
580 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
581 return loader; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
582 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
583 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
584 void FetchAllStudies() |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
585 { |
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
586 FetchInternal("", "", ""); |
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 |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
589 void FetchPatient(const std::string& patientId) |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
590 { |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
591 if (!patientId.empty()) |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
592 { |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
593 FetchInternal(patientId, "", ""); |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
594 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
595 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
596 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
597 void FetchStudy(const std::string& studyInstanceUid) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
598 { |
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
599 if (!studyInstanceUid.empty()) |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
600 { |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
601 FetchInternal("", studyInstanceUid, ""); |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
602 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
603 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
604 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
605 void FetchSeries(const std::string& studyInstanceUid, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
606 const std::string& seriesInstanceUid) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
607 { |
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
608 if (!studyInstanceUid.empty() && |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
609 !seriesInstanceUid.empty()) |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
610 { |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
611 FetchInternal("", studyInstanceUid, seriesInstanceUid); |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
612 } |
1495
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
615 size_t GetStudiesCount() const |
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 return studies_->GetSize(); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
620 size_t GetSeriesCount() const |
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 return series_->GetSize(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
623 } |
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 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
|
626 size_t i) const |
1495
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 target.Assign(studies_->GetResource(i)); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
629 } |
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 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
|
632 size_t i) const |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
633 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
634 target.Assign(series_->GetResource(i)); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
635 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
636 // Complement with the study-level tags |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
637 std::string studyInstanceUid; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
638 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
|
639 studies_->HasResource(studyInstanceUid)) |
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 studies_->MergeResource(target, studyInstanceUid); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
642 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
643 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
644 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
645 OrthancStone::SeriesThumbnailType GetSeriesThumbnail(std::string& image, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
646 std::string& mime, |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
647 const std::string& seriesInstanceUid) const |
1495
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 return thumbnailsLoader_->GetSeriesThumbnail(image, mime, seriesInstanceUid); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
650 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
651 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
652 void FetchSeriesMetadata(int priority, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
653 const std::string& studyInstanceUid, |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
654 const std::string& seriesInstanceUid) const |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
655 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
656 metadataLoader_->ScheduleLoadSeries(priority, source_, studyInstanceUid, seriesInstanceUid); |
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 |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
659 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
|
660 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
661 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
662 return accessor.IsComplete(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
663 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
664 |
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
|
665 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
|
666 const std::string& seriesInstanceUid) |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
667 { |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
668 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
|
669 if (accessor.IsComplete() && |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
670 accessor.GetInstancesCount() >= 2) |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
671 { |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
672 bool hasMultiframe = false; |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
673 |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
674 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
|
675 { |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
676 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
|
677 |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
678 if (p.GetNumberOfFrames() > 1) |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
679 { |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
680 hasMultiframe = true; |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
681 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
682 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
683 |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
684 if (hasMultiframe) |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
685 { |
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
|
686 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
|
687 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
|
688 |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
689 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
|
690 { |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
691 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
|
692 |
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
|
693 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
|
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 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
|
696 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
|
697 { |
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 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
|
699 } |
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 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
|
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 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
|
703 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
|
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 } |
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 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
|
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 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
|
709 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
|
710 } |
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 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
|
714 { |
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 /** |
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 * 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
|
717 * 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
|
718 * (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
|
719 * 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
|
720 * 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
|
721 **/ |
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
|
722 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
|
723 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
|
724 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
|
725 } |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
726 |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
727 return true; |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
728 } |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
729 else |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
730 { |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
731 return false; |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
732 } |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
733 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
734 else |
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 return false; |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
737 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
738 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
739 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
740 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
|
741 const std::string& seriesInstanceUid) const |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
742 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
743 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
744 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
745 if (accessor.IsComplete()) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
746 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
747 target.Clear(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
748 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
749 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
|
750 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
751 target.AddInstance(accessor.GetInstance(i)); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
754 target.Sort(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
755 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
756 return true; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
757 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
758 else |
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 return false; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
761 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
762 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
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 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
|
765 const std::string& virtualSeriesId) const |
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
766 { |
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
|
767 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
|
768 |
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
769 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
770 |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
771 if (accessor.IsComplete()) |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
772 { |
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
|
773 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
|
774 |
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 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
|
776 |
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 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
|
778 it = sopInstanceUids.begin(); it != sopInstanceUids.end(); ++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 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
|
781 if (accessor.LookupInstance(instance, *it)) |
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
782 { |
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
|
783 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
|
784 } |
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
|
785 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
|
786 { |
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
|
787 LOG(ERROR) << "Missing instance: " << *it; |
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
788 } |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
789 } |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
790 |
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
|
791 target.Sort(); |
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
792 return true; |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
793 } |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
794 else |
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 return false; |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
797 } |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
798 } |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
799 |
1674
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
800 size_t GetSeriesNumberOfFrames(const std::string& seriesInstanceUid) const |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
801 { |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
802 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
803 |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
804 if (accessor.IsComplete()) |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
805 { |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
806 size_t count = 0; |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
807 |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
808 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
|
809 { |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
810 uint32_t f; |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
811 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
|
812 { |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
813 count += f; |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
814 } |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
815 else |
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 count++; |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
818 } |
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 |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
821 return count; |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
822 } |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
823 else |
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 return 0; |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
826 } |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
827 } |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
828 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
829 void AcquireObserver(IObserver* observer) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
830 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
831 observer_.reset(observer); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
832 } |
1657
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 void FetchPdf(const std::string& studyInstanceUid, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
835 const std::string& seriesInstanceUid) |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
836 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
837 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
838 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
839 if (accessor.IsComplete()) |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
840 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
841 if (accessor.GetInstancesCount() > 1) |
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 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
|
844 << seriesInstanceUid; |
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 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
847 for (size_t i = 0; i < accessor.GetInstancesCount(); i++) |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
848 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
849 std::string sopClassUid, sopInstanceUid; |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
850 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
|
851 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
|
852 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
|
853 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
854 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(context_.Lock()); |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
855 lock->Schedule( |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
856 GetSharedObserver(), PRIORITY_NORMAL, OrthancStone::ParseDicomFromWadoCommand::Create( |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
857 source_, studyInstanceUid, seriesInstanceUid, sopInstanceUid, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
858 false /* no transcoding */, Orthanc::DicomTransferSyntax_LittleEndianExplicit /* dummy value */, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
859 new PdfInfo(studyInstanceUid, seriesInstanceUid))); |
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 return; |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
862 } |
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 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
865 LOG(WARNING) << "Series without a PDF: " << seriesInstanceUid; |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
866 } |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
867 } |
1495
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 |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
872 class FramesCache : public boost::noncopyable |
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 class CachedImage : public Orthanc::ICacheable |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
876 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
877 private: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
878 std::unique_ptr<Orthanc::ImageAccessor> image_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
879 unsigned int quality_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
880 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
881 public: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
882 CachedImage(Orthanc::ImageAccessor* image, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
883 unsigned int quality) : |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
884 image_(image), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
885 quality_(quality) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
886 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
887 assert(image != NULL); |
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 |
1573 | 890 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
|
891 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
892 assert(image_.get() != NULL); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
893 return (image_->GetBytesPerPixel() * image_->GetPitch() * image_->GetHeight()); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
896 const Orthanc::ImageAccessor& GetImage() const |
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 assert(image_.get() != NULL); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
899 return *image_; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
902 unsigned int GetQuality() const |
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 return quality_; |
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 }; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
907 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
908 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
909 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
|
910 size_t frameNumber) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
911 { |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
912 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
|
913 } |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
916 Orthanc::MemoryObjectCache cache_; |
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 public: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
919 FramesCache() |
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 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
|
922 //SetMaximumSize(1); // DISABLE CACHE |
1495
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
925 size_t GetMaximumSize() |
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 return cache_.GetMaximumSize(); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
930 void SetMaximumSize(size_t size) |
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 cache_.SetMaximumSize(size); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
933 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
934 |
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 * 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
|
937 * 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
|
938 **/ |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
939 bool Acquire(const std::string& sopInstanceUid, |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
940 size_t frameNumber, |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
941 Orthanc::ImageAccessor* image /* transfer ownership */, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
942 unsigned int quality) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
943 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
944 std::unique_ptr<Orthanc::ImageAccessor> protection(image); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
945 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
946 if (image == NULL) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
947 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
948 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
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 else if (image->GetFormat() != Orthanc::PixelFormat_Float32 && |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
951 image->GetFormat() != Orthanc::PixelFormat_RGB24) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
952 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
953 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat); |
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 |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
956 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
|
957 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
958 bool invalidate = false; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
959 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
960 { |
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 * 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
|
963 * 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
|
964 **/ |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
965 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
|
966 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
967 if (accessor.IsValid()) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
968 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
969 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
|
970 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
971 // 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
|
972 if (previous.GetQuality() < quality) |
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 // The previously stored image has poorer quality |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
975 invalidate = true; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
976 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
977 else |
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 // 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
|
980 return false; |
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 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
983 else |
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 invalidate = false; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
986 } |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
989 if (invalidate) |
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_.Invalidate(key); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
992 } |
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 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
|
995 return true; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
998 class Accessor : public boost::noncopyable |
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 private: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1001 Orthanc::MemoryObjectCache::Accessor accessor_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1002 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1003 const CachedImage& GetCachedImage() const |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1004 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1005 if (IsValid()) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1006 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1007 return dynamic_cast<CachedImage&>(accessor_.GetValue()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1008 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1009 else |
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1012 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1013 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1014 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1015 public: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1016 Accessor(FramesCache& that, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1017 const std::string& sopInstanceUid, |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1018 size_t frameNumber) : |
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1019 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
|
1020 { |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1023 bool IsValid() const |
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 return accessor_.IsValid(); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1028 const Orthanc::ImageAccessor& GetImage() const |
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 return GetCachedImage().GetImage(); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1033 unsigned int GetQuality() const |
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 return GetCachedImage().GetQuality(); |
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 |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1042 class SeriesCursor : public boost::noncopyable |
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 public: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1045 enum Action |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1046 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1047 Action_FastPlus, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1048 Action_Plus, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1049 Action_None, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1050 Action_Minus, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1051 Action_FastMinus |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1052 }; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1053 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1054 private: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1055 std::vector<size_t> prefetch_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1056 int framesCount_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1057 int currentFrame_; |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1058 bool isCircularPrefetch_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1059 int fastDelta_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1060 Action lastAction_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1061 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1062 int ComputeNextFrame(int currentFrame, |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1063 Action action, |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1064 bool isCircular) const |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1065 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1066 if (framesCount_ == 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 assert(currentFrame == 0); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1069 return 0; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1072 int nextFrame = currentFrame; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1073 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1074 switch (action) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1075 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1076 case Action_FastPlus: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1077 nextFrame += fastDelta_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1078 break; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1079 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1080 case Action_Plus: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1081 nextFrame += 1; |
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_None: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1085 break; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1086 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1087 case Action_Minus: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1088 nextFrame -= 1; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1089 break; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1090 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1091 case Action_FastMinus: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1092 nextFrame -= fastDelta_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1093 break; |
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 default: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1096 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
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 |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1099 if (isCircular) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1100 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1101 while (nextFrame < 0) |
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 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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1106 while (nextFrame >= framesCount_) |
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 nextFrame -= framesCount_; |
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 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1111 else |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1112 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1113 if (nextFrame < 0) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1114 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1115 nextFrame = 0; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1116 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1117 else if (nextFrame >= framesCount_) |
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 nextFrame = framesCount_ - 1; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1120 } |
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 return nextFrame; |
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 void UpdatePrefetch() |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1127 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1128 /** |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1129 * 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
|
1130 * 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
|
1131 * 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
|
1132 * 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
|
1133 * will do the same action just afterwards. |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1136 prefetch_.clear(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1137 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1138 if (framesCount_ == 0) |
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 return; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1143 prefetch_.reserve(framesCount_); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1144 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1145 // 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
|
1146 // 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
|
1147 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
|
1148 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1149 Queue queue; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1150 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
|
1151 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1152 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
|
1153 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1154 while (!queue.empty()) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1155 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1156 int frame = queue.front().first; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1157 Action previousAction = queue.front().second; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1158 queue.pop_front(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1159 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1160 if (visited.find(frame) == visited.end()) |
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 visited.insert(frame); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1163 prefetch_.push_back(frame); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1164 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1165 switch (previousAction) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1166 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1167 case Action_None: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1168 case Action_Plus: |
1672
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_Plus, isCircularPrefetch_), Action_Plus)); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1170 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
|
1171 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
|
1172 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
|
1173 break; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1174 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1175 case Action_Minus: |
1672
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_Minus, isCircularPrefetch_), Action_Minus)); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1177 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
|
1178 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
|
1179 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
|
1180 break; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1181 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1182 case Action_FastPlus: |
1672
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_FastPlus, isCircularPrefetch_), Action_FastPlus)); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1184 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
|
1185 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
|
1186 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
|
1187 break; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1188 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1189 case Action_FastMinus: |
1672
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_FastMinus, isCircularPrefetch_), Action_FastMinus)); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1191 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
|
1192 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
|
1193 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
|
1194 break; |
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 default: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1197 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
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 } |
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 assert(prefetch_.size() == framesCount_); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1205 bool CheckFrameIndex(int frame) const |
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 return ((framesCount_ == 0 && frame == 0) || |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1208 (framesCount_ > 0 && frame >= 0 && frame < framesCount_)); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1209 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1210 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1211 public: |
1970
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
1212 explicit SeriesCursor(size_t framesCount, |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
1213 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
|
1214 framesCount_(framesCount), |
1970
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
1215 currentFrame_(startAtMiddle ? framesCount / 2 : 0), |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1216 isCircularPrefetch_(false), |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1217 lastAction_(Action_None) |
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 SetFastDelta(framesCount / 20); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1220 UpdatePrefetch(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1221 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1222 |
1719
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
1223 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
|
1224 { |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
1225 return framesCount_; |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
1226 } |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
1227 |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1228 void SetCircularPrefetch(bool isCircularPrefetch) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1229 { |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1230 isCircularPrefetch_ = isCircularPrefetch; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1231 UpdatePrefetch(); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1234 void SetFastDelta(int delta) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1235 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1236 fastDelta_ = (delta < 0 ? -delta : delta); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1237 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1238 if (fastDelta_ <= 0) |
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 fastDelta_ = 1; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1241 } |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1244 void SetCurrentIndex(size_t frame) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1245 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1246 if (frame >= framesCount_) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1247 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1248 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1249 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1250 else |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1251 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1252 currentFrame_ = frame; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1253 lastAction_ = Action_None; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1254 UpdatePrefetch(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1255 } |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1258 size_t GetCurrentIndex() const |
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 assert(CheckFrameIndex(currentFrame_)); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1261 return static_cast<size_t>(currentFrame_); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1262 } |
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 void Apply(Action action, |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1265 bool isCircular) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1266 { |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1267 currentFrame_ = ComputeNextFrame(currentFrame_, action, isCircular); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1268 lastAction_ = action; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1269 UpdatePrefetch(); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1272 size_t GetPrefetchSize() const |
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 assert(prefetch_.size() == framesCount_); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1275 return prefetch_.size(); |
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 |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1278 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
|
1279 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1280 if (i >= prefetch_.size()) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1281 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1282 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1283 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1284 else |
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 assert(CheckFrameIndex(prefetch_[i])); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1287 return static_cast<size_t>(prefetch_[i]); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1292 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1293 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1294 |
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
1295 /** |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
1296 * 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
|
1297 * 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
|
1298 * checked by this function. |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
1299 **/ |
1646
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1300 static bool GetReferenceLineCoordinates(double& x1, |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1301 double& y1, |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1302 double& x2, |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1303 double& y2, |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1304 const OrthancStone::DicomInstanceParameters& instance1, |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1305 unsigned int frame1, |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
1306 const OrthancStone::CoordinateSystem3D& plane2) |
1646
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 if (instance1.GetWidth() == 0 && |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1309 instance1.GetHeight() == 0) |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1310 { |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1311 return false; |
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 else |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1314 { |
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 * Compute the 2D extent of the "instance1", expressed in |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1317 * 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
|
1318 * |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1319 * In a multiframe image (cf. "ExtractFrameOffsets()"), the plane of |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1320 * 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
|
1321 * 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
|
1322 * frame, so we can ignore the frame number. |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1323 **/ |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1324 OrthancStone::Extent2D extent; |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1325 |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1326 double ox = -instance1.GetPixelSpacingX() / 2.0; |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1327 double oy = -instance1.GetPixelSpacingY() / 2.0; |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1328 extent.AddPoint(ox, oy); |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1329 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
|
1330 oy + instance1.GetPixelSpacingY() * static_cast<double>(instance1.GetHeight())); |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1331 |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1332 const OrthancStone::CoordinateSystem3D c1 = instance1.GetFrameGeometry(frame1); |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1333 |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1334 OrthancStone::Vector direction, origin; |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1335 |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1336 if (!extent.IsEmpty() && |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1337 OrthancStone::GeometryToolbox::IntersectTwoPlanes(origin, direction, |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1338 c1.GetOrigin(), c1.GetNormal(), |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
1339 plane2.GetOrigin(), plane2.GetNormal())) |
1646
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1340 { |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1341 double ax, ay, bx, by; |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1342 c1.ProjectPoint(ax, ay, origin); |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1343 c1.ProjectPoint(bx, by, origin + 100.0 * direction); |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1344 |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1345 return OrthancStone::GeometryToolbox::ClipLineToRectangle( |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1346 x1, y1, x2, y2, |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1347 ax, ay, bx, by, |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1348 extent.GetX1(), extent.GetY1(), extent.GetX2(), extent.GetY2()); |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1349 } |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1350 else |
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 return false; |
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 } |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1356 |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1357 |
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1358 |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1359 class StoneAnnotationsRegistry : public boost::noncopyable |
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 class Index |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1363 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1364 private: |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1365 std::string sopInstanceUid_; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1366 size_t frame_; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1367 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1368 public: |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1369 Index(const std::string& sopInstanceUid, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1370 size_t frame) : |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1371 sopInstanceUid_(sopInstanceUid), |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1372 frame_(frame) |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1373 { |
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 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1376 const std::string& GetSopInstanceUid() const |
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 return sopInstanceUid_; |
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 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1381 size_t GetFrame() const |
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 return frame_; |
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 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1386 bool operator< (const Index& other) const |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1387 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1388 if (sopInstanceUid_ < other.sopInstanceUid_) |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1389 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1390 return true; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1391 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1392 else if (sopInstanceUid_ > other.sopInstanceUid_) |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1393 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1394 return false; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1395 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1396 else |
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 return frame_ < other.frame_; |
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 } |
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 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1403 typedef std::map<Index, Json::Value*> Content; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1404 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1405 Content content_; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1406 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1407 void Clear() |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1408 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1409 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
|
1410 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1411 assert(it->second != NULL); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1412 delete it->second; |
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 content_.clear(); |
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 StoneAnnotationsRegistry() |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1419 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1420 } |
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 public: |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1423 ~StoneAnnotationsRegistry() |
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 Clear(); |
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 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1428 static StoneAnnotationsRegistry& GetInstance() |
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 static StoneAnnotationsRegistry singleton; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1431 return singleton; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1432 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1433 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1434 void Save(const std::string& sopInstanceUid, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1435 size_t frame, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1436 const OrthancStone::AnnotationsSceneLayer& layer) |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1437 { |
1814 | 1438 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
|
1439 layer.Serialize(*serialized); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1440 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1441 const Index index(sopInstanceUid, frame); |
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::iterator found = content_.find(index); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1444 if (found == content_.end()) |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1445 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1446 content_[index] = serialized.release(); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1447 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1448 else |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1449 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1450 assert(found->second != NULL); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1451 delete found->second; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1452 found->second = serialized.release(); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1453 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1454 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1455 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1456 void Load(OrthancStone::AnnotationsSceneLayer& layer, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1457 const std::string& sopInstanceUid, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1458 size_t frame) const |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1459 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1460 const Index index(sopInstanceUid, frame); |
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 Content::const_iterator found = content_.find(index); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1463 if (found == content_.end()) |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1464 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1465 layer.Clear(); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1466 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1467 else |
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 assert(found->second != NULL); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1470 layer.Unserialize(*found->second); |
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 }; |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1474 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1475 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1476 |
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1477 class OverlaysRegistry : public boost::noncopyable |
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 private: |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1480 typedef std::map<std::string, OrthancStone::LookupTableTextureSceneLayer*> Content; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1481 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1482 Content content_; |
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 public: |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1485 ~OverlaysRegistry() |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1486 { |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1487 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) |
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 assert(it->second != NULL); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1490 delete it->second; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1491 } |
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 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1494 static OverlaysRegistry& GetInstance() |
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 static OverlaysRegistry singleton; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1497 return singleton; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1498 } |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1499 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1500 void Register(const std::string& sopInstanceUid, |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1501 const OrthancStone::DicomInstanceParameters& parameters, |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1502 int overlayX, |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1503 int overlayY, |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1504 const Orthanc::ImageAccessor& overlay) |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1505 { |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1506 // Don't register twice the same overlay |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1507 Content::iterator found = content_.find(sopInstanceUid); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1508 if (found == content_.end()) |
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 content_[sopInstanceUid] = parameters.CreateOverlayTexture(overlayX, overlayY, overlay); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1511 } |
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 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1514 class Accessor : public boost::noncopyable |
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 private: |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1517 const OrthancStone::LookupTableTextureSceneLayer* texture_; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1518 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1519 public: |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1520 Accessor(const OverlaysRegistry& registry, |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1521 const std::string& sopInstanceUid) |
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 Content::const_iterator found = registry.content_.find(sopInstanceUid); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1524 if (found == registry.content_.end()) |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1525 { |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1526 texture_ = NULL; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1527 } |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1528 else |
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 assert(found->second != NULL); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1531 texture_ = found->second; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1532 } |
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 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1535 bool IsValid() const |
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 return texture_ != NULL; |
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 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1540 OrthancStone::LookupTableTextureSceneLayer* CreateTexture() const |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1541 { |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1542 if (texture_ == NULL) |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1543 { |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1544 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1545 } |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1546 else |
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 return dynamic_cast<OrthancStone::LookupTableTextureSceneLayer*>(texture_->Clone()); |
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 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1554 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1555 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1556 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1557 class ViewerViewport : public OrthancStone::ObserverBase<ViewerViewport> |
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 class IObserver : public boost::noncopyable |
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 public: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1563 virtual ~IObserver() |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1564 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1565 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1566 |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1567 virtual void SignalSeriesDetailsReady(const ViewerViewport& viewport) = 0; |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1568 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1569 virtual void SignalFrameUpdated(const ViewerViewport& viewport, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1570 size_t currentFrame, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1571 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
|
1572 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
|
1573 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
|
1574 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
|
1575 const std::string& contentTime) = 0; |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
1576 |
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
1577 // "click" is a 3D vector in world coordinates |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
1578 virtual void SignalCrosshair(const ViewerViewport& viewport, |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
1579 const OrthancStone::Vector& click) = 0; |
1694 | 1580 |
1581 virtual void SignalSynchronizedBrowsing(const ViewerViewport& viewport, | |
1582 const OrthancStone::Vector& click, | |
1583 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
|
1584 |
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
1585 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
|
1586 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
|
1587 double windowingWidth) = 0; |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1588 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1589 virtual void SignalStoneAnnotationsChanged(const ViewerViewport& viewport, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1590 const std::string& sopInstanceUid, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1591 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
|
1592 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
1593 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
|
1594 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
1595 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
|
1596 }; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1597 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1598 private: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1599 static const int LAYER_TEXTURE = 0; |
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1600 static const int LAYER_OVERLAY = 1; |
1963 | 1601 static const int LAYER_ORIENTATION_MARKERS = 2; |
1602 static const int LAYER_REFERENCE_LINES = 3; | |
1603 static const int LAYER_ANNOTATIONS_OSIRIX = 4; | |
1604 static const int LAYER_ANNOTATIONS_STONE = 5; | |
1611
787db80a5a1b
new class MacroLayerRenderer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1607
diff
changeset
|
1605 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1606 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1607 class ICommand : public Orthanc::IDynamicObject |
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 private: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1610 boost::shared_ptr<ViewerViewport> viewport_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1611 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1612 public: |
1573 | 1613 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
|
1614 viewport_(viewport) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1615 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1616 if (viewport == NULL) |
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1619 } |
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 virtual ~ICommand() |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1623 { |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1626 ViewerViewport& GetViewport() const |
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 assert(viewport_ != NULL); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1629 return *viewport_; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1632 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
|
1633 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1634 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1637 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
|
1638 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1639 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1642 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
|
1643 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1644 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1645 } |
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 |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1648 class LoadSeriesDetailsFromInstance : public ICommand |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1649 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1650 public: |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1651 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
|
1652 ICommand(viewport) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1653 { |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1656 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
|
1657 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1658 if (message.GetResources()->GetSize() != 1) |
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); |
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 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
|
1664 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1665 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1666 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
|
1667 |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1668 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
|
1669 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
|
1670 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
|
1671 |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1672 if (params.HasPixelSpacing()) |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1673 { |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1674 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
|
1675 } |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1676 else |
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 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
|
1679 } |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1680 |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1681 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
|
1682 params.GetPixelSpacingY() != 0 && |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1683 params.GetWidth() != 0 && |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1684 params.GetHeight()) |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1685 { |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1686 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
|
1687 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
|
1688 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
|
1689 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
|
1690 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1691 |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1692 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
|
1693 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
|
1694 |
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
1695 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
|
1696 { |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1697 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
|
1698 << ": " << params.GetWindowingPresetCenter(i) |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
1699 << "," << params.GetWindowingPresetWidth(i); |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1700 |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1701 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
|
1702 GetViewport().windowingPresetWidths_[i] = params.GetWindowingPresetWidth(i); |
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
1703 } |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
1704 |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1705 if (params.GetWindowingPresetsCount() == 0) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1706 { |
1677
51bab5188a13
start multiple preset windowings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1676
diff
changeset
|
1707 LOG(INFO) << "No preset windowing"; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1708 } |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1709 |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1710 GetViewport().SetWindowingPreset(); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1711 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1712 |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1713 uint32_t cineRate; |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1714 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
|
1715 cineRate > 0) |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1716 { |
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 * 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
|
1719 * instead of on the middle frame. |
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 GetViewport().cursor_->SetCurrentIndex(0); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1722 GetViewport().cineRate_ = cineRate; |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1723 } |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1724 else |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1725 { |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1726 GetViewport().cineRate_ = DEFAULT_CINE_RATE; |
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 |
1668 | 1729 GetViewport().Redraw(); |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1730 |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1731 if (GetViewport().observer_.get() != NULL) |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1732 { |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1733 GetViewport().observer_->SignalSeriesDetailsReady(GetViewport()); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1734 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1735 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1736 }; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1737 |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
1738 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1739 class SetLowQualityFrame : public ICommand |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1740 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1741 private: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1742 std::string sopInstanceUid_; |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1743 unsigned int frameNumber_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1744 float windowCenter_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1745 float windowWidth_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1746 bool isMonochrome1_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1747 bool isPrefetch_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1748 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1749 public: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1750 SetLowQualityFrame(boost::shared_ptr<ViewerViewport> viewport, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1751 const std::string& sopInstanceUid, |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1752 unsigned int frameNumber, |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1753 float windowCenter, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1754 float windowWidth, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1755 bool isMonochrome1, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1756 bool isPrefetch) : |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1757 ICommand(viewport), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1758 sopInstanceUid_(sopInstanceUid), |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1759 frameNumber_(frameNumber), |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1760 windowCenter_(windowCenter), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1761 windowWidth_(windowWidth), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1762 isMonochrome1_(isMonochrome1), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1763 isPrefetch_(isPrefetch) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1764 { |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1767 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
|
1768 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1769 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
|
1770 jpeg->ReadFromMemory(message.GetAnswer()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1771 |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1772 std::unique_ptr<Orthanc::ImageAccessor> converted; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1773 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1774 switch (jpeg->GetFormat()) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1775 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1776 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
|
1777 converted.reset(jpeg.release()); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1778 break; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1779 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1780 case Orthanc::PixelFormat_Grayscale8: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1781 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1782 if (isMonochrome1_) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1783 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1784 Orthanc::ImageProcessing::Invert(*jpeg); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1785 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1786 |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1787 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
|
1788 jpeg->GetHeight(), false)); |
1495
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 Orthanc::ImageProcessing::Convert(*converted, *jpeg); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1791 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1792 /** |
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 Orthanc::ImageProcessing::ShiftScale() computes "(x + offset) * scaling". |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1795 The system to solve is thus: |
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 (0 + offset) * scaling = windowingCenter - windowingWidth / 2 [a] |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1798 (255 + offset) * scaling = windowingCenter + windowingWidth / 2 [b] |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1799 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1800 Resolution: |
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 [b - a] => 255 * scaling = windowingWidth |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1803 [a] => offset = (windowingCenter - windowingWidth / 2) / scaling |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1804 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1805 **/ |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1806 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1807 const float scaling = windowWidth_ / 255.0f; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1808 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
|
1809 (windowCenter_ - windowWidth_ / 2.0f) / scaling); |
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 Orthanc::ImageProcessing::ShiftScale(*converted, offset, scaling, false); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1812 break; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1813 } |
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 default: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1816 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1817 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1818 |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1819 assert(converted.get() != NULL); |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1820 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
|
1821 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
|
1822 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1823 if (isPrefetch_) |
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 GetViewport().ScheduleNextPrefetch(); |
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 }; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1831 class SetFullDicomFrame : public ICommand |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1832 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1833 private: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1834 std::string sopInstanceUid_; |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1835 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
|
1836 int priority_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1837 bool isPrefetch_; |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1838 bool serverSideTranscoding_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1839 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1840 public: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1841 SetFullDicomFrame(boost::shared_ptr<ViewerViewport> viewport, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1842 const std::string& sopInstanceUid, |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1843 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
|
1844 int priority, |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1845 bool isPrefetch, |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1846 bool serverSideTranscoding) : |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1847 ICommand(viewport), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1848 sopInstanceUid_(sopInstanceUid), |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1849 frameNumber_(frameNumber), |
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1850 priority_(priority), |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1851 isPrefetch_(isPrefetch), |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1852 serverSideTranscoding_(serverSideTranscoding) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1853 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1854 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1855 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1856 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
|
1857 { |
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1858 std::unique_ptr<Orthanc::ImageAccessor> frame; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1859 |
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1860 try |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1861 { |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1862 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
|
1863 } |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1864 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
|
1865 { |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1866 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
|
1867 { |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1868 if (!serverSideTranscoding_) |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1869 { |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1870 // 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
|
1871 LOG(INFO) << "Switching to server-side transcoding"; |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1872 GetViewport().serverSideTranscoding_ = true; |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1873 GetViewport().ScheduleLoadFullDicomFrame(sopInstanceUid_, frameNumber_, priority_, isPrefetch_); |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1874 } |
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1875 return; |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1876 } |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1877 else |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1878 { |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1879 throw; |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1880 } |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1881 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1882 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1883 if (frame.get() == NULL) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1884 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1885 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1886 } |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1887 else |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1888 { |
1855
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1889 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
|
1890 { |
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1891 // 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
|
1892 // (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
|
1893 double windowingCenter, windowingWidth; |
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1894 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
|
1895 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
|
1896 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
|
1897 GetViewport().SetWindowingPreset(); |
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1898 } |
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1899 |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1900 Apply(GetViewport(), message.GetDicom(), frame.release(), sopInstanceUid_, frameNumber_); |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1901 |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1902 if (isPrefetch_) |
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 GetViewport().ScheduleNextPrefetch(); |
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 } |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1907 } |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1908 |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1909 static void Apply(ViewerViewport& viewport, |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1910 const Orthanc::ParsedDicomFile& dicom, |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1911 Orthanc::ImageAccessor* f, |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1912 const std::string& sopInstanceUid, |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1913 unsigned int frameNumber) |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1914 { |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1915 std::unique_ptr<Orthanc::ImageAccessor> frameProtection(f); |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1916 |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1917 Orthanc::DicomMap tags; |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1918 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
|
1919 |
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1920 OrthancStone::DicomInstanceParameters parameters(tags); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1921 |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1922 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
|
1923 |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1924 if (frameProtection->GetFormat() == Orthanc::PixelFormat_RGB24) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1925 { |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1926 converted.reset(frameProtection.release()); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1927 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1928 else |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1929 { |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1930 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
|
1931 Orthanc::ImageProcessing::Convert(*converted, *frameProtection); |
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1932 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
|
1933 } |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1934 |
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1935 try |
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 int x, y; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1938 std::unique_ptr<Orthanc::ImageAccessor> overlay(dicom.DecodeAllOverlays(x, y)); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1939 |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1940 if (overlay.get() != NULL && |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1941 overlay->GetWidth() > 0 && |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1942 overlay->GetHeight() > 0) |
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 OverlaysRegistry::GetInstance().Register(sopInstanceUid, parameters, x, y, *overlay); |
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 } |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1947 catch (Orthanc::OrthancException& e) |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1948 { |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1949 LOG(ERROR) << "Cannot decode overlays from instance " << sopInstanceUid; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1950 } |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1951 |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1952 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
|
1953 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
|
1954 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
|
1955 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1956 }; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1959 class PrefetchItem |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1960 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1961 private: |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1962 size_t cursorIndex_; |
1670 | 1963 bool isFullQuality_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1964 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1965 public: |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1966 PrefetchItem(size_t cursorIndex, |
1670 | 1967 bool isFullQuality) : |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1968 cursorIndex_(cursorIndex), |
1670 | 1969 isFullQuality_(isFullQuality) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1970 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1971 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1972 |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1973 size_t GetCursorIndex() const |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1974 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1975 return cursorIndex_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1976 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1977 |
1670 | 1978 bool IsFullQuality() const |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1979 { |
1670 | 1980 return isFullQuality_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1981 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1982 }; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1983 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1984 |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1985 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
|
1986 OrthancStone::WebAssemblyLoadersContext& context_; |
1551
c54bc5bffd01
software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
1987 boost::shared_ptr<OrthancStone::WebAssemblyViewport> viewport_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1988 boost::shared_ptr<OrthancStone::DicomResourcesLoader> loader_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1989 OrthancStone::DicomSource source_; |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
1990 boost::shared_ptr<FramesCache> framesCache_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1991 std::unique_ptr<OrthancStone::SortedFrames> frames_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1992 std::unique_ptr<SeriesCursor> cursor_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1993 float windowingCenter_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1994 float windowingWidth_; |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1995 std::vector<float> windowingPresetCenters_; |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1996 std::vector<float> windowingPresetWidths_; |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1997 unsigned int cineRate_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1998 bool inverted_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1999 bool fitNextContent_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2000 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
|
2001 bool serverSideTranscoding_; |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2002 OrthancStone::Vector synchronizationOffset_; |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2003 bool synchronizationEnabled_; |
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2004 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
|
2005 double centralPhysicalHeight_; |
1822
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2006 double centralPixelSpacingX_; |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2007 double centralPixelSpacingY_; |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2008 |
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2009 bool hasFocusOnInstance_; |
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2010 std::string focusSopInstanceUid_; |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
2011 size_t focusFrameNumber_; |
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2012 |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2013 // 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
|
2014 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
|
2015 |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2016 // 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
|
2017 // 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
|
2018 // the center of the top-left pixel |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2019 boost::shared_ptr<OrthancStone::AnnotationsSceneLayer> stoneAnnotations_; |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2020 |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2021 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2022 void ScheduleNextPrefetch() |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2023 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2024 while (!prefetchQueue_.empty()) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2025 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2026 size_t cursorIndex = prefetchQueue_.front().GetCursorIndex(); |
1670 | 2027 bool isFullQuality = prefetchQueue_.front().IsFullQuality(); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2028 prefetchQueue_.pop_front(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2029 |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2030 const std::string sopInstanceUid = frames_->GetInstanceOfFrame(cursorIndex).GetSopInstanceUid(); |
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2031 unsigned int frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2032 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2033 { |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2034 FramesCache::Accessor accessor(*framesCache_, sopInstanceUid, frameNumber); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2035 if (!accessor.IsValid() || |
1670 | 2036 (isFullQuality && accessor.GetQuality() == 0)) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2037 { |
1670 | 2038 if (isFullQuality) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2039 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2040 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_NORMAL, true); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2041 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2042 else |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2043 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2044 ScheduleLoadRenderedFrame(cursorIndex, PRIORITY_NORMAL, true); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2045 } |
1670 | 2046 |
2047 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
|
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2054 void ClearViewport() |
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 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2057 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
|
2058 lock->GetController().GetScene().DeleteLayer(LAYER_TEXTURE); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2059 //lock->GetCompositor().Refresh(lock->GetController().GetScene()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2060 lock->Invalidate(); |
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 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2063 |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
2064 |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2065 /** |
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2066 * 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
|
2067 * 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
|
2068 **/ |
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2069 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
|
2070 DisplayedFrameQuality quality) |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2071 { |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2072 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
|
2073 |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2074 // Prepare prefetching |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2075 prefetchQueue_.clear(); |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2076 |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2077 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
|
2078 { |
1680
03afa09cfcf1
running the tests of the Orthanc Framework in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
2079 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
|
2080 size_t prefetchedSize = 0; |
03afa09cfcf1
running the tests of the Orthanc Framework in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
2081 |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2082 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
|
2083 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
|
2084 { |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2085 size_t a = cursor_->GetPrefetchIndex(i); |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2086 if (a != cursorIndex) |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2087 { |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2088 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
|
2089 prefetchedSize += frameSize; |
1669
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 |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2094 ScheduleNextPrefetch(); |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2095 |
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
2096 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
|
2097 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
|
2098 observer_.get() != NULL) |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2099 { |
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
2100 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
|
2101 |
1859
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2102 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
|
2103 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
|
2104 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
|
2105 |
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2106 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
|
2107 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
|
2108 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
|
2109 |
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2110 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
|
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 |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2114 |
1668 | 2115 void RenderCurrentScene(const Orthanc::ImageAccessor& frame, |
2116 const OrthancStone::DicomInstanceParameters& instance, | |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2117 size_t frameIndex, |
1668 | 2118 const OrthancStone::CoordinateSystem3D& plane) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2119 { |
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2120 /** |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2121 * 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
|
2122 * "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
|
2123 * "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
|
2124 * 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
|
2125 * "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
|
2126 * "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
|
2127 * 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
|
2128 * (cf. LSD-479). |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2129 **/ |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2130 |
1668 | 2131 bool isMonochrome1 = (instance.GetImageInformation().GetPhotometricInterpretation() == |
2132 Orthanc::PhotometricInterpretation_Monochrome1); | |
2133 | |
2134 std::unique_ptr<OrthancStone::TextureBaseSceneLayer> layer; | |
2135 | |
2136 switch (frame.GetFormat()) | |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2137 { |
1668 | 2138 case Orthanc::PixelFormat_RGB24: |
2139 layer.reset(new OrthancStone::ColorTextureSceneLayer(frame)); | |
2140 break; | |
2141 | |
2142 case Orthanc::PixelFormat_Float32: | |
2143 { | |
2144 std::unique_ptr<OrthancStone::FloatTextureSceneLayer> tmp( | |
2145 new OrthancStone::FloatTextureSceneLayer(frame)); | |
2146 tmp->SetCustomWindowing(windowingCenter_, windowingWidth_); | |
2147 tmp->SetInverted(inverted_ ^ isMonochrome1); | |
2148 layer.reset(tmp.release()); | |
2149 break; | |
2150 } | |
2151 | |
2152 default: | |
2153 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat); | |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2154 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2155 |
1668 | 2156 assert(layer.get() != NULL); |
2157 | |
2158 layer->SetLinearInterpolation(true); | |
2159 | |
2160 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
|
2161 |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2162 if (instance.HasPixelSpacing()) |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2163 { |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2164 pixelSpacingX = instance.GetPixelSpacingX(); |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2165 pixelSpacingY = instance.GetPixelSpacingY(); |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2166 } |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2167 else |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2168 { |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2169 pixelSpacingX = centralPixelSpacingX_; |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2170 pixelSpacingY = centralPixelSpacingY_; |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2171 } |
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2172 |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2173 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
|
2174 { |
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 * 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
|
2177 * 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
|
2178 * 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
|
2179 * 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
|
2180 * 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
|
2181 **/ |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2182 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
|
2183 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
|
2184 |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2185 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
|
2186 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
|
2187 { |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2188 // 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
|
2189 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
|
2190 } |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2191 else |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2192 { |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2193 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
|
2194 centralPhysicalHeight_ / physicalHeight); |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2195 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
|
2196 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
|
2197 (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
|
2198 } |
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 else |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2201 { |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2202 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
|
2203 } |
1668 | 2204 |
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2205 std::unique_ptr<OrthancStone::LookupTableTextureSceneLayer> overlay; |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2206 |
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 OverlaysRegistry::Accessor accessor(OverlaysRegistry::GetInstance(), instance.GetSopInstanceUid()); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2209 if (accessor.IsValid()) |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2210 { |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2211 overlay.reset(accessor.CreateTexture()); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2212 } |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2213 } |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2214 |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2215 std::unique_ptr<OrthancStone::MacroSceneLayer> annotationsOsiriX; |
1668 | 2216 |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2217 if (osiriXAnnotations_) |
1668 | 2218 { |
2219 std::set<size_t> a; | |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2220 osiriXAnnotations_->LookupSopInstanceUid(a, instance.GetSopInstanceUid()); |
1668 | 2221 if (plane.IsValid() && |
2222 !a.empty()) | |
2223 { | |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2224 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
|
2225 // annotationsOsiriX->Reserve(a.size()); |
1668 | 2226 |
2227 OrthancStone::OsiriXLayerFactory factory; | |
2228 factory.SetColor(0, 255, 0); | |
2229 | |
2230 for (std::set<size_t>::const_iterator it = a.begin(); it != a.end(); ++it) | |
2231 { | |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2232 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
|
2233 annotationsOsiriX->AddLayer(factory.Create(annotation, plane)); |
1668 | 2234 } |
2235 } | |
2236 } | |
2237 | |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2238 StoneAnnotationsRegistry::GetInstance().Load(*stoneAnnotations_, instance.GetSopInstanceUid(), frameIndex); |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2239 |
1962
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2240 // 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
|
2241 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
|
2242 |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2243 if (instance.GetGeometry().IsValid()) |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2244 { |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2245 orientationMarkers.reset(new OrthancStone::MacroSceneLayer); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2246 |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2247 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
|
2248 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
|
2249 |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2250 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
|
2251 |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2252 text.reset(new OrthancStone::TextSceneLayer); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2253 text->SetText(top); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2254 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
|
2255 text->SetAnchor(OrthancStone::BitmapAnchor_TopCenter); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2256 orientationMarkers->AddLayer(text.release()); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2257 |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2258 text.reset(new OrthancStone::TextSceneLayer); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2259 text->SetText(bottom); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2260 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
|
2261 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
|
2262 text->SetAnchor(OrthancStone::BitmapAnchor_BottomCenter); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2263 orientationMarkers->AddLayer(text.release()); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2264 |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2265 text.reset(new OrthancStone::TextSceneLayer); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2266 text->SetText(left); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2267 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
|
2268 text->SetAnchor(OrthancStone::BitmapAnchor_CenterLeft); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2269 orientationMarkers->AddLayer(text.release()); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2270 |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2271 text.reset(new OrthancStone::TextSceneLayer); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2272 text->SetText(right); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2273 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
|
2274 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
|
2275 text->SetAnchor(OrthancStone::BitmapAnchor_CenterRight); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2276 orientationMarkers->AddLayer(text.release()); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2277 } |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2278 |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2279 |
1668 | 2280 { |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2281 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
|
2282 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2283 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
|
2284 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2285 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
|
2286 |
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2287 if (overlay.get() != NULL) |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2288 { |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2289 scene.SetLayer(LAYER_OVERLAY, overlay.release()); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2290 } |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2291 else |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2292 { |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2293 scene.DeleteLayer(LAYER_OVERLAY); |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2294 } |
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2295 |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2296 if (annotationsOsiriX.get() != NULL) |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2297 { |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2298 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
|
2299 } |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2300 else |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2301 { |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2302 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
|
2303 } |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2304 |
1962
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2305 if (orientationMarkers.get() != NULL) |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2306 { |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2307 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
|
2308 } |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2309 else |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2310 { |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2311 scene.DeleteLayer(LAYER_ORIENTATION_MARKERS); |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2312 } |
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2313 |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2314 stoneAnnotations_->Render(scene); // Necessary for "FitContent()" to work |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2315 |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2316 if (fitNextContent_) |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2317 { |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2318 lock->RefreshCanvasSize(); |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2319 lock->GetCompositor().FitContent(scene); |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2320 stoneAnnotations_->Render(scene); |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2321 fitNextContent_ = false; |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2322 } |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2323 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2324 //lock->GetCompositor().Refresh(scene); |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2325 lock->Invalidate(); |
1668 | 2326 } |
2327 } | |
2328 | |
2329 | |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2330 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
|
2331 const std::string& loadedSopInstanceUid, |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2332 unsigned int loadedFrameNumber, |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2333 DisplayedFrameQuality quality) |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2334 { |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2335 if (cursor_.get() != NULL && |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2336 frames_.get() != NULL) |
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 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
|
2339 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
|
2340 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
|
2341 |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2342 // 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
|
2343 if (instance.GetSopInstanceUid() == loadedSopInstanceUid && |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2344 frameNumber == loadedFrameNumber) |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2345 { |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2346 const OrthancStone::CoordinateSystem3D plane = frames_->GetFrameGeometry(cursorIndex); |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2347 |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2348 if (quality == DisplayedFrameQuality_Low) |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2349 { |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2350 FramesCache::Accessor accessor(*framesCache_, instance.GetSopInstanceUid(), frameNumber); |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2351 if (accessor.IsValid() && |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2352 accessor.GetQuality() == QUALITY_FULL) |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2353 { |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2354 // 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
|
2355 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
|
2356 SetupPrefetchAfterRendering(frame, DisplayedFrameQuality_High); |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2357 } |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2358 else |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2359 { |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2360 // 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
|
2361 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
|
2362 SetupPrefetchAfterRendering(frame, quality); |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2363 |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2364 /** |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2365 * The command "SetupPrefetchAfterRendering()" must be |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2366 * after "SetupPrefetchAfterRendering(quality)", as the |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2367 * DICOM instance might already be cached by the oracle, |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2368 * which makes a call to "observer_->SignalFrameUpdated()" |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2369 * with a low quality, whereas the high quality is |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2370 * available. |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2371 **/ |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2372 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */); |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2373 } |
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 else |
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 assert(quality == DisplayedFrameQuality_High); |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2378 SetupPrefetchAfterRendering(frame, quality); |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2379 RenderCurrentScene(frame, instance, frameNumber, plane); |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2380 } |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2381 } |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2382 } |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2383 } |
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2384 |
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2385 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
|
2386 unsigned int frameNumber, |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2387 int priority, |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2388 bool isPrefetch) |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2389 { |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2390 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
|
2391 { |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2392 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
|
2393 lock->Schedule( |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2394 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
|
2395 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
|
2396 sopInstanceUid, serverSideTranscoding_, |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2397 Orthanc::DicomTransferSyntax_LittleEndianExplicit, |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2398 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
|
2399 } |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2400 } |
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2401 |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2402 void ScheduleLoadFullDicomFrame(size_t cursorIndex, |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2403 int priority, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2404 bool isPrefetch) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2405 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2406 if (frames_.get() != NULL) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2407 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2408 std::string sopInstanceUid = frames_->GetInstanceOfFrame(cursorIndex).GetSopInstanceUid(); |
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2409 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
|
2410 ScheduleLoadFullDicomFrame(sopInstanceUid, frameNumber, priority, isPrefetch); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2411 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2412 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2413 |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2414 void ScheduleLoadRenderedFrame(size_t cursorIndex, |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2415 int priority, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2416 bool isPrefetch) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2417 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2418 if (!source_.HasDicomWebRendered()) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2419 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2420 ScheduleLoadFullDicomFrame(cursorIndex, priority, isPrefetch); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2421 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2422 else if (frames_.get() != NULL) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2423 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2424 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2425 unsigned int frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2426 |
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
|
2427 /** |
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
|
2428 * 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
|
2429 * 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
|
2430 * 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
|
2431 **/ |
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
|
2432 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
|
2433 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
|
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 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
|
2436 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
|
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 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
|
2439 { |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2440 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
|
2441 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
|
2442 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
|
2443 } |
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
|
2444 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
|
2445 { |
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2446 /** |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2447 * 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
|
2448 * 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
|
2449 * 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
|
2450 * the DICOM file using server-side transcoding. This |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2451 * happens on WRIX dataset. |
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2452 **/ |
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
|
2453 } |
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
|
2454 } |
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
|
2455 |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2456 bool isMonochrome1 = (instance.GetImageInformation().GetPhotometricInterpretation() == |
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2457 Orthanc::PhotometricInterpretation_Monochrome1); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2458 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2459 const std::string uri = ("studies/" + frames_->GetStudyInstanceUid() + |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2460 "/series/" + frames_->GetSeriesInstanceUid() + |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2461 "/instances/" + instance.GetSopInstanceUid() + |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2462 "/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
|
2463 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2464 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
|
2465 // 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
|
2466 arguments["window"] = ( |
1536 | 2467 boost::lexical_cast<std::string>(windowingCenter_) + "," + |
2468 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
|
2469 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2470 std::unique_ptr<OrthancStone::IOracleCommand> command( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2471 source_.CreateDicomWebCommand( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2472 uri, arguments, headers, new SetLowQualityFrame( |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2473 GetSharedObserver(), instance.GetSopInstanceUid(), frameNumber, |
1536 | 2474 windowingCenter_, windowingWidth_, isMonochrome1, isPrefetch))); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2475 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2476 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2477 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
|
2478 lock->Schedule(GetSharedObserver(), priority, command.release()); |
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 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2481 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2482 |
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2483 void UpdateCurrentTextureParameters() |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2484 { |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2485 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
|
2486 |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2487 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
|
2488 { |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2489 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
|
2490 OrthancStone::ISceneLayer::Type_FloatTexture) |
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 dynamic_cast<OrthancStone::FloatTextureSceneLayer&>( |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2493 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE)). |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2494 SetCustomWindowing(windowingCenter_, windowingWidth_); |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2495 } |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2496 |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2497 lock->Invalidate(); |
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 |
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
|
2502 ViewerViewport(OrthancStone::WebAssemblyLoadersContext& context, |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2503 const OrthancStone::DicomSource& source, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2504 const std::string& canvas, |
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2505 boost::shared_ptr<FramesCache> cache, |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2506 bool softwareRendering) : |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2507 context_(context), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2508 source_(source), |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2509 framesCache_(cache), |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2510 fitNextContent_(true), |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
2511 hasFocusOnInstance_(false), |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2512 focusFrameNumber_(0), |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2513 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
|
2514 synchronizationEnabled_(false), |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2515 centralPhysicalWidth_(1), |
1822
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2516 centralPhysicalHeight_(1), |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2517 centralPixelSpacingX_(1), |
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2518 centralPixelSpacingY_(1) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2519 { |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2520 if (!framesCache_) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2521 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2522 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2523 } |
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2524 |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2525 if (softwareRendering) |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2526 { |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2527 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
|
2528 viewport_ = OrthancStone::WebAssemblyCairoViewport::Create(canvas); |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2529 } |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2530 else |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2531 { |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2532 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
|
2533 viewport_ = OrthancStone::WebGLViewport::Create(canvas); |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2534 } |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2535 |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2536 { |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2537 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2538 std::string ttf; |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2539 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
|
2540 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
|
2541 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2542 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2543 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
|
2544 |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
2545 SetWindowingPreset(); |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2546 |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2547 stoneAnnotations_.reset(new OrthancStone::AnnotationsSceneLayer(LAYER_ANNOTATIONS_STONE)); |
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
2548 stoneAnnotations_->SetProbedLayer(LAYER_TEXTURE); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2549 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2550 |
1721
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2551 |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2552 void Handle(const OrthancStone::ViewportController::GrayscaleWindowingChanged& message) |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2553 { |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2554 // 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
|
2555 windowingCenter_ = message.GetWindowingCenter(); |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2556 windowingWidth_ = message.GetWindowingWidth(); |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2557 |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2558 if (observer_.get() != NULL) |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2559 { |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2560 observer_->SignalWindowingUpdated(*this, message.GetWindowingCenter(), message.GetWindowingWidth()); |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2561 } |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2562 } |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2563 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2564 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2565 static EM_BOOL OnWheel(int eventType, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2566 const EmscriptenWheelEvent *wheelEvent, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2567 void *userData) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2568 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2569 ViewerViewport& that = *reinterpret_cast<ViewerViewport*>(userData); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2570 |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2571 if (that.frames_.get() != NULL && |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2572 that.cursor_.get() != NULL) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2573 { |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2574 const bool isCtrl = wheelEvent->mouse.ctrlKey; |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2575 const bool isShift = wheelEvent->mouse.shiftKey; |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2576 |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2577 const size_t previousCursorIndex = that.cursor_->GetCurrentIndex(); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2578 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2579 if (wheelEvent->deltaY < 0) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2580 { |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2581 that.ChangeFrame(isCtrl ? SeriesCursor::Action_FastMinus : |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2582 SeriesCursor::Action_Minus, false /* not circular */); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2583 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2584 else if (wheelEvent->deltaY > 0) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2585 { |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2586 that.ChangeFrame(isCtrl ? SeriesCursor::Action_FastPlus : |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2587 SeriesCursor::Action_Plus, false /* not circular */); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2588 } |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2589 |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2590 if (that.synchronizationEnabled_) |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2591 { |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2592 const size_t currentCursorIndex = that.cursor_->GetCurrentIndex(); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2593 |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2594 const OrthancStone::CoordinateSystem3D current = |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2595 that.frames_->GetFrameGeometry(currentCursorIndex); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2596 |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2597 if (isShift && |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2598 previousCursorIndex != currentCursorIndex) |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2599 { |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2600 const OrthancStone::CoordinateSystem3D previous = |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2601 that.frames_->GetFrameGeometry(previousCursorIndex); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2602 that.synchronizationOffset_ += previous.GetOrigin() - current.GetOrigin(); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2603 } |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2604 |
1694 | 2605 that.observer_->SignalSynchronizedBrowsing( |
2606 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
|
2607 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2608 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2609 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2610 return true; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2611 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2612 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2613 void Handle(const OrthancStone::DicomResourcesLoader::SuccessMessage& message) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2614 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2615 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
|
2616 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2617 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2618 void Handle(const OrthancStone::HttpCommand::SuccessMessage& message) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2619 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2620 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
|
2621 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2622 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2623 void Handle(const OrthancStone::ParseDicomSuccessMessage& message) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2624 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2625 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
|
2626 } |
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2627 |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2628 |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2629 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
|
2630 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2631 { |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2632 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2633 stoneAnnotations_->Render(lock->GetController().GetScene()); |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2634 lock->Invalidate(); |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2635 } |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2636 |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2637 if (save) |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2638 { |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2639 if (cursor_.get() != NULL && |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2640 frames_.get() != NULL) |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2641 { |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2642 const size_t cursorIndex = cursor_->GetCurrentIndex(); |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2643 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2644 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2645 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2646 StoneAnnotationsRegistry::GetInstance().Save(instance.GetSopInstanceUid(), frameNumber, *stoneAnnotations_); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2647 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2648 if (observer_.get() != NULL) |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2649 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2650 observer_->SignalStoneAnnotationsChanged(*this, instance.GetSopInstanceUid(), frameNumber); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2651 } |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2652 } |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2653 } |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2654 } |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2655 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2656 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
|
2657 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2658 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
|
2659 } |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2660 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2661 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
|
2662 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2663 RefreshAnnotations(true /* save */); |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2664 } |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2665 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2666 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
|
2667 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2668 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
|
2669 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2670 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
|
2671 { |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2672 observer_->SignalStoneAnnotationAdded(*this); |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2673 } |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2674 } |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2675 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2676 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
|
2677 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2678 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
|
2679 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2680 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
|
2681 { |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2682 observer_->SignalStoneAnnotationRemoved(*this); |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2683 } |
1809
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 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2686 public: |
1622
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2687 virtual ~ViewerViewport() |
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2688 { |
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2689 // 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
|
2690 // 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
|
2691 // 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
|
2692 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
|
2693 } |
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2694 |
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
|
2695 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
|
2696 const OrthancStone::DicomSource& source, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2697 const std::string& canvas, |
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2698 boost::shared_ptr<FramesCache> cache, |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2699 bool softwareRendering) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2700 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2701 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
|
2702 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
|
2703 |
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
|
2704 { |
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
|
2705 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
|
2706 |
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
|
2707 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
|
2708 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
|
2709 *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
|
2710 |
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
|
2711 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
|
2712 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
|
2713 |
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
|
2714 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
|
2715 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
|
2716 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2717 viewport->Register<OrthancStone::AnnotationsSceneLayer::AnnotationChangedMessage>( |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2718 *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
|
2719 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2720 viewport->Register<OrthancStone::AnnotationsSceneLayer::AnnotationAddedMessage>( |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2721 *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
|
2722 |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2723 viewport->Register<OrthancStone::AnnotationsSceneLayer::AnnotationRemovedMessage>( |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2724 *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
|
2725 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2726 |
1721
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2727 { |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2728 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
|
2729 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
|
2730 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
|
2731 } |
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2732 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2733 return viewport; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2734 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2735 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2736 void SetFrames(OrthancStone::SortedFrames* frames) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2737 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2738 if (frames == NULL) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2739 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2740 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2741 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2742 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2743 fitNextContent_ = true; |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2744 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
|
2745 inverted_ = false; |
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2746 serverSideTranscoding_ = false; |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2747 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
|
2748 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2749 frames_.reset(frames); |
1970
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2750 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
|
2751 |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2752 if (frames_->GetFramesCount() != 0) |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2753 { |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2754 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
|
2755 std::string modality; |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2756 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
|
2757 { |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2758 if (modality == "MR" || |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2759 modality == "CT" || |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2760 modality == "NM" || |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2761 modality == "OPT" || |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2762 modality == "PT" || |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2763 modality == "RTDOSE" || |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2764 modality == "XA") |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2765 { |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2766 // 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
|
2767 // 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
|
2768 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
|
2769 } |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2770 } |
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2771 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2772 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2773 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
|
2774 |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
2775 SetWindowingPreset(); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2776 ClearViewport(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2777 prefetchQueue_.clear(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2778 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2779 if (observer_.get() != NULL) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2780 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2781 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
|
2782 frames_->GetFramesCount(), DisplayedFrameQuality_None, 0, "", ""); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2783 } |
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
|
2784 |
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2785 centralPhysicalWidth_ = 1; |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2786 centralPhysicalHeight_ = 1; |
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2787 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2788 if (frames_->GetFramesCount() != 0) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2789 { |
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
|
2790 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
|
2791 |
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
|
2792 /** |
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
|
2793 * 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
|
2794 * "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
|
2795 * 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
|
2796 * 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
|
2797 **/ |
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
|
2798 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
|
2799 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
|
2800 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
|
2801 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
|
2802 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
|
2803 GetSeriesThumbnailType(uid) != OrthancStone::SeriesThumbnailType_Video) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2804 { |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2805 // 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
|
2806 const std::string uri = ("studies/" + frames_->GetStudyInstanceUid() + |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2807 "/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
|
2808 "/instances/" + centralInstance.GetSopInstanceUid() + "/metadata"); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2809 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2810 loader_->ScheduleGetDicomWeb( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2811 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
|
2812 0, source_, uri, new LoadSeriesDetailsFromInstance(GetSharedObserver())); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2813 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2814 } |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
2815 |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
2816 ApplyScheduledFocus(); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2817 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2818 |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2819 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2820 // 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
|
2821 // 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
|
2822 void UpdateSize(bool fitContent) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2823 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2824 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
|
2825 lock->RefreshCanvasSize(); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2826 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2827 if (fitContent) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2828 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2829 lock->GetCompositor().FitContent(lock->GetController().GetScene()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2830 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2831 |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2832 stoneAnnotations_->ClearHover(); |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2833 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
|
2834 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2835 lock->Invalidate(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2836 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2837 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2838 void AcquireObserver(IObserver* observer) |
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 observer_.reset(observer); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2841 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2842 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2843 const std::string& GetCanvasId() const |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2844 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2845 assert(viewport_); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2846 return viewport_->GetCanvasId(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2847 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2848 |
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2849 |
1668 | 2850 void Redraw() |
2851 { | |
2852 if (cursor_.get() != NULL && | |
2853 frames_.get() != NULL) | |
2854 { | |
2855 const size_t cursorIndex = cursor_->GetCurrentIndex(); | |
2856 | |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2857 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2858 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2859 |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2860 FramesCache::Accessor accessor(*framesCache_, instance.GetSopInstanceUid(), frameNumber); |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2861 if (accessor.IsValid()) |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2862 { |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2863 RenderCurrentScene(accessor.GetImage(), instance, frameNumber, frames_->GetFrameGeometry(cursorIndex)); |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2864 |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2865 DisplayedFrameQuality quality; |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2866 |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2867 if (accessor.GetQuality() < QUALITY_FULL) |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2868 { |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2869 // 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
|
2870 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */); |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2871 quality = DisplayedFrameQuality_Low; |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2872 } |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2873 else |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2874 { |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2875 quality = DisplayedFrameQuality_High; |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2876 } |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2877 |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2878 SetupPrefetchAfterRendering(accessor.GetImage(), quality); |
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2879 } |
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2880 else |
1668 | 2881 { |
2882 // This frame is not cached yet: Load it | |
2883 if (source_.HasDicomWebRendered()) | |
2884 { | |
2885 ScheduleLoadRenderedFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */); | |
2886 } | |
2887 else | |
2888 { | |
2889 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */); | |
2890 } | |
2891 } | |
2892 } | |
2893 } | |
2894 | |
2895 | |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2896 // Returns "true" iff the frame has indeed changed |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2897 bool ChangeFrame(SeriesCursor::Action action, |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2898 bool isCircular) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2899 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2900 if (cursor_.get() != NULL) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2901 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2902 size_t previous = cursor_->GetCurrentIndex(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2903 |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2904 cursor_->Apply(action, isCircular); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2905 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2906 size_t current = cursor_->GetCurrentIndex(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2907 if (previous != current) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2908 { |
1668 | 2909 Redraw(); |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2910 return true; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2911 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2912 } |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2913 |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2914 return false; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2915 } |
1719
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2916 |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2917 |
1948
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2918 void SetFrame(unsigned int frameNumber) |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2919 { |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2920 if (cursor_.get() != NULL && |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2921 frameNumber < cursor_->GetFramesCount() && |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2922 frameNumber != cursor_->GetCurrentIndex()) |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2923 { |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2924 cursor_->SetCurrentIndex(frameNumber); |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2925 Redraw(); |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2926 } |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2927 } |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2928 |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2929 |
1719
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2930 void GoToFirstFrame() |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2931 { |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2932 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
|
2933 cursor_->GetCurrentIndex() != 0) |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2934 { |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2935 cursor_->SetCurrentIndex(0); |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2936 Redraw(); |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2937 } |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2938 } |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2939 |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2940 |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2941 void GoToLastFrame() |
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 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
|
2944 { |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2945 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
|
2946 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
|
2947 { |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2948 cursor_->SetCurrentIndex(last); |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2949 Redraw(); |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2950 } |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2951 } |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2952 } |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2953 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2954 |
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2955 bool GetCurrentFrameOfReferenceUid(std::string& frameOfReferenceUid) const |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2956 { |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2957 if (cursor_.get() != NULL && |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2958 frames_.get() != NULL) |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2959 { |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2960 frameOfReferenceUid = frames_->GetInstanceOfFrame(cursor_->GetCurrentIndex()).GetFrameOfReferenceUid(); |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2961 return true; |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2962 } |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2963 else |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2964 { |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2965 return false; |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2966 } |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2967 } |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2968 |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2969 bool GetCurrentPlane(OrthancStone::CoordinateSystem3D& plane) const |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2970 { |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2971 if (cursor_.get() != NULL && |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2972 frames_.get() != NULL) |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2973 { |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2974 plane = frames_->GetFrameGeometry(cursor_->GetCurrentIndex()); |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2975 return true; |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2976 } |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2977 else |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2978 { |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2979 return false; |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2980 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2981 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2982 |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2983 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
|
2984 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2985 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
|
2986 |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2987 if (cursor_.get() != NULL && |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2988 frames_.get() != NULL) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2989 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2990 const size_t cursorIndex = cursor_->GetCurrentIndex(); |
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2991 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2992 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
|
2993 |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2994 for (std::list<const ViewerViewport*>::const_iterator |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2995 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
|
2996 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2997 assert(*it != NULL); |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2998 |
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2999 OrthancStone::CoordinateSystem3D otherPlane; |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3000 std::string otherFrameOfReferenceUid; |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3001 if ((*it)->GetCurrentPlane(otherPlane) && |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3002 (*it)->GetCurrentFrameOfReferenceUid(otherFrameOfReferenceUid) && |
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3003 otherFrameOfReferenceUid == instance.GetFrameOfReferenceUid()) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3004 { |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3005 double x1, y1, x2, y2; |
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3006 if (GetReferenceLineCoordinates(x1, y1, x2, y2, instance, frame, otherPlane)) |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3007 { |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3008 OrthancStone::PolylineSceneLayer::Chain chain; |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3009 chain.push_back(OrthancStone::ScenePoint2D(x1, y1)); |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3010 chain.push_back(OrthancStone::ScenePoint2D(x2, y2)); |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3011 layer->AddChain(chain, false, 0, 255, 0); |
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3012 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3013 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3014 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3015 } |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3016 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3017 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3018 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
|
3019 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3020 if (layer->GetChainsCount() == 0) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3021 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3022 lock->GetController().GetScene().DeleteLayer(LAYER_REFERENCE_LINES); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3023 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3024 else |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3025 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3026 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
|
3027 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3028 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3029 //lock->GetCompositor().Refresh(lock->GetController().GetScene()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3030 lock->Invalidate(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3031 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3032 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3033 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3034 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3035 void ClearReferenceLines() |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3036 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3037 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3038 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
|
3039 lock->GetController().GetScene().DeleteLayer(LAYER_REFERENCE_LINES); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3040 lock->Invalidate(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3041 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3042 } |
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 |
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3045 void SetWindowingPreset() |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3046 { |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3047 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
|
3048 |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3049 if (windowingPresetCenters_.empty()) |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3050 { |
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3051 SetWindowing(128, 256); |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3052 } |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3053 else |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3054 { |
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3055 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
|
3056 } |
1495
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 void SetWindowing(float windowingCenter, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3060 float windowingWidth) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3061 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3062 windowingCenter_ = windowingCenter; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3063 windowingWidth_ = windowingWidth; |
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3064 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
|
3065 |
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3066 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
|
3067 { |
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3068 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
|
3069 } |
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3070 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3071 |
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3072 void FlipX() |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3073 { |
1989
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3074 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3075 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3076 lock->GetController().GetScene().FlipViewportX( |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3077 lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight()); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3078 lock->Invalidate(); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3079 } |
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3080 } |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3081 |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3082 void FlipY() |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3083 { |
1989
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3084 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3085 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3086 lock->GetController().GetScene().FlipViewportY( |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3087 lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight()); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3088 lock->Invalidate(); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3089 } |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3090 } |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3091 |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3092 void RotateLeft() |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3093 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3094 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3095 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3096 lock->GetController().GetScene().RotateViewport( |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3097 -PI / 2.0, lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight()); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3098 lock->Invalidate(); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3099 } |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3100 } |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3101 |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3102 void RotateRight() |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3103 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3104 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3105 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3106 lock->GetController().GetScene().RotateViewport( |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3107 PI / 2.0, lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight()); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3108 lock->Invalidate(); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
3109 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3110 } |
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 void Invert() |
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 inverted_ = !inverted_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3115 |
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 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
|
3118 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3119 if (lock->GetController().GetScene().HasLayer(LAYER_TEXTURE) && |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3120 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE).GetType() == |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3121 OrthancStone::ISceneLayer::Type_FloatTexture) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3122 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3123 OrthancStone::FloatTextureSceneLayer& layer = |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3124 dynamic_cast<OrthancStone::FloatTextureSceneLayer&>( |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3125 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE)); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3126 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3127 // 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
|
3128 // compatibility with MONOCHROME1 images |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3129 layer.SetInverted(!layer.IsInverted()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3130 lock->Invalidate(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3131 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3132 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3133 } |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3134 |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3135 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3136 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3137 class Interactor : public OrthancStone::DefaultViewportInteractor |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3138 { |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3139 private: |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3140 ViewerViewport& viewer_; |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3141 WebViewerAction leftAction_; |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3142 WebViewerAction middleAction_; |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3143 WebViewerAction rightAction_; |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3144 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3145 bool IsAction(const OrthancStone::PointerEvent& event, |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3146 WebViewerAction action) |
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 switch (event.GetMouseButton()) |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3149 { |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3150 case OrthancStone::MouseButton_Left: |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3151 return (leftAction_ == action); |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3152 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3153 case OrthancStone::MouseButton_Middle: |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3154 return (middleAction_ == action); |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3155 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3156 case OrthancStone::MouseButton_Right: |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3157 return (rightAction_ == action); |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3158 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3159 default: |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3160 return false; |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3161 } |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3162 } |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3163 |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3164 public: |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3165 Interactor(ViewerViewport& viewer, |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3166 WebViewerAction leftAction, |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3167 WebViewerAction middleAction, |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3168 WebViewerAction rightAction) : |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3169 viewer_(viewer), |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3170 leftAction_(leftAction), |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3171 middleAction_(middleAction), |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3172 rightAction_(rightAction) |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3173 { |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3174 SetLeftButtonAction(ConvertWebViewerAction(leftAction)); |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3175 SetMiddleButtonAction(ConvertWebViewerAction(middleAction)); |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3176 SetRightButtonAction(ConvertWebViewerAction(rightAction)); |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3177 } |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3178 |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3179 virtual OrthancStone::IFlexiblePointerTracker* CreateTracker( |
1607 | 3180 boost::weak_ptr<OrthancStone::IViewport> viewport, |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3181 const OrthancStone::PointerEvent& event, |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3182 unsigned int viewportWidth, |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3183 unsigned int viewportHeight) ORTHANC_OVERRIDE |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3184 { |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3185 boost::shared_ptr<OrthancStone::IViewport> lock1(viewport.lock()); |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3186 |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3187 if (lock1 && |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3188 IsAction(event, WebViewerAction_Crosshair)) |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3189 { |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3190 OrthancStone::CoordinateSystem3D plane; |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3191 if (viewer_.GetCurrentPlane(plane)) |
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 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
|
3194 |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3195 const OrthancStone::ScenePoint2D p = event.GetMainPosition(); |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3196 double x = p.GetX(); |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3197 double y = p.GetY(); |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3198 lock2->GetController().GetCanvasToSceneTransform().Apply(x, y); |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3199 |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3200 OrthancStone::Vector click = plane.MapSliceToWorldCoordinates(x, y); |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3201 if (viewer_.observer_.get() != NULL) |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3202 { |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3203 viewer_.observer_->SignalCrosshair(viewer_, click); |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3204 } |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3205 } |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3206 |
1580 | 3207 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
|
3208 } |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3209 else |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3210 { |
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3211 // 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
|
3212 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
|
3213 { |
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3214 switch (leftAction_) |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
3215 { |
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3216 case WebViewerAction_CreateAngle: |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3217 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
|
3218 break; |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3219 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3220 case WebViewerAction_CreateCircle: |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3221 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
|
3222 break; |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3223 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3224 case WebViewerAction_CreateSegment: |
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
3225 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
|
3226 break; |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3227 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3228 case WebViewerAction_RemoveMeasure: |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3229 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
|
3230 break; |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3231 |
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
3232 case WebViewerAction_CreatePixelProbe: |
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
3233 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_PixelProbe); |
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
3234 break; |
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
3235 |
1982
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3236 case WebViewerAction_CreateEllipseProbe: |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3237 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
|
3238 break; |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3239 |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3240 case WebViewerAction_CreateRectangleProbe: |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3241 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
|
3242 break; |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3243 |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3244 case WebViewerAction_CreateTextAnnotation: |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3245 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
|
3246 break; |
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3247 |
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3248 default: |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3249 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
|
3250 break; |
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 |
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::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
|
3255 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3256 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
|
3257 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
|
3258 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3259 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
|
3260 { |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3261 return t.release(); |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3262 } |
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
3263 } |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
3264 } |
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
3265 |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3266 return DefaultViewportInteractor::CreateTracker( |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3267 viewport, event, viewportWidth, viewportHeight); |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3268 } |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3269 } |
1811
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 virtual bool HasMouseHover() const ORTHANC_OVERRIDE |
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 return true; |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3274 } |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3275 |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3276 virtual void HandleMouseHover(OrthancStone::IViewport& viewport, |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3277 const OrthancStone::PointerEvent& event) ORTHANC_OVERRIDE |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3278 { |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3279 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
|
3280 |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3281 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
|
3282 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3283 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
|
3284 lock->Invalidate(); |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3285 } |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3286 } |
1579
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 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3289 |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3290 void SetMouseButtonActions(WebViewerAction leftAction, |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3291 WebViewerAction middleAction, |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3292 WebViewerAction rightAction) |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3293 { |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3294 assert(viewport_ != NULL); |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3295 viewport_->AcquireInteractor(new Interactor(*this, leftAction, middleAction, rightAction)); |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3296 } |
1575 | 3297 |
1578 | 3298 void FitForPrint() |
1575 | 3299 { |
3300 viewport_->FitForPrint(); | |
3301 } | |
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 void SetOsiriXAnnotations(boost::shared_ptr<OrthancStone::OsiriX::CollectionOfAnnotations> annotations) |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
3304 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3305 osiriXAnnotations_ = annotations; |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
3306 } |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
3307 |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3308 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
|
3309 unsigned int frameNumber) |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3310 { |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3311 hasFocusOnInstance_ = true; |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3312 focusSopInstanceUid_ = sopInstanceUid; |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3313 focusFrameNumber_ = frameNumber; |
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 ApplyScheduledFocus(); |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3316 } |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3317 |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3318 void ApplyScheduledFocus() |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3319 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3320 size_t cursorIndex; |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3321 |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3322 if (hasFocusOnInstance_ && |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3323 cursor_.get() != NULL && |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3324 frames_.get() != NULL && |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3325 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
|
3326 { |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3327 size_t current = cursor_->GetCurrentIndex(); |
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 if (current != cursorIndex) |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3330 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3331 cursor_->SetCurrentIndex(cursorIndex); |
1668 | 3332 Redraw(); |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3333 } |
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 hasFocusOnInstance_ = false; |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3336 } |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3337 } |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3338 |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3339 void FocusOnPoint(const OrthancStone::Vector& p) |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3340 { |
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3341 //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
|
3342 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
|
3343 |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3344 size_t cursorIndex; |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3345 if (cursor_.get() != NULL && |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3346 frames_.get() != NULL && |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3347 frames_->FindClosestFrame(cursorIndex, p, MAX_DISTANCE)) |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3348 { |
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3349 cursor_->SetCurrentIndex(cursorIndex); |
1668 | 3350 Redraw(); |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3351 } |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3352 } |
1672
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 unsigned int GetCineRate() const |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3355 { |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3356 return cineRate_; |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3357 } |
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3358 |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3359 void FormatWindowingPresets(Json::Value& target) const |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3360 { |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3361 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
|
3362 |
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3363 target = Json::arrayValue; |
1681
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 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
|
3366 { |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3367 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
|
3368 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
|
3369 |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3370 std::string name = "Preset"; |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3371 if (windowingPresetCenters_.size() > 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 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
|
3374 } |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3375 |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3376 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
|
3377 preset["name"] = name; |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3378 preset["center"] = c; |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3379 preset["width"] = w; |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3380 preset["info"] = |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3381 ("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
|
3382 ", 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
|
3383 |
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3384 target.append(preset); |
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3385 } |
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3386 } |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3387 |
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 void SetSynchronizedBrowsingEnabled(int enabled) |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3390 { |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3391 OrthancStone::LinearAlgebra::AssignVector(synchronizationOffset_, 0, 0, 0); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3392 synchronizationEnabled_ = enabled; |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3393 } |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3394 |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3395 |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3396 void SignalStoneAnnotationsChanged(const std::string& sopInstanceUid, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3397 size_t frame) |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3398 { |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3399 if (cursor_.get() != NULL && |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3400 frames_.get() != NULL) |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3401 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3402 const size_t cursorIndex = cursor_->GetCurrentIndex(); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3403 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3404 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3405 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3406 if (instance.GetSopInstanceUid() == sopInstanceUid && |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3407 frameNumber == 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 StoneAnnotationsRegistry::GetInstance().Load(*stoneAnnotations_, instance.GetSopInstanceUid(), frame); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3410 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3411 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3412 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
|
3413 stoneAnnotations_->Render(lock->GetController().GetScene()); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3414 lock->Invalidate(); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3415 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3416 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3417 } |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3418 } |
1495
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3424 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3425 typedef std::map<std::string, boost::shared_ptr<ViewerViewport> > Viewports; |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3426 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3427 static Viewports allViewports_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3428 static bool showReferenceLines_ = true; |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3429 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
|
3430 |
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 static void UpdateReferenceLines() |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3433 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3434 if (showReferenceLines_) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3435 { |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3436 std::list<const ViewerViewport*> viewports; |
1495
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 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
|
3439 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3440 assert(it->second != NULL); |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3441 viewports.push_back(it->second.get()); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3442 } |
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 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
|
3445 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3446 assert(it->second != NULL); |
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3447 it->second->UpdateReferenceLines(viewports); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3448 } |
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 else |
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 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
|
3453 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3454 assert(it->second != NULL); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3455 it->second->ClearReferenceLines(); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3460 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3461 class WebAssemblyObserver : public ResourcesLoader::IObserver, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3462 public ViewerViewport::IObserver |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3463 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3464 public: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3465 virtual void SignalResourcesLoaded() ORTHANC_OVERRIDE |
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 DISPATCH_JAVASCRIPT_EVENT("ResourcesLoaded"); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3468 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3469 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3470 virtual void SignalSeriesThumbnailLoaded(const std::string& studyInstanceUid, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3471 const std::string& seriesInstanceUid) ORTHANC_OVERRIDE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3472 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3473 EM_ASM({ |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3474 const customEvent = document.createEvent("CustomEvent"); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3475 customEvent.initCustomEvent("ThumbnailLoaded", false, false, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3476 { "studyInstanceUid" : UTF8ToString($0), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3477 "seriesInstanceUid" : UTF8ToString($1) }); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3478 window.dispatchEvent(customEvent); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3479 }, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3480 studyInstanceUid.c_str(), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3481 seriesInstanceUid.c_str()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3482 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3483 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3484 virtual void SignalSeriesMetadataLoaded(const std::string& studyInstanceUid, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3485 const std::string& seriesInstanceUid) ORTHANC_OVERRIDE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3486 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3487 EM_ASM({ |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3488 const customEvent = document.createEvent("CustomEvent"); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3489 customEvent.initCustomEvent("MetadataLoaded", false, false, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3490 { "studyInstanceUid" : UTF8ToString($0), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3491 "seriesInstanceUid" : UTF8ToString($1) }); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3492 window.dispatchEvent(customEvent); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3493 }, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3494 studyInstanceUid.c_str(), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3495 seriesInstanceUid.c_str()); |
1603
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 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
|
3498 { |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3499 assert(it->second != NULL); |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3500 it->second->ApplyScheduledFocus(); |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3501 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3502 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3503 |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3504 virtual void SignalSeriesDetailsReady(const ViewerViewport& viewport) ORTHANC_OVERRIDE |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3505 { |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3506 EM_ASM({ |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3507 const customEvent = document.createEvent("CustomEvent"); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3508 customEvent.initCustomEvent("SeriesDetailsReady", false, false, |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3509 { "canvasId" : UTF8ToString($0) }); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3510 window.dispatchEvent(customEvent); |
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 viewport.GetCanvasId().c_str() |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3513 ); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3514 } |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3515 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3516 virtual void SignalFrameUpdated(const ViewerViewport& viewport, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3517 size_t currentFrame, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3518 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
|
3519 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
|
3520 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
|
3521 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
|
3522 const std::string& contentTime) ORTHANC_OVERRIDE |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3523 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3524 EM_ASM({ |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3525 const customEvent = document.createEvent("CustomEvent"); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3526 customEvent.initCustomEvent("FrameUpdated", false, false, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3527 { "canvasId" : UTF8ToString($0), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3528 "currentFrame" : $1, |
1674
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
3529 "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
|
3530 "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
|
3531 "instanceNumber" : $4, |
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3532 "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
|
3533 "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
|
3534 }); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3535 window.dispatchEvent(customEvent); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3536 }, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3537 viewport.GetCanvasId().c_str(), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3538 static_cast<int>(currentFrame), |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3539 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
|
3540 quality, |
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3541 instanceNumber, |
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3542 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
|
3543 contentTime.c_str()); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3544 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3545 UpdateReferenceLines(); |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3546 } |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3547 |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3548 virtual void SignalCrosshair(const ViewerViewport& viewport, |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3549 const OrthancStone::Vector& click) ORTHANC_OVERRIDE |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3550 { |
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3551 if (click.size() != 3u) |
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3554 } |
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3555 |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3556 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
|
3557 { |
1694 | 3558 // TODO - One could check the "Frame Of Reference UID" here |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3559 assert(it->second.get() != NULL); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3560 if (it->second.get() != &viewport) |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3561 { |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3562 it->second->FocusOnPoint(click); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3563 } |
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3564 } |
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3565 } |
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3566 |
1694 | 3567 virtual void SignalSynchronizedBrowsing(const ViewerViewport& viewport, |
3568 const OrthancStone::Vector& click, | |
3569 const OrthancStone::Vector& normal) ORTHANC_OVERRIDE | |
3570 { | |
3571 for (Viewports::const_iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) | |
3572 { | |
3573 assert(it->second.get() != NULL); | |
3574 | |
3575 OrthancStone::CoordinateSystem3D plane; | |
3576 bool isOpposite; | |
3577 | |
3578 if (it->second.get() != &viewport && | |
3579 it->second->GetCurrentPlane(plane) && | |
3580 OrthancStone::GeometryToolbox::IsParallelOrOpposite(isOpposite, plane.GetNormal(), normal)) | |
3581 { | |
3582 it->second->FocusOnPoint(click); | |
3583 } | |
3584 } | |
3585 } | |
3586 | |
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3587 virtual void SignalSeriesPdfLoaded(const std::string& studyInstanceUid, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3588 const std::string& seriesInstanceUid, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3589 const std::string& pdf) ORTHANC_OVERRIDE |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3590 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3591 EM_ASM({ |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3592 const customEvent = document.createEvent("CustomEvent"); |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3593 customEvent.initCustomEvent("PdfLoaded", false, false, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3594 { "studyInstanceUid" : UTF8ToString($0), |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3595 "seriesInstanceUid" : UTF8ToString($1), |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3596 "pdfPointer" : $2, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3597 "pdfSize": $3}); |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3598 window.dispatchEvent(customEvent); |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3599 }, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3600 studyInstanceUid.c_str(), |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3601 seriesInstanceUid.c_str(), |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3602 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
|
3603 pdf.size()); |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3604 } |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3605 |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3606 |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
3607 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
|
3608 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
|
3609 { |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3610 std::string dataUriScheme; |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3611 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
|
3612 |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3613 EM_ASM({ |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3614 const customEvent = document.createEvent("CustomEvent"); |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
3615 customEvent.initCustomEvent("VirtualSeriesThumbnailLoaded", false, false, |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
3616 { "virtualSeriesId" : UTF8ToString($0), |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3617 "thumbnail" : UTF8ToString($1) }); |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3618 window.dispatchEvent(customEvent); |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3619 }, |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
3620 virtualSeriesId.c_str(), |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3621 dataUriScheme.c_str()); |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3622 } |
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3623 |
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3624 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
|
3625 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
|
3626 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
|
3627 { |
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3628 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
|
3629 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
|
3630 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
|
3631 { "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
|
3632 "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
|
3633 "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
|
3634 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
|
3635 }, |
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3636 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
|
3637 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
|
3638 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
|
3639 |
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3640 UpdateReferenceLines(); |
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3641 } |
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3642 |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3643 virtual void SignalStoneAnnotationsChanged(const ViewerViewport& viewport, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3644 const std::string& sopInstanceUid, |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3645 size_t frame) ORTHANC_OVERRIDE |
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 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
|
3648 { |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3649 assert(it->second.get() != NULL); |
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 if (it->second.get() != &viewport) |
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 it->second->SignalStoneAnnotationsChanged(sopInstanceUid, frame); |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3654 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3655 } |
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3656 } |
1815
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 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
|
3659 { |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3660 EM_ASM({ |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3661 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
|
3662 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
|
3663 { "canvasId" : UTF8ToString($0) }); |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3664 window.dispatchEvent(customEvent); |
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 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
|
3667 } |
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 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
|
3670 { |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3671 EM_ASM({ |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3672 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
|
3673 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
|
3674 { "canvasId" : UTF8ToString($0) }); |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3675 window.dispatchEvent(customEvent); |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3676 }, |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3677 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
|
3678 } |
1495
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3682 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3683 static OrthancStone::DicomSource source_; |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
3684 static boost::shared_ptr<FramesCache> framesCache_; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3685 static boost::shared_ptr<OrthancStone::WebAssemblyLoadersContext> context_; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3686 static std::string stringBuffer_; |
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
3687 static bool softwareRendering_ = false; |
1701
b5a8bf32d969
new configuration options: "CombinedToolEnabled", "CombinedToolBehaviour" and "DownloadAsJpegEnabled"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1695
diff
changeset
|
3688 static WebViewerAction leftButtonAction_ = WebViewerAction_Windowing; |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3689 static WebViewerAction middleButtonAction_ = WebViewerAction_Pan; |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3690 static WebViewerAction rightButtonAction_ = WebViewerAction_Zoom; |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3691 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3692 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3693 static void FormatTags(std::string& target, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3694 const Orthanc::DicomMap& tags) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3695 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3696 Orthanc::DicomArray arr(tags); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3697 Json::Value v = Json::objectValue; |
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 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
|
3700 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3701 const Orthanc::DicomElement& element = arr.GetElement(i); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3702 if (!element.GetValue().IsBinary() && |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3703 !element.GetValue().IsNull()) |
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 v[element.GetTag().Format()] = element.GetValue().GetContent(); |
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 } |
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 target = v.toStyledString(); |
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 |
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 ResourcesLoader& GetResourcesLoader() |
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 static boost::shared_ptr<ResourcesLoader> 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 if (!resourcesLoader_) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3718 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3719 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
|
3720 resourcesLoader_ = ResourcesLoader::Create(*lock, source_); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3721 resourcesLoader_->AcquireObserver(new WebAssemblyObserver); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3722 } |
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 return *resourcesLoader_; |
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 |
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 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
|
3729 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3730 Viewports::iterator found = allViewports_.find(canvas); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3731 if (found == allViewports_.end()) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3732 { |
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
3733 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
|
3734 ViewerViewport::Create(*context_, source_, canvas, framesCache_, softwareRendering_)); |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3735 viewport->SetMouseButtonActions(leftButtonAction_, middleButtonAction_, rightButtonAction_); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3736 viewport->AcquireObserver(new WebAssemblyObserver); |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3737 viewport->SetOsiriXAnnotations(osiriXAnnotations_); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3738 allViewports_[canvas] = viewport; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3739 return viewport; |
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 else |
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 return found->second; |
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 |
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 extern "C" |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3749 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3750 int main(int argc, char const *argv[]) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3751 { |
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
|
3752 printf("Initializing Stone\n"); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3753 Orthanc::InitializeFramework("", true); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3754 Orthanc::Logging::EnableInfoLevel(true); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3755 //Orthanc::Logging::EnableTraceLevel(true); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3756 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3757 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
|
3758 context_->SetDicomCacheSize(128 * 1024 * 1024); // 128MB |
fc883105ee11
enable cache of ParsedDicomFile in oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1657
diff
changeset
|
3759 |
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
3760 framesCache_.reset(new FramesCache); |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3761 osiriXAnnotations_.reset(new OrthancStone::OsiriX::CollectionOfAnnotations); |
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3762 |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3763 DISPATCH_JAVASCRIPT_EVENT("StoneInitialized"); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3766 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3767 EMSCRIPTEN_KEEPALIVE |
1713
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3768 void SetDicomWebRoot(const char* uri, |
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3769 int useRendered) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3770 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3771 try |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3772 { |
1713
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3773 source_.SetDicomWebSource(uri); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3774 source_.SetDicomWebRendered(useRendered != 0); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3779 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3780 EMSCRIPTEN_KEEPALIVE |
1713
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3781 void SetDicomWebThroughOrthanc(const char* orthancRoot, |
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3782 const char* serverName, |
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3783 int hasRendered) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3784 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3785 try |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3786 { |
1713
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3787 context_->SetLocalOrthanc(orthancRoot); |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3788 source_.SetDicomWebThroughOrthancSource(serverName); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3789 source_.SetDicomWebRendered(hasRendered != 0); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3790 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3791 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3792 } |
1761
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3793 |
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3794 |
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3795 EMSCRIPTEN_KEEPALIVE |
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3796 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
|
3797 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
|
3798 { |
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3799 try |
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 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
|
3802 } |
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3803 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
|
3804 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3805 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3806 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3807 EMSCRIPTEN_KEEPALIVE |
1714
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3808 void SetDicomCacheSize(int sizeMB) |
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 try |
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 if (sizeMB == 0) |
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 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
|
3815 } |
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3816 else |
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 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
|
3819 } |
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 if (sizeMB >= 0) |
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 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
|
3824 } |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3829 |
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3830 EMSCRIPTEN_KEEPALIVE |
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3831 void SetSkipSeriesFromModalities(const char* value) |
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 try |
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 LOG(WARNING) << "SetSkipSeriesFromModalities " << value; |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3836 |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3837 Json::Value modalities; |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3838 Orthanc::Toolbox::ReadJson(modalities, value); |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3839 std::vector<std::string> skipSeriesFromModalities; |
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 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
|
3842 { |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3843 skipSeriesFromModalities.push_back(modalities[i].asString()); |
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 GetResourcesLoader().SetSkipSeriesFromModalities(skipSeriesFromModalities); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3850 |
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3851 EMSCRIPTEN_KEEPALIVE |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3852 void FetchAllStudies() |
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 try |
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 GetResourcesLoader().FetchAllStudies(); |
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 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3859 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3860 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3861 EMSCRIPTEN_KEEPALIVE |
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3862 void FetchPatient(const char* patientId) |
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 try |
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 GetResourcesLoader().FetchPatient(patientId); |
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 EXTERN_CATCH_EXCEPTIONS; |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3869 } |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3870 |
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3871 EMSCRIPTEN_KEEPALIVE |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3872 void FetchStudy(const char* studyInstanceUid) |
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 try |
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 GetResourcesLoader().FetchStudy(studyInstanceUid); |
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 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3879 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3880 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3881 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3882 void FetchSeries(const char* studyInstanceUid, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3883 const char* seriesInstanceUid) |
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 try |
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 GetResourcesLoader().FetchSeries(studyInstanceUid, seriesInstanceUid); |
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 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3890 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3891 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3892 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3893 int GetStudiesCount() |
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 try |
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 return GetResourcesLoader().GetStudiesCount(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3898 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3899 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3900 return 0; // on exception |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3901 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3902 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3903 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3904 int GetSeriesCount() |
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 try |
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 return GetResourcesLoader().GetSeriesCount(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3909 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3910 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3911 return 0; // on exception |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3914 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3915 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3916 const char* GetStringBuffer() |
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 return stringBuffer_.c_str(); |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3921 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3922 EMSCRIPTEN_KEEPALIVE |
1827
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3923 const char* GetStoneWebViewerVersion() |
1824
a56bf4c534ef
display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1822
diff
changeset
|
3924 { |
1827
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3925 return STONE_WEB_VIEWER_VERSION; |
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 |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3928 |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3929 EMSCRIPTEN_KEEPALIVE |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3930 const char* GetEmscriptenVersion() |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3931 { |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3932 // 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
|
3933 // freed when returning to JavaScript |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3934 static const std::string EMSCRIPTEN_VERSION = ( |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3935 boost::lexical_cast<std::string>(__EMSCRIPTEN_major__) + "." + |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3936 boost::lexical_cast<std::string>(__EMSCRIPTEN_minor__) + "." + |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3937 boost::lexical_cast<std::string>(__EMSCRIPTEN_tiny__)); |
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3938 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
|
3939 } |
a56bf4c534ef
display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1822
diff
changeset
|
3940 |
a56bf4c534ef
display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1822
diff
changeset
|
3941 |
a56bf4c534ef
display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1822
diff
changeset
|
3942 EMSCRIPTEN_KEEPALIVE |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3943 void LoadStudyTags(int i) |
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 try |
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 if (i < 0) |
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3950 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3951 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3952 Orthanc::DicomMap dicom; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3953 GetResourcesLoader().GetStudy(dicom, i); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3954 FormatTags(stringBuffer_, dicom); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3959 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3960 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3961 void LoadSeriesTags(int i) |
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 try |
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 if (i < 0) |
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3968 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3969 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3970 Orthanc::DicomMap dicom; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3971 GetResourcesLoader().GetSeries(dicom, i); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3972 FormatTags(stringBuffer_, dicom); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3977 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3978 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3979 int LoadSeriesThumbnail(const char* seriesInstanceUid) |
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 try |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3982 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3983 std::string image, mime; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3984 switch (GetResourcesLoader().GetSeriesThumbnail(image, mime, seriesInstanceUid)) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3985 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3986 case OrthancStone::SeriesThumbnailType_Image: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3987 Orthanc::Toolbox::EncodeDataUriScheme(stringBuffer_, mime, image); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3988 return ThumbnailType_Image; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3989 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3990 case OrthancStone::SeriesThumbnailType_Pdf: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3991 return ThumbnailType_Pdf; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3992 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3993 case OrthancStone::SeriesThumbnailType_Video: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3994 return ThumbnailType_Video; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3995 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3996 case OrthancStone::SeriesThumbnailType_NotLoaded: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3997 return ThumbnailType_Loading; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3998 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3999 case OrthancStone::SeriesThumbnailType_Unsupported: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4000 return ThumbnailType_NoPreview; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4001 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4002 default: |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4003 return ThumbnailType_Unknown; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4004 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4005 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4006 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4007 return ThumbnailType_Unknown; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4010 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4011 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4012 void SpeedUpFetchSeriesMetadata(const char* studyInstanceUid, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4013 const char* seriesInstanceUid) |
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 try |
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 GetResourcesLoader().FetchSeriesMetadata(PRIORITY_HIGH, studyInstanceUid, seriesInstanceUid); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4022 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4023 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4024 int IsSeriesComplete(const char* seriesInstanceUid) |
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 try |
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 return GetResourcesLoader().IsSeriesComplete(seriesInstanceUid) ? 1 : 0; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4029 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4030 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4031 return 0; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4032 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4033 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4034 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4035 int LoadSeriesInViewport(const char* canvas, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4036 const char* seriesInstanceUid) |
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 try |
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 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
|
4041 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4042 if (GetResourcesLoader().SortSeriesFrames(*frames, seriesInstanceUid)) |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4043 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4044 GetViewport(canvas)->SetFrames(frames.release()); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4045 return 1; |
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 else |
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 return 0; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4050 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4051 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4052 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4053 return 0; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4056 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4057 EMSCRIPTEN_KEEPALIVE |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4058 int LoadVirtualSeriesInViewport(const char* canvas, |
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4059 const char* virtualSeriesId) |
1704
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 try |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4062 { |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4063 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
|
4064 |
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
|
4065 if (GetResourcesLoader().SortVirtualSeriesFrames(*frames, virtualSeriesId)) |
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4066 { |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4067 GetViewport(canvas)->SetFrames(frames.release()); |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4068 return 1; |
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 else |
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 return 0; |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4073 } |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4074 } |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4075 EXTERN_CATCH_EXCEPTIONS; |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4076 return 0; |
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 |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4079 |
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4080 EMSCRIPTEN_KEEPALIVE |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4081 void AllViewportsUpdateSize(int fitContent) |
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 try |
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 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
|
4086 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4087 assert(it->second != NULL); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4088 it->second->UpdateSize(fitContent != 0); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4089 } |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4094 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4095 EMSCRIPTEN_KEEPALIVE |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4096 int DecrementFrame(const char* canvas, |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4097 int isCircular) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4098 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4099 try |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4100 { |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4101 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
|
4102 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4103 EXTERN_CATCH_EXCEPTIONS; |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4104 return 0; |
1495
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4107 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4108 EMSCRIPTEN_KEEPALIVE |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4109 int IncrementFrame(const char* canvas, |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4110 int isCircular) |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4111 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4112 try |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4113 { |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4114 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
|
4115 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4116 EXTERN_CATCH_EXCEPTIONS; |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4117 return 0; |
1495
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4120 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4121 EMSCRIPTEN_KEEPALIVE |
1948
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4122 void SetFrame(const char* canvas, |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4123 int frameNumber) |
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 try |
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 if (frameNumber >= 0) |
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 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
|
4130 } |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4135 |
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4136 EMSCRIPTEN_KEEPALIVE |
1719
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4137 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
|
4138 { |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4139 try |
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 GetViewport(canvas)->GoToFirstFrame(); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4146 |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4147 EMSCRIPTEN_KEEPALIVE |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4148 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
|
4149 { |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4150 try |
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 GetViewport(canvas)->GoToLastFrame(); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4157 |
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4158 EMSCRIPTEN_KEEPALIVE |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4159 void ShowReferenceLines(int show) |
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 try |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4162 { |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4163 showReferenceLines_ = (show != 0); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4164 UpdateReferenceLines(); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4169 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4170 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4171 void SetWindowing(const char* canvas, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4172 int center, |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4173 int width) |
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 try |
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 GetViewport(canvas)->SetWindowing(center, width); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4182 |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4183 EMSCRIPTEN_KEEPALIVE |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4184 void InvertContrast(const char* canvas) |
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 try |
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 GetViewport(canvas)->Invert(); |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4189 } |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4190 EXTERN_CATCH_EXCEPTIONS; |
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4191 } |
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4192 |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4193 |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4194 EMSCRIPTEN_KEEPALIVE |
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4195 void FlipX(const char* canvas) |
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 try |
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 GetViewport(canvas)->FlipX(); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4204 |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4205 EMSCRIPTEN_KEEPALIVE |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4206 void FlipY(const char* canvas) |
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 try |
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 GetViewport(canvas)->FlipY(); |
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 EXTERN_CATCH_EXCEPTIONS; |
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 |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4215 |
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4216 EMSCRIPTEN_KEEPALIVE |
1989
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4217 void RotateLeft(const char* canvas) |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4218 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4219 try |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4220 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4221 GetViewport(canvas)->RotateLeft(); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4222 } |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4223 EXTERN_CATCH_EXCEPTIONS; |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4224 } |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4225 |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4226 |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4227 EMSCRIPTEN_KEEPALIVE |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4228 void RotateRight(const char* canvas) |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4229 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4230 try |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4231 { |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4232 GetViewport(canvas)->RotateRight(); |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4233 } |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4234 EXTERN_CATCH_EXCEPTIONS; |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4235 } |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4236 |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4237 |
e8b9a2ba1df1
Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1982
diff
changeset
|
4238 EMSCRIPTEN_KEEPALIVE |
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4239 void SetSoftwareRendering(int softwareRendering) |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4240 { |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4241 softwareRendering_ = softwareRendering; |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4242 } |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4243 |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4244 |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4245 EMSCRIPTEN_KEEPALIVE |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4246 int IsSoftwareRendering() |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4247 { |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4248 return softwareRendering_; |
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4249 } |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4250 |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4251 |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4252 EMSCRIPTEN_KEEPALIVE |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4253 void SetMouseButtonActions(int leftAction, |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4254 int middleAction, |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4255 int rightAction) |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4256 { |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4257 try |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4258 { |
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
4259 leftButtonAction_ = static_cast<WebViewerAction>(leftAction); |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
4260 middleButtonAction_ = static_cast<WebViewerAction>(middleAction); |
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
4261 rightButtonAction_ = static_cast<WebViewerAction>(rightAction); |
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4262 |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4263 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4264 { |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4265 assert(it->second != NULL); |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4266 it->second->SetMouseButtonActions(leftButtonAction_, middleButtonAction_, rightButtonAction_); |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4267 } |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4268 } |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4269 EXTERN_CATCH_EXCEPTIONS; |
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4270 } |
1575 | 4271 |
4272 | |
4273 EMSCRIPTEN_KEEPALIVE | |
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4274 int GetLeftMouseButtonAction() |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4275 { |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4276 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
|
4277 } |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4278 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4279 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4280 EMSCRIPTEN_KEEPALIVE |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4281 int GetMiddleMouseButtonAction() |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4282 { |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4283 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
|
4284 } |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4285 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4286 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4287 EMSCRIPTEN_KEEPALIVE |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4288 int GetRightMouseButtonAction() |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4289 { |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4290 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
|
4291 } |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4292 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4293 |
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4294 EMSCRIPTEN_KEEPALIVE |
1578 | 4295 void FitForPrint() |
1575 | 4296 { |
4297 try | |
4298 { | |
4299 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) | |
4300 { | |
4301 assert(it->second != NULL); | |
4302 it->second->FitForPrint(); | |
4303 } | |
4304 } | |
4305 EXTERN_CATCH_EXCEPTIONS; | |
4306 } | |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4307 |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4308 |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4309 // 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
|
4310 // Instance UID" of the first loaded annotation |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4311 EMSCRIPTEN_KEEPALIVE |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4312 int LoadOsiriXAnnotations(const char* xml, |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4313 int clearPreviousAnnotations) |
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 try |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4316 { |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4317 if (clearPreviousAnnotations) |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4318 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4319 osiriXAnnotations_->Clear(); |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4320 } |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4321 |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4322 osiriXAnnotations_->LoadXml(xml); |
1603
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 // Force redraw, as the annotations might have changed |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4325 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4326 { |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4327 assert(it->second != NULL); |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4328 it->second->Redraw(); |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4329 } |
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 if (osiriXAnnotations_->GetSize() == 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 stringBuffer_.clear(); |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4334 } |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4335 else |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4336 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4337 stringBuffer_ = osiriXAnnotations_->GetAnnotation(0).GetSeriesInstanceUid(); |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4338 } |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4339 |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4340 LOG(WARNING) << "Loaded " << osiriXAnnotations_->GetSize() << " annotations from OsiriX"; |
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4341 return 1; |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4342 } |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4343 EXTERN_CATCH_EXCEPTIONS; |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4344 return 0; |
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4345 } |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4346 |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4347 |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4348 EMSCRIPTEN_KEEPALIVE |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4349 void FocusFirstOsiriXAnnotation(const char* canvas) |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4350 { |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4351 try |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4352 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4353 if (osiriXAnnotations_->GetSize() != 0) |
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4354 { |
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4355 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
|
4356 |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4357 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
|
4358 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
|
4359 |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4360 // 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
|
4361 viewport->Redraw(); |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4362 } |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4363 } |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4364 EXTERN_CATCH_EXCEPTIONS; |
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4365 } |
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4366 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4367 |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4368 EMSCRIPTEN_KEEPALIVE |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4369 void FetchPdf(const char* studyInstanceUid, |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4370 const char* seriesInstanceUid) |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4371 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4372 try |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4373 { |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4374 LOG(INFO) << "Fetching PDF series: " << seriesInstanceUid; |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4375 GetResourcesLoader().FetchPdf(studyInstanceUid, seriesInstanceUid); |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4376 } |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4377 EXTERN_CATCH_EXCEPTIONS; |
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4378 } |
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4379 |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4380 |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4381 EMSCRIPTEN_KEEPALIVE |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4382 unsigned int GetCineRate(const char* canvas) |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4383 { |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4384 try |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4385 { |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4386 return GetViewport(canvas)->GetCineRate(); |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4387 } |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4388 EXTERN_CATCH_EXCEPTIONS; |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4389 return 0; |
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4390 } |
1674
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4391 |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4392 |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4393 EMSCRIPTEN_KEEPALIVE |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4394 unsigned int GetSeriesNumberOfFrames(const char* seriesInstanceUid) |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4395 { |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4396 try |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4397 { |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4398 return GetResourcesLoader().GetSeriesNumberOfFrames(seriesInstanceUid); |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4399 } |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4400 EXTERN_CATCH_EXCEPTIONS; |
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4401 return 0; |
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4402 } |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4403 |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4404 |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4405 EMSCRIPTEN_KEEPALIVE |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4406 void LoadWindowingPresets(const char* canvas) |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4407 { |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4408 try |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4409 { |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4410 Json::Value v; |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4411 GetViewport(canvas)->FormatWindowingPresets(v); |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4412 stringBuffer_ = v.toStyledString(); |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4413 } |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4414 EXTERN_CATCH_EXCEPTIONS; |
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4415 } |
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4416 |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4417 |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4418 EMSCRIPTEN_KEEPALIVE |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4419 void SetSynchronizedBrowsingEnabled(int enabled) |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4420 { |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4421 try |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4422 { |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4423 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4424 { |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4425 assert(it->second != NULL); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4426 it->second->SetSynchronizedBrowsingEnabled(enabled); |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4427 } |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4428 } |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4429 EXTERN_CATCH_EXCEPTIONS; |
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4430 } |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4431 |
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 EMSCRIPTEN_KEEPALIVE |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4434 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
|
4435 { |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4436 try |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4437 { |
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
|
4438 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
|
4439 |
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
|
4440 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
|
4441 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
|
4442 { |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4443 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
|
4444 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
|
4445 { |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4446 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
|
4447 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
|
4448 item["NumberOfFrames"] = it->second; |
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4449 json.append(item); |
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4450 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4451 |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4452 stringBuffer_ = json.toStyledString(); |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4453 return true; |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4454 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4455 else |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4456 { |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4457 return false; |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4458 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4459 } |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4460 EXTERN_CATCH_EXCEPTIONS; |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4461 return false; |
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4462 } |
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4463 } |