Mercurial > hg > orthanc-stone

annotate Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp @ 2096:79e984a89a38 dicom-sr

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->dicom-sr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 08 Nov 2023 15:15:48 +0100
parents c336e07b675c ec676dbe85ac
children a9e23ef9ee09
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
2077
07964689cb0b upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2030
diff changeset
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
07964689cb0b upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2030
diff changeset
6 * Copyright (C) 2021-2023 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
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
68 #include "../../../OrthancStone/Sources/Loaders/DicomResourcesLoader.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
69 #include "../../../OrthancStone/Sources/Loaders/SeriesMetadataLoader.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
70 #include "../../../OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
71 #include "../../../OrthancStone/Sources/Messages/ObserverBase.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
72 #include "../../../OrthancStone/Sources/Oracle/ParseDicomFromWadoCommand.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
73 #include "../../../OrthancStone/Sources/Oracle/ParseDicomSuccessMessage.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
74 #include "../../../OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
75 #include "../../../OrthancStone/Sources/Scene2D/ArrowSceneLayer.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
76 #include "../../../OrthancStone/Sources/Scene2D/ColorTextureSceneLayer.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
77 #include "../../../OrthancStone/Sources/Scene2D/FloatTextureSceneLayer.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
78 #include "../../../OrthancStone/Sources/Scene2D/MacroSceneLayer.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
79 #include "../../../OrthancStone/Sources/Scene2D/OsiriXLayerFactory.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
80 #include "../../../OrthancStone/Sources/Scene2D/PolylineSceneLayer.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
81 #include "../../../OrthancStone/Sources/Scene2D/TextSceneLayer.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
82 #include "../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
83 #include "../../../OrthancStone/Sources/StoneException.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
84 #include "../../../OrthancStone/Sources/Toolbox/DicomInstanceParameters.h"
2089
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
85 #include "../../../OrthancStone/Sources/Toolbox/DicomStructuredReport.h"
1902
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
86 #include "../../../OrthancStone/Sources/Toolbox/GeometryToolbox.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
87 #include "../../../OrthancStone/Sources/Toolbox/OsiriX/AngleAnnotation.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
88 #include "../../../OrthancStone/Sources/Toolbox/OsiriX/CollectionOfAnnotations.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
89 #include "../../../OrthancStone/Sources/Toolbox/OsiriX/LineAnnotation.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
90 #include "../../../OrthancStone/Sources/Toolbox/OsiriX/TextAnnotation.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
91 #include "../../../OrthancStone/Sources/Toolbox/SortedFrames.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
92 #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
93
5887a4f8594b moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1580
diff changeset
94 // WebAssembly includes
1902
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
95 #include "../../../OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyCairoViewport.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
96 #include "../../../OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyLoadersContext.h"
1cfd602de69d fix wasm build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1871
diff changeset
97 #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
98
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
1989
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
100 #include <algorithm>
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 #include <boost/make_shared.hpp>
1989
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
102 #include <boost/math/constants/constants.hpp>
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
103 #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
104 #include <stdio.h>
1989
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
105
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
106 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
107
1632
9a4c09361f3e removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
108 #if !defined(STONE_WEB_VIEWER_EXPORT)
9a4c09361f3e removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
109 // 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
110 # define STONE_WEB_VIEWER_EXPORT
9a4c09361f3e removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
111 #endif
9a4c09361f3e removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
112
9a4c09361f3e removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
113
1695
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
114 #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
115
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
116
1632
9a4c09361f3e removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
117 enum STONE_WEB_VIEWER_EXPORT ThumbnailType
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 ThumbnailType_Image,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 ThumbnailType_NoPreview,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 ThumbnailType_Pdf,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 ThumbnailType_Video,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 ThumbnailType_Loading,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 ThumbnailType_Unknown
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
125 };
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127
1632
9a4c09361f3e removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
128 enum STONE_WEB_VIEWER_EXPORT DisplayedFrameQuality
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 {
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
130 DisplayedFrameQuality_None,
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
131 DisplayedFrameQuality_Low,
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
132 DisplayedFrameQuality_High
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
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
135
1632
9a4c09361f3e removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
136 enum STONE_WEB_VIEWER_EXPORT WebViewerAction
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
137 {
1815
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
138 WebViewerAction_None,
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
139
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
140 WebViewerAction_Windowing,
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
141 WebViewerAction_Zoom,
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
142 WebViewerAction_Pan,
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
143 WebViewerAction_Rotate,
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
144 WebViewerAction_Crosshair,
1993
317a53d4fdc6 added magnifying glass
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1989
diff changeset
145 WebViewerAction_MagnifyingGlass, // New in 2.4
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
146
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
147 WebViewerAction_CreateAngle,
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
148 WebViewerAction_CreateCircle,
1998
1fa3f484008e added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1996
diff changeset
149 WebViewerAction_CreateLength,
1975
5a434f5889f8 starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1970
diff changeset
150 WebViewerAction_RemoveMeasure,
1982
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
151 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
152 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
153 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
154 WebViewerAction_CreateTextAnnotation // New in 2.4
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
155 };
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
159 static OrthancStone::MouseAction ConvertWebViewerAction(int action)
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
160 {
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
161 switch (action)
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
162 {
1701
b5a8bf32d969 new configuration options: "CombinedToolEnabled", "CombinedToolBehaviour" and "DownloadAsJpegEnabled"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1695
diff changeset
163 case WebViewerAction_Windowing:
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
164 return OrthancStone::MouseAction_GrayscaleWindowing;
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
165
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
166 case WebViewerAction_Zoom:
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
167 return OrthancStone::MouseAction_Zoom;
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
168
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
169 case WebViewerAction_Pan:
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
170 return OrthancStone::MouseAction_Pan;
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
171
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
172 case WebViewerAction_Rotate:
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
173 return OrthancStone::MouseAction_Rotate;
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
174
1993
317a53d4fdc6 added magnifying glass
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1989
diff changeset
175 case WebViewerAction_MagnifyingGlass:
317a53d4fdc6 added magnifying glass
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1989
diff changeset
176 return OrthancStone::MouseAction_MagnifyingGlass;
317a53d4fdc6 added magnifying glass
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1989
diff changeset
177
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_None:
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
179 case WebViewerAction_Crosshair:
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
180 case WebViewerAction_CreateAngle:
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
181 case WebViewerAction_CreateCircle:
1998
1fa3f484008e added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1996
diff changeset
182 case WebViewerAction_CreateLength:
1815
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
183 case WebViewerAction_RemoveMeasure:
1980
0aac8f552d89 added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1978
diff changeset
184 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
185 case WebViewerAction_CreateEllipseProbe:
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
186 case WebViewerAction_CreateRectangleProbe:
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
187 case WebViewerAction_CreateTextAnnotation:
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
188 return OrthancStone::MouseAction_None;
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 default:
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
191 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
192 }
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
193 }
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
194
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
195
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
196
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 static const int PRIORITY_HIGH = -100;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 static const int PRIORITY_LOW = 100;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 static const int PRIORITY_NORMAL = 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 static const unsigned int QUALITY_JPEG = 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 static const unsigned int QUALITY_FULL = 1;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
204 static const unsigned int DEFAULT_CINE_RATE = 30;
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
205
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
206
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
207
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
208 class IFramesCollection : public boost::noncopyable
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
209 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
210 public:
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
211 virtual ~IFramesCollection()
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
212 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
213 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
214
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
215 virtual size_t GetFramesCount() const = 0;
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
216
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
217 virtual const OrthancStone::DicomInstanceParameters& GetInstanceOfFrame(size_t frameIndex) const = 0;
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
218
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
219 virtual unsigned int GetFrameNumberInInstance(size_t frameIndex) const = 0;
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
220
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
221 virtual bool LookupFrame(size_t& frameIndex,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
222 const std::string& sopInstanceUid,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
223 unsigned int frameNumber) const = 0;
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
224
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
225 virtual bool FindClosestFrame(size_t& frameIndex,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
226 const OrthancStone::Vector& point,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
227 double maximumDistance) const = 0;
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
228
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
229 static OrthancStone::CoordinateSystem3D GetFrameGeometry(const IFramesCollection& frames,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
230 size_t frameIndex)
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
231 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
232 return frames.GetInstanceOfFrame(frameIndex).GetFrameGeometry(frames.GetFrameNumberInInstance(frameIndex));
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
233 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
234 };
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
235
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
236
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
237 class SortedFramesCollection : public IFramesCollection
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
238 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
239 private:
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
240 std::unique_ptr<OrthancStone::SortedFrames> frames_;
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
241
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
242 public:
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
243 SortedFramesCollection(OrthancStone::SortedFrames* frames)
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
244 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
245 if (frames == NULL)
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
246 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
247 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
248 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
249 else
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
250 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
251 frames_.reset(frames);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
252 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
253 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
254
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
255 virtual size_t GetFramesCount() const ORTHANC_OVERRIDE
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
256 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
257 return frames_->GetFramesCount();
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
258 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
259
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
260 const OrthancStone::DicomInstanceParameters& GetInstanceOfFrame(size_t frameIndex) const ORTHANC_OVERRIDE
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
261 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
262 return frames_->GetInstanceOfFrame(frameIndex);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
263 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
264
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
265 virtual unsigned int GetFrameNumberInInstance(size_t frameIndex) const ORTHANC_OVERRIDE
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
266 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
267 return frames_->GetFrameNumberInInstance(frameIndex);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
268 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
269
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
270 virtual bool LookupFrame(size_t& frameIndex,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
271 const std::string& sopInstanceUid,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
272 unsigned int frameNumber) const ORTHANC_OVERRIDE
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
273 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
274 return frames_->LookupFrame(frameIndex, sopInstanceUid, frameNumber);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
275 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
276
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
277 virtual bool FindClosestFrame(size_t& frameIndex,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
278 const OrthancStone::Vector& point,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
279 double maximumDistance) const ORTHANC_OVERRIDE
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
280 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
281 return frames_->FindClosestFrame(frameIndex, point, maximumDistance);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
282 };
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
283 };
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
284
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
285
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
286 class DicomStructuredReportFrames : public IFramesCollection
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
287 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
288 private:
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
289 class Frame : public boost::noncopyable
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
290 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
291 private:
2092
b7d4d288459a refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2091
diff changeset
292 OrthancStone::DicomStructuredReport::ReferencedFrame info_;
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
293 Orthanc::DicomMap tags_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
294 std::unique_ptr<OrthancStone::DicomInstanceParameters> parameters_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
295
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
296 public:
2092
b7d4d288459a refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2091
diff changeset
297 Frame(const OrthancStone::DicomStructuredReport::ReferencedFrame& info,
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
298 const OrthancStone::LoadedDicomResources& instances) :
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
299 info_(info)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
300 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
301 if (!instances.LookupResource(tags_, info.GetSopInstanceUid()))
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
302 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
303 throw Orthanc::OrthancException(Orthanc::ErrorCode_InexistentItem);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
304 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
305
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
306 parameters_.reset(new OrthancStone::DicomInstanceParameters(tags_));
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
307 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
308
2092
b7d4d288459a refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2091
diff changeset
309 const OrthancStone::DicomStructuredReport::ReferencedFrame& GetInformation() const
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
310 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
311 return info_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
312 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
313
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
314 const Orthanc::DicomMap& GetTags() const
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
315 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
316 return tags_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
317 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
318
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
319 const OrthancStone::DicomInstanceParameters& GetParameters() const
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
320 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
321 return *parameters_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
322 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
323 };
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
324
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
325 std::string studyInstanceUid_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
326 std::string seriesInstanceUid_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
327 std::vector<Frame*> frames_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
328
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
329 void Finalize()
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
330 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
331 for (size_t i = 0; i < frames_.size(); i++)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
332 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
333 if (frames_[i] != NULL)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
334 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
335 delete frames_[i];
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
336 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
337 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
338
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
339 frames_.clear();
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
340 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
341
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
342 const Frame& GetFrame(size_t index) const
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
343 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
344 if (index >= frames_.size())
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
345 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
346 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
347 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
348 else
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
349 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
350 assert(frames_[index] != NULL);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
351 return *frames_[index];
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
352 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
353 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
354
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
355 public:
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
356 DicomStructuredReportFrames(OrthancStone::DicomStructuredReport& sr,
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
357 const OrthancStone::LoadedDicomResources& instances) :
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
358 studyInstanceUid_(sr.GetStudyInstanceUid()),
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
359 seriesInstanceUid_(sr.GetSeriesInstanceUid())
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
360 {
2092
b7d4d288459a refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2091
diff changeset
361 std::list<OrthancStone::DicomStructuredReport::ReferencedFrame> tmp;
b7d4d288459a refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2091
diff changeset
362 sr.ExportReferencedFrames(tmp);
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
363
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
364 frames_.reserve(tmp.size());
2092
b7d4d288459a refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2091
diff changeset
365 for (std::list<OrthancStone::DicomStructuredReport::ReferencedFrame>::const_iterator
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
366 it = tmp.begin(); it != tmp.end(); ++it)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
367 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
368 try
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
369 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
370 frames_.push_back(new Frame(*it, instances));
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
371 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
372 catch (Orthanc::OrthancException&)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
373 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
374 // An instance is not loaded yet
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
375 Finalize();
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
376 throw;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
377 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
378 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
379 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
380
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
381 virtual ~DicomStructuredReportFrames()
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
382 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
383 Finalize();
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
384 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
385
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
386 virtual size_t GetFramesCount() const ORTHANC_OVERRIDE
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
387 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
388 return frames_.size();
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
389 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
390
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
391 virtual const OrthancStone::DicomInstanceParameters& GetInstanceOfFrame(size_t frameIndex) const ORTHANC_OVERRIDE
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
392 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
393 return GetFrame(frameIndex).GetParameters();
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
394 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
395
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
396 virtual unsigned int GetFrameNumberInInstance(size_t frameIndex) const ORTHANC_OVERRIDE
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
397 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
398 return GetFrame(frameIndex).GetInformation().GetFrameNumber();
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
399 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
400
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
401 virtual bool LookupFrame(size_t& frameIndex,
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
402 const std::string& sopInstanceUid,
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
403 unsigned int frameNumber) const ORTHANC_OVERRIDE
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
404 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
405 // TODO - Could be speeded up with an additional index
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
406 for (size_t i = 0; i < frames_.size(); i++)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
407 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
408 if (frames_[i]->GetInformation().GetSopInstanceUid() == sopInstanceUid &&
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
409 frames_[i]->GetInformation().GetFrameNumber() == frameNumber)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
410 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
411 frameIndex = i;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
412 return true;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
413 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
414 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
415
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
416 return false;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
417 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
418
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
419 virtual bool FindClosestFrame(size_t& frameIndex,
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
420 const OrthancStone::Vector& point,
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
421 double maximumDistance) const ORTHANC_OVERRIDE
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
422 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
423 bool found = false;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
424
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
425 for (size_t i = 0; i < GetFramesCount(); i++)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
426 {
2093
c336e07b675c refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2092
diff changeset
427 double distance = GetFrameGeometry(*this, i).ComputeDistance(point);
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
428 if (distance <= maximumDistance)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
429 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
430 found = true;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
431 frameIndex = i;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
432 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
433 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
434
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
435 return found;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
436 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
437 };
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
438
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
439
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
440 class VirtualSeries : public boost::noncopyable
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
441 {
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
442 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
443 class Item : public boost::noncopyable
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
444 {
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
445 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
446 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
447 std::list<std::string> sopInstanceUids_;
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
448
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
449 public:
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
450 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
451 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
452 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
453 sopInstanceUids_(sopInstanceUids)
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
454 {
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
455 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
456
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
457 const std::string& GetSeriesInstanceUid() const
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
458 {
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
459 return seriesInstanceUid_;
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
460 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
461
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
462 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
463 {
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
464 return sopInstanceUids_;
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
465 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
466 };
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
467
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
468 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
469
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
470 Content content_;
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
471
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
472 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
473 {
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
474 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
475
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
476 if (found == content_.end())
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
477 {
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
478 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
479 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
480 else
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
481 {
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
482 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
483 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
484 }
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
485 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
486
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
487 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
488 ~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
489 {
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
490 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
491 {
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
492 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
493 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
494 }
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
495 }
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
496
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
497 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
498 const std::string& sopInstanceUid)
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
499 {
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
500 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
501 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
502 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
503 }
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
504
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
505 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
506 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
507 {
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
508 // 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
509 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
510
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
511 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
512 {
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
513 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
514 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
515 else
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
516 {
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
517 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
518 return virtualSeriesId;
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
519 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
520 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
521
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
522 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
523 {
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
524 return GetItem(id).GetSeriesInstanceUid();
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
525 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
526
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
527 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
528 {
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
529 return GetItem(id).GetSopInstanceUids();
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
530 }
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
531 };
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
532
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
533
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
534
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
535 class ResourcesLoader : public OrthancStone::ObserverBase<ResourcesLoader>
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
536 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
537 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
538 class IObserver : public boost::noncopyable
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
539 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
540 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
541 virtual ~IObserver()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
542 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
543 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
544
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
545 virtual void SignalResourcesLoaded() = 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
546
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
547 virtual void SignalSeriesThumbnailLoaded(const std::string& studyInstanceUid,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
548 const std::string& seriesInstanceUid) = 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
549
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
550 virtual void SignalSeriesMetadataLoaded(const std::string& studyInstanceUid,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
551 const std::string& seriesInstanceUid) = 0;
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
552
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
553 virtual void SignalSeriesPdfLoaded(const std::string& studyInstanceUid,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
554 const std::string& seriesInstanceUid,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
555 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
556
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
557 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
558 const std::string& jpeg) = 0;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
559 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
560
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
561 private:
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
562 OrthancStone::ILoadersContext& context_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
563 std::unique_ptr<IObserver> observer_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
564 OrthancStone::DicomSource source_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
565 size_t pending_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
566 boost::shared_ptr<OrthancStone::LoadedDicomResources> studies_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
567 boost::shared_ptr<OrthancStone::LoadedDicomResources> series_;
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
568 boost::shared_ptr<OrthancStone::LoadedDicomResources> instances_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
569 boost::shared_ptr<OrthancStone::DicomResourcesLoader> resourcesLoader_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
570 boost::shared_ptr<OrthancStone::SeriesThumbnailsLoader> thumbnailsLoader_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
571 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
572 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
573 VirtualSeries virtualSeries_;
1862
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
574 std::vector<std::string> skipSeriesFromModalities_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
575
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
576 typedef std::map<std::string, boost::shared_ptr<OrthancStone::DicomStructuredReport> > StructuredReports;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
577 StructuredReports structuredReports_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
578
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
579 explicit ResourcesLoader(OrthancStone::ILoadersContext& context,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
580 const OrthancStone::DicomSource& source) :
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
581 context_(context),
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
582 source_(source),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
583 pending_(0),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
584 studies_(new OrthancStone::LoadedDicomResources(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID)),
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
585 series_(new OrthancStone::LoadedDicomResources(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID)),
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
586 instances_(new OrthancStone::LoadedDicomResources(Orthanc::DICOM_TAG_SOP_INSTANCE_UID))
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
587 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
588 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
589
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
590 void Handle(const OrthancStone::DicomResourcesLoader::SuccessMessage& message)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
591 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
592 const Orthanc::SingleValueObject<Orthanc::ResourceType>& payload =
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
593 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
594
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
595 OrthancStone::LoadedDicomResources& dicom = *message.GetResources();
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 LOG(INFO) << "resources loaded: " << dicom.GetSize()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
598 << ", " << Orthanc::EnumerationToString(payload.GetValue());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
599
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
600 if (payload.GetValue() == Orthanc::ResourceType_Series)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
601 {
1862
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
602 // 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
603
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
604 std::vector<std::string> seriesIdsToRemove;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
605
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
606 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
607 {
1862
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
608 std::string studyInstanceUid, seriesInstanceUid, modality;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
609 if (dicom.GetResource(i).LookupStringValue(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
610 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
611 dicom.GetResource(i).LookupStringValue(
1862
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
612 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
613 dicom.GetResource(i).LookupStringValue(
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
614 modality, Orthanc::DICOM_TAG_MODALITY, false))
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
615 {
1862
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
616 // 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
617 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
618 {
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
619 thumbnailsLoader_->ScheduleLoadThumbnail(source_, "", studyInstanceUid, seriesInstanceUid);
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
620 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
621 }
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
622 else
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
623 {
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
624 seriesIdsToRemove.push_back(seriesInstanceUid);
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
625 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
626 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
627 }
1862
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
628
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
629 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
630 {
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
631 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
632 dicom.RemoveResource(seriesIdsToRemove[i]);
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
633 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
634 }
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
635 else if (payload.GetValue() == Orthanc::ResourceType_Instance)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
636 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
637 // This occurs if loading DICOM-SR
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
638
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
639 // TODO - Hide/show DICOM-SR once they have been loaded
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
640 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
641
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
642 if (payload.GetValue() == Orthanc::ResourceType_Study ||
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
643 payload.GetValue() == Orthanc::ResourceType_Series)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
644 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
645 if (pending_ == 0)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
646 {
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
647 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
648 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
649 else
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
650 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
651 pending_ --;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
652 if (pending_ == 0 &&
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
653 observer_.get() != NULL)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
654 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
655 observer_->SignalResourcesLoaded();
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
656 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
657 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
658 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
659 }
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 void Handle(const OrthancStone::SeriesThumbnailsLoader::SuccessMessage& message)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
662 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
663 if (observer_.get() != NULL)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
664 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
665 observer_->SignalSeriesThumbnailLoaded(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
666 message.GetStudyInstanceUid(), message.GetSeriesInstanceUid());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
667 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
668 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
669
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
670 void Handle(const OrthancStone::SeriesMetadataLoader::SuccessMessage& message)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
671 {
2090
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
672 for (size_t i = 0; i < message.GetInstancesCount(); i++)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
673 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
674 std::string sopInstanceUid, sopClassUid;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
675 if (message.GetInstance(i).LookupStringValue(sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false) &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
676 message.GetInstance(i).LookupStringValue(sopClassUid, Orthanc::DICOM_TAG_SOP_CLASS_UID, false) &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
677 OrthancStone::StringToSopClassUid(sopClassUid) == OrthancStone::SopClassUid_ComprehensiveSR)
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
678 {
2090
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
679 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(context_.Lock());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
680 lock->Schedule(
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
681 GetSharedObserver(), PRIORITY_NORMAL, OrthancStone::ParseDicomFromWadoCommand::Create(
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
682 source_, message.GetStudyInstanceUid(), message.GetSeriesInstanceUid(), sopInstanceUid,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
683 false /* no transcoding */, Orthanc::DicomTransferSyntax_LittleEndianExplicit /* dummy value */,
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
684 new InstanceInfo(message.GetStudyInstanceUid(), message.GetSeriesInstanceUid(), sopInstanceUid, Action_ComprehensiveSR)));
2090
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
685 return;
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
686 }
2090
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
687 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
688
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
689 if (observer_.get() != NULL)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
690 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
691 observer_->SignalSeriesMetadataLoaded(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
692 message.GetStudyInstanceUid(), message.GetSeriesInstanceUid());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
693 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
694 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
695
1702
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
696 void FetchInternal(const std::string& patientId,
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
697 const std::string& studyInstanceUid,
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
698 const std::string& seriesInstanceUid)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
699 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
700 // Firstly, load the study
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
701 Orthanc::DicomMap filter;
1702
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
702
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
703 if (!patientId.empty())
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
704 {
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
705 filter.SetValue(Orthanc::DICOM_TAG_PATIENT_ID, patientId, false);
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
706 }
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
707
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
708 if (!studyInstanceUid.empty())
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
709 {
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
710 filter.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, studyInstanceUid, false);
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
711 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
712
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
713 std::set<Orthanc::DicomTag> tags;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
714 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
715
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
716 resourcesLoader_->ScheduleQido(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
717 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
718 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
719
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
720 // Secondly, load the series
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
721 if (!seriesInstanceUid.empty())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
722 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
723 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
724 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
725
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
726 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
727
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
728 resourcesLoader_->ScheduleQido(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
729 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
730 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
731
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
732 pending_ += 2;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
733 }
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
734
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
735
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
736 enum Action
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
737 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
738 Action_Pdf,
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
739 Action_ComprehensiveSR,
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
740 Action_ReferencedInstance
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
741 };
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
742
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
743
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
744 class InstanceInfo : public Orthanc::IDynamicObject
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
745 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
746 private:
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
747 std::string studyInstanceUid_;
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
748 std::string seriesInstanceUid_;
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
749 std::string sopInstanceUid_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
750 Action action_;
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
751
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
752 public:
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
753 InstanceInfo(const std::string& studyInstanceUid,
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
754 const std::string& seriesInstanceUid,
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
755 const std::string& sopInstanceUid,
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
756 Action action) :
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
757 studyInstanceUid_(studyInstanceUid),
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
758 seriesInstanceUid_(seriesInstanceUid),
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
759 sopInstanceUid_(sopInstanceUid),
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
760 action_(action)
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
761 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
762 }
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
763
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
764 const std::string& GetStudyInstanceUid() const
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
765 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
766 return studyInstanceUid_;
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
767 }
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
768
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
769 const std::string& GetSeriesInstanceUid() const
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
770 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
771 return seriesInstanceUid_;
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
772 }
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
773
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
774 const std::string& GetSopInstanceUid() const
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
775 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
776 return sopInstanceUid_;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
777 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
778
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
779 Action GetAction() const
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
780 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
781 return action_;
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
782 }
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
783 };
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
784
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
785
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
786 void Handle(const OrthancStone::ParseDicomSuccessMessage& message)
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
787 {
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
788 const InstanceInfo& info = dynamic_cast<const InstanceInfo&>(message.GetOrigin().GetPayload());
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
789
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
790 if (observer_.get() != NULL)
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
791 {
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
792 switch (info.GetAction())
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
793 {
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
794 case Action_Pdf:
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
795 {
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
796 std::string pdf;
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
797 if (message.GetDicom().ExtractPdf(pdf))
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
798 {
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
799 observer_->SignalSeriesPdfLoaded(info.GetStudyInstanceUid(), info.GetSeriesInstanceUid(), pdf);
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
800 }
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
801 else
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
802 {
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
803 LOG(ERROR) << "Unable to extract PDF from series: " << info.GetSeriesInstanceUid();
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
804 }
2089
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
805
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
806 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
807 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
808
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
809 case Action_ComprehensiveSR:
2089
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
810 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
811 try
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
812 {
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
813 boost::shared_ptr<OrthancStone::DicomStructuredReport> sr(new OrthancStone::DicomStructuredReport(message.GetDicom()));
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
814
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
815 for (size_t i = 0; i < sr->GetReferencedInstancesCount(); i++)
2089
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
816 {
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
817 std::string studyInstanceUid;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
818 std::string seriesInstanceUid;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
819 std::string sopInstanceUid;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
820 std::string sopClassUid;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
821 sr->GetReferencedInstance(studyInstanceUid, seriesInstanceUid, sopInstanceUid, sopClassUid, i);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
822
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
823 Orthanc::DicomMap filter;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
824 filter.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, studyInstanceUid, false);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
825 filter.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, seriesInstanceUid, false);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
826 filter.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, sopInstanceUid, false);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
827
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
828 std::set<Orthanc::DicomTag> tags;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
829
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
830 resourcesLoader_->ScheduleQido(
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
831 instances_, PRIORITY_NORMAL, source_, Orthanc::ResourceType_Instance, filter, tags,
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
832 new Orthanc::SingleValueObject<Orthanc::ResourceType>(Orthanc::ResourceType_Instance));
2089
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
833 }
2090
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
834
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
835 structuredReports_[info.GetSeriesInstanceUid()] = sr;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
836
2090
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
837 if (observer_.get() != NULL)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
838 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
839 observer_->SignalSeriesMetadataLoaded(
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
840 info.GetStudyInstanceUid(), info.GetSeriesInstanceUid());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2089
diff changeset
841 }
2089
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
842 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
843 catch (Orthanc::OrthancException& e)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
844 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
845 LOG(ERROR) << "Cannot decode DICOM-SR: " << e.What();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
846 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2088
diff changeset
847 break;
2088
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
848 }
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
849
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
850 default:
b98d159c7545 created branch dicom-sr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2077
diff changeset
851 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
852 }
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 }
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
855
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
856 void FetchVirtualSeriesThumbnail(const std::string& virtualSeriesId,
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
857 const std::string& studyInstanceUid,
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
858 const std::string& seriesInstanceUid,
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
859 const std::string& sopInstanceUid)
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
860 {
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
861 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
862 {
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
863 scheduledVirtualSeriesThumbnails_.insert(virtualSeriesId);
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
864
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
865 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
866 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
867 arguments["viewport"] = (
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
868 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
869 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
870 headers["Accept"] = Orthanc::MIME_JPEG;
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
871
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
872 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
873 "/instances/" + sopInstanceUid + "/frames/1/rendered");
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
874
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
875 {
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
876 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
877 lock->Schedule(
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
878 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
879 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
880 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
881 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
882 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
883
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
884 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
885 {
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
886 if (observer_.get() != NULL)
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
887 {
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
888 const std::string& virtualSeriesId =
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
889 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
890 message.GetOrigin().GetPayload()).GetValue();
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
891 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
892 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
893 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
894
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
895 public:
1862
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
896 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
897 {
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
898 skipSeriesFromModalities_ = skipSeriesFromModalities;
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
899 }
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
900
1916
bd527bbc34df cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1902
diff changeset
901 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
902 const OrthancStone::DicomSource& source)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
903 {
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
904 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
905
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
906 loader->resourcesLoader_ = OrthancStone::DicomResourcesLoader::Create(lock);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
907 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
908 loader->metadataLoader_ = OrthancStone::SeriesMetadataLoader::Create(lock);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
909
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
910 loader->Register<OrthancStone::DicomResourcesLoader::SuccessMessage>(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
911 *loader->resourcesLoader_, &ResourcesLoader::Handle);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
912
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
913 loader->Register<OrthancStone::SeriesThumbnailsLoader::SuccessMessage>(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
914 *loader->thumbnailsLoader_, &ResourcesLoader::Handle);
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 loader->Register<OrthancStone::SeriesMetadataLoader::SuccessMessage>(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
917 *loader->metadataLoader_, &ResourcesLoader::Handle);
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
918
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
919 loader->Register<OrthancStone::ParseDicomSuccessMessage>(
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
920 lock.GetOracleObservable(), &ResourcesLoader::Handle);
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
921
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
922 loader->Register<OrthancStone::HttpCommand::SuccessMessage>(
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
923 lock.GetOracleObservable(), &ResourcesLoader::HandleInstanceThumbnail);
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
924
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
925 return loader;
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
928 void FetchAllStudies()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
929 {
1702
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
930 FetchInternal("", "", "");
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
931 }
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
932
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
933 void FetchPatient(const std::string& patientId)
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
934 {
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
935 if (!patientId.empty())
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
936 {
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
937 FetchInternal(patientId, "", "");
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
938 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
939 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
940
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
941 void FetchStudy(const std::string& studyInstanceUid)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
942 {
1702
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
943 if (!studyInstanceUid.empty())
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
944 {
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
945 FetchInternal("", studyInstanceUid, "");
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
946 }
1495
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
949 void FetchSeries(const std::string& studyInstanceUid,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
950 const std::string& seriesInstanceUid)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
951 {
1702
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
952 if (!studyInstanceUid.empty() &&
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
953 !seriesInstanceUid.empty())
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
954 {
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
955 FetchInternal("", studyInstanceUid, seriesInstanceUid);
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
956 }
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
959 size_t GetStudiesCount() const
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 return studies_->GetSize();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
962 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
963
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
964 size_t GetSeriesCount() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
965 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
966 return series_->GetSize();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
967 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
968
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
969 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
970 size_t i) const
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
971 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
972 target.Assign(studies_->GetResource(i));
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
975 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
976 size_t i) const
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
977 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
978 target.Assign(series_->GetResource(i));
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
979
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
980 // Complement with the study-level tags
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
981 std::string studyInstanceUid;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
982 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
983 studies_->HasResource(studyInstanceUid))
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 studies_->MergeResource(target, studyInstanceUid);
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 OrthancStone::SeriesThumbnailType GetSeriesThumbnail(std::string& image,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
990 std::string& mime,
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
991 const std::string& seriesInstanceUid) const
1495
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 return thumbnailsLoader_->GetSeriesThumbnail(image, mime, seriesInstanceUid);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
994 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
995
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
996 void FetchSeriesMetadata(int priority,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
997 const std::string& studyInstanceUid,
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
998 const std::string& seriesInstanceUid) const
1495
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 metadataLoader_->ScheduleLoadSeries(priority, source_, studyInstanceUid, seriesInstanceUid);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1001 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1002
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1003 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
1004 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1005 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1006 return accessor.IsComplete();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1007 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1008
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
1009 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
1010 const std::string& seriesInstanceUid)
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1011 {
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1012 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
1013 if (accessor.IsComplete() &&
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1014 accessor.GetInstancesCount() >= 2)
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1015 {
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
1016 bool hasMultiframe = false;
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1017
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1018 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
1019 {
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1020 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
1021
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1022 if (p.GetNumberOfFrames() > 1)
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1023 {
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
1024 hasMultiframe = true;
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1025 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1026 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1027
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
1028 if (hasMultiframe)
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1029 {
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
1030 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
1031 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
1032
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1033 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
1034 {
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1035 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
1036
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
1037 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
1038 {
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
1039 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
1040 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
1041 {
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
1042 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
1043 }
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
1044 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
1045 {
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
1046 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
1047 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
1048 }
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
1049 }
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
1050 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
1051 {
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
1052 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
1053 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
1054 }
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
1055 }
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
1056
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
1057 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
1058 {
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
1059 /**
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
1060 * 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
1061 * 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
1062 * (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
1063 * 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
1064 * 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
1065 **/
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
1066 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
1067 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
1068 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
1069 }
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
1070
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
1071 return true;
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1072 }
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
1073 else
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
1074 {
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
1075 return false;
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
1076 }
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1077 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1078 else
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1079 {
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1080 return false;
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1081 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1082 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
1083
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1084 IFramesCollection* GetSeriesFrames(const std::string& seriesInstanceUid) const
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1085 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1086 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1087
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1088 if (accessor.IsComplete())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1089 {
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1090 StructuredReports::const_iterator sr = structuredReports_.find(seriesInstanceUid);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1091 if (sr != structuredReports_.end())
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1092 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1093 assert(sr->second != NULL);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1094
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1095 try
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1096 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1097 return new DicomStructuredReportFrames(*sr->second, *instances_);
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1098 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1099 catch (Orthanc::OrthancException&)
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1100 {
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1101 // TODO
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1102 LOG(ERROR) << "Instances of the DICOM-SR are not available yet";
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1103 return NULL;
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1104 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1105 }
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1106
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1107 std::unique_ptr<OrthancStone::SortedFrames> target(new OrthancStone::SortedFrames);
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1108 target->Clear();
1495
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 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
1111 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1112 target->AddInstance(accessor.GetInstance(i));
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1113 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1114
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1115 target->Sort();
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1116
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1117 return new SortedFramesCollection(target.release());
1495
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 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1120 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1121 return NULL;
1495
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 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1124
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1125 IFramesCollection* GetVirtualSeriesFrames(const std::string& virtualSeriesId) const
1704
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1126 {
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
1127 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
1128
1704
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1129 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid);
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1130
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1131 if (accessor.IsComplete())
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1132 {
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
1133 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
1134
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1135 std::unique_ptr<OrthancStone::SortedFrames> target(new OrthancStone::SortedFrames);
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1136 target->Clear();
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
1137
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
1138 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
1139 it = sopInstanceUids.begin(); it != sopInstanceUids.end(); ++it)
1704
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1140 {
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
1141 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
1142 if (accessor.LookupInstance(instance, *it))
1704
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1143 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1144 target->AddInstance(instance);
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
1145 }
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
1146 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
1147 {
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
1148 LOG(ERROR) << "Missing instance: " << *it;
1704
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1149 }
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1150 }
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1151
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1152 target->Sort();
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1153
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1154 return new SortedFramesCollection(target.release());
1704
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1155 }
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1156 else
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1157 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
1158 return NULL;
1704
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1159 }
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1160 }
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
1161
1674
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1162 size_t GetSeriesNumberOfFrames(const std::string& seriesInstanceUid) const
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1163 {
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1164 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid);
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1165
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1166 if (accessor.IsComplete())
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1167 {
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1168 size_t count = 0;
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1169
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1170 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
1171 {
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1172 uint32_t f;
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1173 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
1174 {
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1175 count += f;
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1176 }
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1177 else
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1178 {
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1179 count++;
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1180 }
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1181 }
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1182
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1183 return count;
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1184 }
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1185 else
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1186 {
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1187 return 0;
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1188 }
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1189 }
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
1190
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1191 void AcquireObserver(IObserver* observer)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1192 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1193 observer_.reset(observer);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1194 }
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1195
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1196 void FetchPdf(const std::string& studyInstanceUid,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1197 const std::string& seriesInstanceUid)
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1198 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1199 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid);
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1200
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1201 if (accessor.IsComplete())
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1202 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1203 if (accessor.GetInstancesCount() > 1)
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1204 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1205 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
1206 << seriesInstanceUid;
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1207 }
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1208
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1209 for (size_t i = 0; i < accessor.GetInstancesCount(); i++)
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1210 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1211 std::string sopClassUid, sopInstanceUid;
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1212 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
1213 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
1214 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
1215 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1216 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(context_.Lock());
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1217 lock->Schedule(
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1218 GetSharedObserver(), PRIORITY_NORMAL, OrthancStone::ParseDicomFromWadoCommand::Create(
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1219 source_, studyInstanceUid, seriesInstanceUid, sopInstanceUid,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1220 false /* no transcoding */, Orthanc::DicomTransferSyntax_LittleEndianExplicit /* dummy value */,
2091
35de56fb6f89 support of referenced instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2090
diff changeset
1221 new InstanceInfo(studyInstanceUid, seriesInstanceUid, sopInstanceUid, Action_Pdf)));
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1222 return;
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1223 }
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1224 }
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1225
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1226 LOG(WARNING) << "Series without a PDF: " << seriesInstanceUid;
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1227 }
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
1228 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1229 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1230
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1231
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 class FramesCache : public boost::noncopyable
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1234 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1235 private:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1236 class CachedImage : public Orthanc::ICacheable
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 private:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1239 std::unique_ptr<Orthanc::ImageAccessor> image_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1240 unsigned int quality_;
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 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1243 CachedImage(Orthanc::ImageAccessor* image,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1244 unsigned int quality) :
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1245 image_(image),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1246 quality_(quality)
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 assert(image != NULL);
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
1573
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1565
diff changeset
1251 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
1252 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1253 assert(image_.get() != NULL);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1254 return (image_->GetBytesPerPixel() * image_->GetPitch() * image_->GetHeight());
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 const Orthanc::ImageAccessor& GetImage() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1258 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1259 assert(image_.get() != NULL);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1260 return *image_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1261 }
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 unsigned int GetQuality() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1264 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1265 return quality_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1266 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1267 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1268
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1269
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1270 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
1271 size_t frameNumber)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1272 {
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
1273 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
1274 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1275
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 Orthanc::MemoryObjectCache cache_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1278
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1279 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1280 FramesCache()
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 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
1283 //SetMaximumSize(1); // DISABLE CACHE
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1284 }
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 size_t GetMaximumSize()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1287 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1288 return cache_.GetMaximumSize();
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 void SetMaximumSize(size_t size)
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 cache_.SetMaximumSize(size);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1294 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1295
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1296 /**
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1297 * 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
1298 * 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
1299 **/
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1300 bool Acquire(const std::string& sopInstanceUid,
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
1301 size_t frameNumber,
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1302 Orthanc::ImageAccessor* image /* transfer ownership */,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1303 unsigned int quality)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1304 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1305 std::unique_ptr<Orthanc::ImageAccessor> protection(image);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1306
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1307 if (image == NULL)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1308 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1309 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1310 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1311 else if (image->GetFormat() != Orthanc::PixelFormat_Float32 &&
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1312 image->GetFormat() != Orthanc::PixelFormat_RGB24)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1313 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1314 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1315 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1316
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
1317 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
1318
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1319 bool invalidate = false;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1320
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1321 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1322 /**
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1323 * 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
1324 * 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
1325 **/
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1326 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
1327
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1328 if (accessor.IsValid())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1329 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1330 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
1331
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1332 // 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
1333 if (previous.GetQuality() < quality)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1334 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1335 // The previously stored image has poorer quality
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1336 invalidate = true;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1337 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1338 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1339 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1340 // 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
1341 return false;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1342 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1343 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1344 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1345 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1346 invalidate = false;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1347 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1348 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1349
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1350 if (invalidate)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1351 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1352 cache_.Invalidate(key);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1353 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1354
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1355 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
1356 return true;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1357 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1358
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1359 class Accessor : public boost::noncopyable
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1360 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1361 private:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1362 Orthanc::MemoryObjectCache::Accessor accessor_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1363
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1364 const CachedImage& GetCachedImage() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1365 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1366 if (IsValid())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1367 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1368 return dynamic_cast<CachedImage&>(accessor_.GetValue());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1369 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1370 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1371 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1372 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1373 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1374 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1375
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1376 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1377 Accessor(FramesCache& that,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1378 const std::string& sopInstanceUid,
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
1379 size_t frameNumber) :
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
1380 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
1381 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1382 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1383
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1384 bool IsValid() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1385 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1386 return accessor_.IsValid();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1387 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1388
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1389 const Orthanc::ImageAccessor& GetImage() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1390 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1391 return GetCachedImage().GetImage();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1392 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1393
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1394 unsigned int GetQuality() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1395 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1396 return GetCachedImage().GetQuality();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1397 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1398 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1399 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1400
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1401
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1402
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1403 class SeriesCursor : public boost::noncopyable
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1404 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1405 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1406 enum Action
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1407 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1408 Action_FastPlus,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1409 Action_Plus,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1410 Action_None,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1411 Action_Minus,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1412 Action_FastMinus
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1413 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1414
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1415 private:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1416 std::vector<size_t> prefetch_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1417 int framesCount_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1418 int currentFrame_;
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1419 bool isCircularPrefetch_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1420 int fastDelta_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1421 Action lastAction_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1422
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1423 int ComputeNextFrame(int currentFrame,
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1424 Action action,
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1425 bool isCircular) const
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1426 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1427 if (framesCount_ == 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1428 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1429 assert(currentFrame == 0);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1430 return 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1431 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1432
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1433 int nextFrame = currentFrame;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1434
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1435 switch (action)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1436 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1437 case Action_FastPlus:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1438 nextFrame += fastDelta_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1439 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1440
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1441 case Action_Plus:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1442 nextFrame += 1;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1443 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1444
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1445 case Action_None:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1446 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1447
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1448 case Action_Minus:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1449 nextFrame -= 1;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1450 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1451
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1452 case Action_FastMinus:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1453 nextFrame -= fastDelta_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1454 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1455
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1456 default:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1457 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1458 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1459
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1460 if (isCircular)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1461 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1462 while (nextFrame < 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1463 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1464 nextFrame += framesCount_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1465 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1466
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1467 while (nextFrame >= framesCount_)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1468 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1469 nextFrame -= framesCount_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1470 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1471 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1472 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1473 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1474 if (nextFrame < 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1475 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1476 nextFrame = 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1477 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1478 else if (nextFrame >= framesCount_)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1479 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1480 nextFrame = framesCount_ - 1;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1481 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1482 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1483
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1484 return nextFrame;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1485 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1486
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1487 void UpdatePrefetch()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1488 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1489 /**
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1490 * 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
1491 * 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
1492 * 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
1493 * 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
1494 * will do the same action just afterwards.
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1495 **/
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1496
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1497 prefetch_.clear();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1498
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1499 if (framesCount_ == 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1500 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1501 return;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1502 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1503
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1504 prefetch_.reserve(framesCount_);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1505
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1506 // 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
1507 // 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
1508 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
1509
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1510 Queue queue;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1511 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
1512
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1513 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
1514
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1515 while (!queue.empty())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1516 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1517 int frame = queue.front().first;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1518 Action previousAction = queue.front().second;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1519 queue.pop_front();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1520
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1521 if (visited.find(frame) == visited.end())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1522 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1523 visited.insert(frame);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1524 prefetch_.push_back(frame);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1525
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1526 switch (previousAction)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1527 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1528 case Action_None:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1529 case Action_Plus:
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1530 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
1531 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
1532 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
1533 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
1534 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1535
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1536 case Action_Minus:
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1537 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
1538 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
1539 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
1540 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
1541 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1542
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1543 case Action_FastPlus:
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1544 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
1545 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
1546 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
1547 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
1548 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1549
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1550 case Action_FastMinus:
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1551 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
1552 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
1553 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
1554 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
1555 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1556
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1557 default:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1558 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1559 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1560 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1561 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1562
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1563 assert(prefetch_.size() == framesCount_);
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 bool CheckFrameIndex(int frame) const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1567 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1568 return ((framesCount_ == 0 && frame == 0) ||
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1569 (framesCount_ > 0 && frame >= 0 && frame < framesCount_));
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1570 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1571
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1572 public:
1970
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
1573 explicit SeriesCursor(size_t framesCount,
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
1574 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
1575 framesCount_(framesCount),
1970
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
1576 currentFrame_(startAtMiddle ? framesCount / 2 : 0),
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1577 isCircularPrefetch_(false),
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1578 lastAction_(Action_None)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1579 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1580 SetFastDelta(framesCount / 20);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1581 UpdatePrefetch();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1582 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1583
1719
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
1584 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
1585 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
1586 return framesCount_;
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
1587 }
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
1588
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1589 void SetCircularPrefetch(bool isCircularPrefetch)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1590 {
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1591 isCircularPrefetch_ = isCircularPrefetch;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1592 UpdatePrefetch();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1593 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1594
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1595 void SetFastDelta(int delta)
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 fastDelta_ = (delta < 0 ? -delta : delta);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1598
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1599 if (fastDelta_ <= 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1600 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1601 fastDelta_ = 1;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1602 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1603 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1604
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1605 void SetCurrentIndex(size_t frame)
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 if (frame >= framesCount_)
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1610 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1611 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1612 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1613 currentFrame_ = frame;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1614 lastAction_ = Action_None;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1615 UpdatePrefetch();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1616 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1617 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1618
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1619 size_t GetCurrentIndex() const
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 assert(CheckFrameIndex(currentFrame_));
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1622 return static_cast<size_t>(currentFrame_);
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
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1625 void Apply(Action action,
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1626 bool isCircular)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1627 {
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1628 currentFrame_ = ComputeNextFrame(currentFrame_, action, isCircular);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1629 lastAction_ = action;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1630 UpdatePrefetch();
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1633 size_t GetPrefetchSize() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1634 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1635 assert(prefetch_.size() == framesCount_);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1636 return prefetch_.size();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1637 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1638
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
1639 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
1640 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1641 if (i >= prefetch_.size())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1642 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1643 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1644 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1645 else
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 assert(CheckFrameIndex(prefetch_[i]));
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1648 return static_cast<size_t>(prefetch_[i]);
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 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1651 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1652
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1653
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
1649
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
1656 /**
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
1657 * 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
1658 * 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
1659 * checked by this function.
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
1660 **/
1646
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1661 static bool GetReferenceLineCoordinates(double& x1,
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1662 double& y1,
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1663 double& x2,
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1664 double& y2,
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1665 const OrthancStone::DicomInstanceParameters& instance1,
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1666 unsigned int frame1,
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
1667 const OrthancStone::CoordinateSystem3D& plane2)
1646
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1668 {
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1669 if (instance1.GetWidth() == 0 &&
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1670 instance1.GetHeight() == 0)
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1671 {
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1672 return false;
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1673 }
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1674 else
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1675 {
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1676 /**
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1677 * Compute the 2D extent of the "instance1", expressed in
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1678 * 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
1679 *
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1680 * In a multiframe image (cf. "ExtractFrameOffsets()"), the plane of
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1681 * 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
1682 * 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
1683 * frame, so we can ignore the frame number.
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1684 **/
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1685 OrthancStone::Extent2D extent;
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1686
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1687 double ox = -instance1.GetPixelSpacingX() / 2.0;
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1688 double oy = -instance1.GetPixelSpacingY() / 2.0;
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1689 extent.AddPoint(ox, oy);
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1690 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
1691 oy + instance1.GetPixelSpacingY() * static_cast<double>(instance1.GetHeight()));
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1692
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1693 const OrthancStone::CoordinateSystem3D c1 = instance1.GetFrameGeometry(frame1);
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1694
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1695 OrthancStone::Vector direction, origin;
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1696
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1697 if (!extent.IsEmpty() &&
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1698 OrthancStone::GeometryToolbox::IntersectTwoPlanes(origin, direction,
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1699 c1.GetOrigin(), c1.GetNormal(),
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
1700 plane2.GetOrigin(), plane2.GetNormal()))
1646
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1701 {
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1702 double ax, ay, bx, by;
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1703 c1.ProjectPoint(ax, ay, origin);
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1704 c1.ProjectPoint(bx, by, origin + 100.0 * direction);
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1705
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1706 return OrthancStone::GeometryToolbox::ClipLineToRectangle(
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1707 x1, y1, x2, y2,
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1708 ax, ay, bx, by,
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1709 extent.GetX1(), extent.GetY1(), extent.GetX2(), extent.GetY2());
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1710 }
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1711 else
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1712 {
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1713 return false;
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1714 }
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1715 }
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1716 }
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1717
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1718
4e14735e98f8 preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1644
diff changeset
1719
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1720 class StoneAnnotationsRegistry : public boost::noncopyable
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1721 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1722 private:
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1723 class Index
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1724 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1725 private:
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1726 std::string sopInstanceUid_;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1727 size_t frame_;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1728
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1729 public:
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1730 Index(const std::string& sopInstanceUid,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1731 size_t frame) :
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1732 sopInstanceUid_(sopInstanceUid),
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1733 frame_(frame)
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1734 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1735 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1736
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1737 const std::string& GetSopInstanceUid() const
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1738 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1739 return sopInstanceUid_;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1740 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1741
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1742 size_t GetFrame() const
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1743 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1744 return frame_;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1745 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1746
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1747 bool operator< (const Index& other) const
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1748 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1749 if (sopInstanceUid_ < other.sopInstanceUid_)
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1750 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1751 return true;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1752 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1753 else if (sopInstanceUid_ > other.sopInstanceUid_)
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1754 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1755 return false;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1756 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1757 else
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1758 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1759 return frame_ < other.frame_;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1760 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1761 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1762 };
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1763
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1764 typedef std::map<Index, Json::Value*> Content;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1765
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1766 Content content_;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1767
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1768 void Clear()
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1769 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1770 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
1771 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1772 assert(it->second != NULL);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1773 delete it->second;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1774 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1775
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1776 content_.clear();
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1777 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1778
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1779 StoneAnnotationsRegistry()
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1780 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1781 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1782
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1783 public:
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1784 ~StoneAnnotationsRegistry()
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1785 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1786 Clear();
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1787 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1788
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1789 static StoneAnnotationsRegistry& GetInstance()
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1790 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1791 static StoneAnnotationsRegistry singleton;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1792 return singleton;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1793 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1794
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1795 void Save(const std::string& sopInstanceUid,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1796 size_t frame,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1797 const OrthancStone::AnnotationsSceneLayer& layer)
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1798 {
1814
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1813
diff changeset
1799 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
1800 layer.Serialize(*serialized);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1801
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1802 const Index index(sopInstanceUid, frame);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1803
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1804 Content::iterator found = content_.find(index);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1805 if (found == content_.end())
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1806 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1807 content_[index] = serialized.release();
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1808 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1809 else
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1810 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1811 assert(found->second != NULL);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1812 delete found->second;
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1813 found->second = serialized.release();
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1814 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1815 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1816
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1817 void Load(OrthancStone::AnnotationsSceneLayer& layer,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1818 const std::string& sopInstanceUid,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1819 size_t frame) const
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1820 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1821 const Index index(sopInstanceUid, frame);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1822
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1823 Content::const_iterator found = content_.find(index);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1824 if (found == content_.end())
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1825 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1826 layer.Clear();
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1827 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1828 else
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1829 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1830 assert(found->second != NULL);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1831 layer.Unserialize(*found->second);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1832 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1833 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1834 };
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1835
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1836
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1837
1924
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1838 class OverlaysRegistry : public boost::noncopyable
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1839 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1840 private:
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1841 typedef std::map<std::string, OrthancStone::LookupTableTextureSceneLayer*> Content;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1842
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1843 Content content_;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1844
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1845 public:
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1846 ~OverlaysRegistry()
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1847 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1848 for (Content::iterator it = content_.begin(); it != content_.end(); ++it)
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1849 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1850 assert(it->second != NULL);
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1851 delete it->second;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1852 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1853 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1854
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1855 static OverlaysRegistry& GetInstance()
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1856 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1857 static OverlaysRegistry singleton;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1858 return singleton;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1859 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1860
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1861 void Register(const std::string& sopInstanceUid,
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1862 const OrthancStone::DicomInstanceParameters& parameters,
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1863 int overlayX,
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1864 int overlayY,
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1865 const Orthanc::ImageAccessor& overlay)
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1866 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1867 // Don't register twice the same overlay
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1868 Content::iterator found = content_.find(sopInstanceUid);
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1869 if (found == content_.end())
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1870 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1871 content_[sopInstanceUid] = parameters.CreateOverlayTexture(overlayX, overlayY, overlay);
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1872 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1873 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1874
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1875 class Accessor : public boost::noncopyable
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1876 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1877 private:
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1878 const OrthancStone::LookupTableTextureSceneLayer* texture_;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1879
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1880 public:
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1881 Accessor(const OverlaysRegistry& registry,
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1882 const std::string& sopInstanceUid)
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1883 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1884 Content::const_iterator found = registry.content_.find(sopInstanceUid);
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1885 if (found == registry.content_.end())
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1886 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1887 texture_ = NULL;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1888 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1889 else
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1890 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1891 assert(found->second != NULL);
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1892 texture_ = found->second;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1893 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1894 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1895
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1896 bool IsValid() const
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1897 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1898 return texture_ != NULL;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1899 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1900
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1901 OrthancStone::LookupTableTextureSceneLayer* CreateTexture() const
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1902 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1903 if (texture_ == NULL)
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1904 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1905 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1906 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1907 else
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1908 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1909 return dynamic_cast<OrthancStone::LookupTableTextureSceneLayer*>(texture_->Clone());
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1910 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1911 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1912 };
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1913 };
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1914
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1915
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1916
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1917 class ViewerViewport : public OrthancStone::ObserverBase<ViewerViewport>
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1918 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1919 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1920 class IObserver : public boost::noncopyable
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1921 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1922 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1923 virtual ~IObserver()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1924 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1925 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1926
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1927 virtual void SignalSeriesDetailsReady(const ViewerViewport& viewport) = 0;
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
1928
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1929 virtual void SignalFrameUpdated(const ViewerViewport& viewport,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1930 size_t currentFrame,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1931 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
1932 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
1933 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
1934 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
1935 const std::string& contentTime) = 0;
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
1936
1811
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
1937 // "click" is a 3D vector in world coordinates
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
1938 virtual void SignalCrosshair(const ViewerViewport& viewport,
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
1939 const OrthancStone::Vector& click) = 0;
1694
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
1940
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
1941 virtual void SignalSynchronizedBrowsing(const ViewerViewport& viewport,
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
1942 const OrthancStone::Vector& click,
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
1943 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
1944
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
1945 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
1946 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
1947 double windowingWidth) = 0;
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1948
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1949 virtual void SignalStoneAnnotationsChanged(const ViewerViewport& viewport,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1950 const std::string& sopInstanceUid,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
1951 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
1952
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
1953 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
1954
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
1955 virtual void SignalStoneAnnotationRemoved(const ViewerViewport& viewport) = 0;
2001
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
1956
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
1957 virtual void SignalStoneTextAnnotationRequired(const ViewerViewport& viewport,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
1958 const OrthancStone::ScenePoint2D& pointedPosition,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
1959 const OrthancStone::ScenePoint2D& labelPosition) = 0;
1495
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1962 private:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1963 static const int LAYER_TEXTURE = 0;
1924
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
1964 static const int LAYER_OVERLAY = 1;
1963
79fdc3b1f031 reorder layers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1962
diff changeset
1965 static const int LAYER_ORIENTATION_MARKERS = 2;
79fdc3b1f031 reorder layers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1962
diff changeset
1966 static const int LAYER_REFERENCE_LINES = 3;
79fdc3b1f031 reorder layers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1962
diff changeset
1967 static const int LAYER_ANNOTATIONS_OSIRIX = 4;
79fdc3b1f031 reorder layers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1962
diff changeset
1968 static const int LAYER_ANNOTATIONS_STONE = 5;
1611
787db80a5a1b new class MacroLayerRenderer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1607
diff changeset
1969
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 class ICommand : public Orthanc::IDynamicObject
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1972 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1973 private:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1974 boost::shared_ptr<ViewerViewport> viewport_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1975
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1976 public:
1573
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1565
diff changeset
1977 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
1978 viewport_(viewport)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1979 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1980 if (viewport == NULL)
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
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 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1985
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1986 virtual ~ICommand()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1987 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1988 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1989
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1990 ViewerViewport& GetViewport() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1991 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1992 assert(viewport_ != NULL);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1993 return *viewport_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1994 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1995
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1996 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
1997 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1998 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1999 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2000
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2001 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
2002 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2003 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2004 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2005
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2006 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
2007 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2008 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2009 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2010 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2011
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2012 class LoadSeriesDetailsFromInstance : public ICommand
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2013 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2014 public:
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2015 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
2016 ICommand(viewport)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2017 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2018 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2019
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2020 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
2021 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2022 if (message.GetResources()->GetSize() != 1)
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2025 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2026
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2027 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
2028
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2029 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2030 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
2031
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2032 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
2033 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
2034 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
2035
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2036 if (params.HasPixelSpacing())
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2037 {
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2038 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
2039 }
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2040 else
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2041 {
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2042 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
2043 }
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2044
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2045 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
2046 params.GetPixelSpacingY() != 0 &&
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2047 params.GetWidth() != 0 &&
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2048 params.GetHeight())
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2049 {
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2050 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
2051 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
2052 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
2053 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
2054 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2055
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2056 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
2057 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
2058
1679
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
2059 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
2060 {
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2061 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
2062 << ": " << params.GetWindowingPresetCenter(i)
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
2063 << "," << params.GetWindowingPresetWidth(i);
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2064
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2065 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
2066 GetViewport().windowingPresetWidths_[i] = params.GetWindowingPresetWidth(i);
1679
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
2067 }
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
2068
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2069 if (params.GetWindowingPresetsCount() == 0)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2070 {
1677
51bab5188a13 start multiple preset windowings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1676
diff changeset
2071 LOG(INFO) << "No preset windowing";
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2072 }
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2073
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2074 GetViewport().SetWindowingPreset();
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2075 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2076
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2077 uint32_t cineRate;
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2078 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
2079 cineRate > 0)
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2080 {
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2081 /**
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2082 * 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
2083 * instead of on the middle frame.
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2084 **/
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2085 GetViewport().cursor_->SetCurrentIndex(0);
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2086 GetViewport().cineRate_ = cineRate;
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2087 }
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2088 else
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2089 {
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2090 GetViewport().cineRate_ = DEFAULT_CINE_RATE;
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2091 }
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2092
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2093 GetViewport().Redraw();
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2094
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2095 if (GetViewport().observer_.get() != NULL)
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2096 {
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2097 GetViewport().observer_->SignalSeriesDetailsReady(GetViewport());
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2098 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2099 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2100 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2101
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
2102
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2103 class SetLowQualityFrame : public ICommand
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2104 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2105 private:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2106 std::string sopInstanceUid_;
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2107 unsigned int frameNumber_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2108 float windowCenter_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2109 float windowWidth_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2110 bool isMonochrome1_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2111 bool isPrefetch_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2112
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2113 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2114 SetLowQualityFrame(boost::shared_ptr<ViewerViewport> viewport,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2115 const std::string& sopInstanceUid,
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2116 unsigned int frameNumber,
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2117 float windowCenter,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2118 float windowWidth,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2119 bool isMonochrome1,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2120 bool isPrefetch) :
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2121 ICommand(viewport),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2122 sopInstanceUid_(sopInstanceUid),
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2123 frameNumber_(frameNumber),
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2124 windowCenter_(windowCenter),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2125 windowWidth_(windowWidth),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2126 isMonochrome1_(isMonochrome1),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2127 isPrefetch_(isPrefetch)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2128 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2129 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2130
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2131 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
2132 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2133 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
2134 jpeg->ReadFromMemory(message.GetAnswer());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2135
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2136 std::unique_ptr<Orthanc::ImageAccessor> converted;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2137
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2138 switch (jpeg->GetFormat())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2139 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2140 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
2141 converted.reset(jpeg.release());
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2142 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2143
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2144 case Orthanc::PixelFormat_Grayscale8:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2145 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2146 if (isMonochrome1_)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2147 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2148 Orthanc::ImageProcessing::Invert(*jpeg);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2149 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2150
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2151 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
2152 jpeg->GetHeight(), false));
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2153
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2154 Orthanc::ImageProcessing::Convert(*converted, *jpeg);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2155
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2156 /**
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2157
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2158 Orthanc::ImageProcessing::ShiftScale() computes "(x + offset) * scaling".
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2159 The system to solve is thus:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2160
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2161 (0 + offset) * scaling = windowingCenter - windowingWidth / 2 [a]
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2162 (255 + offset) * scaling = windowingCenter + windowingWidth / 2 [b]
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2163
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2164 Resolution:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2165
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2166 [b - a] => 255 * scaling = windowingWidth
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2167 [a] => offset = (windowingCenter - windowingWidth / 2) / scaling
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2168
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2169 **/
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2170
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2171 const float scaling = windowWidth_ / 255.0f;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2172 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
2173 (windowCenter_ - windowWidth_ / 2.0f) / scaling);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2174
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2175 Orthanc::ImageProcessing::ShiftScale(*converted, offset, scaling, false);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2176 break;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2177 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2178
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2179 default:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2180 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2181 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2182
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2183 assert(converted.get() != NULL);
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2184 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
2185 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
2186
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2187 if (isPrefetch_)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2188 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2189 GetViewport().ScheduleNextPrefetch();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2190 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2191 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2192 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2193
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2194
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2195 class SetFullDicomFrame : public ICommand
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2196 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2197 private:
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2198 std::string studyInstanceUid_;
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2199 std::string seriesInstanceUid_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2200 std::string sopInstanceUid_;
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2201 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
2202 int priority_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2203 bool isPrefetch_;
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2204 bool serverSideTranscoding_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2205
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2206 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2207 SetFullDicomFrame(boost::shared_ptr<ViewerViewport> viewport,
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2208 const std::string& studyInstanceUid,
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2209 const std::string& seriesInstanceUid,
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2210 const std::string& sopInstanceUid,
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2211 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
2212 int priority,
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2213 bool isPrefetch,
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2214 bool serverSideTranscoding) :
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2215 ICommand(viewport),
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2216 studyInstanceUid_(studyInstanceUid),
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2217 seriesInstanceUid_(seriesInstanceUid),
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2218 sopInstanceUid_(sopInstanceUid),
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2219 frameNumber_(frameNumber),
1682
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2220 priority_(priority),
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2221 isPrefetch_(isPrefetch),
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2222 serverSideTranscoding_(serverSideTranscoding)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2223 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2224 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2225
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2226 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
2227 {
1682
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2228 std::unique_ptr<Orthanc::ImageAccessor> frame;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2229
1682
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2230 try
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2231 {
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2232 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
2233 }
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2234 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
2235 {
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2236 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
2237 {
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2238 if (!serverSideTranscoding_)
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2239 {
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2240 // 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
2241 LOG(INFO) << "Switching to server-side transcoding";
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2242 GetViewport().serverSideTranscoding_ = true;
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2243 GetViewport().ScheduleLoadFullDicomFrame(studyInstanceUid_, seriesInstanceUid_, sopInstanceUid_, frameNumber_, priority_, isPrefetch_);
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2244 }
1682
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2245 return;
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2246 }
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2247 else
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2248 {
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2249 throw;
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2250 }
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2251 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2252
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2253 if (frame.get() == NULL)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2254 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2255 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2256 }
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2257 else
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2258 {
1855
73a4bee08bb6 Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1850
diff changeset
2259 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
2260 {
73a4bee08bb6 Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1850
diff changeset
2261 // 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
2262 // (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
2263 double windowingCenter, windowingWidth;
73a4bee08bb6 Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1850
diff changeset
2264 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
2265 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
2266 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
2267 GetViewport().SetWindowingPreset();
73a4bee08bb6 Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1850
diff changeset
2268 }
73a4bee08bb6 Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1850
diff changeset
2269
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2270 Apply(GetViewport(), message.GetDicom(), frame.release(), sopInstanceUid_, frameNumber_);
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2271
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2272 if (isPrefetch_)
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2273 {
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2274 GetViewport().ScheduleNextPrefetch();
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2275 }
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2276 }
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2277 }
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2278
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2279 static void Apply(ViewerViewport& viewport,
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2280 const Orthanc::ParsedDicomFile& dicom,
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2281 Orthanc::ImageAccessor* f,
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2282 const std::string& sopInstanceUid,
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2283 unsigned int frameNumber)
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2284 {
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2285 std::unique_ptr<Orthanc::ImageAccessor> frameProtection(f);
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2286
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2287 Orthanc::DicomMap tags;
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2288 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
2289
1924
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2290 OrthancStone::DicomInstanceParameters parameters(tags);
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2291
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2292 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
2293
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2294 if (frameProtection->GetFormat() == Orthanc::PixelFormat_RGB24)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2295 {
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2296 converted.reset(frameProtection.release());
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2297 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2298 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2299 {
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2300 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
2301 Orthanc::ImageProcessing::Convert(*converted, *frameProtection);
1924
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2302 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
2303 }
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2304
1924
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2305 try
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2306 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2307 int x, y;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2308 std::unique_ptr<Orthanc::ImageAccessor> overlay(dicom.DecodeAllOverlays(x, y));
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2309
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2310 if (overlay.get() != NULL &&
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2311 overlay->GetWidth() > 0 &&
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2312 overlay->GetHeight() > 0)
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2313 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2314 OverlaysRegistry::GetInstance().Register(sopInstanceUid, parameters, x, y, *overlay);
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2315 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2316 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2317 catch (Orthanc::OrthancException& e)
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2318 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2319 LOG(ERROR) << "Cannot decode overlays from instance " << sopInstanceUid;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2320 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2321
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2322 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
2323 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
2324 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
2325 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2326 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2327
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2328
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2329 class PrefetchItem
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2330 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2331 private:
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2332 size_t cursorIndex_;
1670
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2333 bool isFullQuality_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2334
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2335 public:
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2336 PrefetchItem(size_t cursorIndex,
1670
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2337 bool isFullQuality) :
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2338 cursorIndex_(cursorIndex),
1670
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2339 isFullQuality_(isFullQuality)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2340 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2341 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2342
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2343 size_t GetCursorIndex() const
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2344 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2345 return cursorIndex_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2346 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2347
1670
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2348 bool IsFullQuality() const
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2349 {
1670
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2350 return isFullQuality_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2351 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2352 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2353
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2354
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2355 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
2356 OrthancStone::WebAssemblyLoadersContext& context_;
1551
c54bc5bffd01 software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1549
diff changeset
2357 boost::shared_ptr<OrthancStone::WebAssemblyViewport> viewport_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2358 boost::shared_ptr<OrthancStone::DicomResourcesLoader> loader_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2359 OrthancStone::DicomSource source_;
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2360 boost::shared_ptr<FramesCache> framesCache_;
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2361 std::unique_ptr<IFramesCollection> frames_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2362 std::unique_ptr<SeriesCursor> cursor_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2363 float windowingCenter_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2364 float windowingWidth_;
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2365 std::vector<float> windowingPresetCenters_;
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2366 std::vector<float> windowingPresetWidths_;
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
2367 unsigned int cineRate_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2368 bool inverted_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2369 bool fitNextContent_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2370 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
2371 bool serverSideTranscoding_;
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2372 OrthancStone::Vector synchronizationOffset_;
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2373 bool synchronizationEnabled_;
1695
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2374 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
2375 double centralPhysicalHeight_;
1822
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2376 double centralPixelSpacingX_;
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2377 double centralPixelSpacingY_;
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2378
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2379 bool hasFocusOnInstance_;
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2380 std::string focusSopInstanceUid_;
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
2381 size_t focusFrameNumber_;
1811
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
2382
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
2383 // 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
2384 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
2385
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
2386 // 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
2387 // 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
2388 // the center of the top-left pixel
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
2389 boost::shared_ptr<OrthancStone::AnnotationsSceneLayer> stoneAnnotations_;
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
2390
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
2391 bool linearInterpolation_;
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
2392
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
2393
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2394 void ScheduleNextPrefetch()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2395 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2396 while (!prefetchQueue_.empty())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2397 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2398 size_t cursorIndex = prefetchQueue_.front().GetCursorIndex();
1670
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2399 bool isFullQuality = prefetchQueue_.front().IsFullQuality();
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2400 prefetchQueue_.pop_front();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2401
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2402 const std::string sopInstanceUid = frames_->GetInstanceOfFrame(cursorIndex).GetSopInstanceUid();
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2403 unsigned int frameNumber = frames_->GetFrameNumberInInstance(cursorIndex);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2404
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2405 {
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2406 FramesCache::Accessor accessor(*framesCache_, sopInstanceUid, frameNumber);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2407 if (!accessor.IsValid() ||
1670
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2408 (isFullQuality && accessor.GetQuality() == 0))
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2409 {
1670
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2410 if (isFullQuality)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2411 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2412 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_NORMAL, true);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2413 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2414 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2415 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2416 ScheduleLoadRenderedFrame(cursorIndex, PRIORITY_NORMAL, true);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2417 }
1670
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2418
24462a259d8d comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1669
diff changeset
2419 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
2420 }
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 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2423 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2424
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2425
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2426 void ClearViewport()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2427 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2428 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2429 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
2430 lock->GetController().GetScene().DeleteLayer(LAYER_TEXTURE);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2431 //lock->GetCompositor().Refresh(lock->GetController().GetScene());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2432 lock->Invalidate();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2433 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2434 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2435
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
2436
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2437 /**
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2438 * 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
2439 * 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
2440 **/
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2441 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
2442 DisplayedFrameQuality quality)
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2443 {
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2444 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
2445
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2446 // Prepare prefetching
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2447 prefetchQueue_.clear();
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2448
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2449 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
2450 {
1680
03afa09cfcf1 running the tests of the Orthanc Framework in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
2451 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
2452 size_t prefetchedSize = 0;
03afa09cfcf1 running the tests of the Orthanc Framework in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1679
diff changeset
2453
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2454 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
2455 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
2456 {
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2457 size_t a = cursor_->GetPrefetchIndex(i);
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2458 if (a != cursorIndex)
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2459 {
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2460 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
2461 prefetchedSize += frameSize;
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2462 }
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2463 }
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2464 }
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2465
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2466 ScheduleNextPrefetch();
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2467
1720
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
2468 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
2469 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
2470 observer_.get() != NULL)
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2471 {
1720
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
2472 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
2473
1859
58681a5c727b overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents: 1855
diff changeset
2474 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
2475 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
2476 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
2477
58681a5c727b overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents: 1855
diff changeset
2478 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
2479 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
2480 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
2481
58681a5c727b overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents: 1855
diff changeset
2482 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
2483 }
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2484 }
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2485
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2486
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2487 void RenderCurrentScene(const Orthanc::ImageAccessor& frame,
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2488 const OrthancStone::DicomInstanceParameters& instance,
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
2489 size_t frameIndex,
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2490 const OrthancStone::CoordinateSystem3D& plane)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2491 {
1695
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2492 /**
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2493 * 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
2494 * "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
2495 * "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
2496 * 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
2497 * "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
2498 * "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
2499 * 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
2500 * (cf. LSD-479).
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2501 **/
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2502
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2503 bool isMonochrome1 = (instance.GetImageInformation().GetPhotometricInterpretation() ==
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2504 Orthanc::PhotometricInterpretation_Monochrome1);
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2505
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2506 std::unique_ptr<OrthancStone::TextureBaseSceneLayer> layer;
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2507
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2508 switch (frame.GetFormat())
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2509 {
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2510 case Orthanc::PixelFormat_RGB24:
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2511 layer.reset(new OrthancStone::ColorTextureSceneLayer(frame));
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2512 break;
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2513
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2514 case Orthanc::PixelFormat_Float32:
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2515 {
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2516 std::unique_ptr<OrthancStone::FloatTextureSceneLayer> tmp(
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2517 new OrthancStone::FloatTextureSceneLayer(frame));
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2518 tmp->SetCustomWindowing(windowingCenter_, windowingWidth_);
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2519 tmp->SetInverted(inverted_ ^ isMonochrome1);
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2520 layer.reset(tmp.release());
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2521 break;
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2522 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2523
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2524 default:
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2525 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2526 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2527
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2528 assert(layer.get() != NULL);
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2529
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
2530 layer->SetLinearInterpolation(linearInterpolation_);
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2531
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2532 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
2533
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2534 if (instance.HasPixelSpacing())
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2535 {
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2536 pixelSpacingX = instance.GetPixelSpacingX();
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2537 pixelSpacingY = instance.GetPixelSpacingY();
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2538 }
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2539 else
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2540 {
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2541 pixelSpacingX = centralPixelSpacingX_;
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2542 pixelSpacingY = centralPixelSpacingY_;
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2543 }
1695
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2544
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2545 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
2546 {
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2547 /**
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2548 * 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
2549 * 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
2550 * 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
2551 * 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
2552 * 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
2553 **/
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2554 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
2555 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
2556
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2557 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
2558 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
2559 {
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2560 // 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
2561 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
2562 }
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2563 else
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2564 {
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2565 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
2566 centralPhysicalHeight_ / physicalHeight);
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2567 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
2568 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
2569 (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
2570 }
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2571 }
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2572 else
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2573 {
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2574 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
2575 }
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2576
1924
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2577 std::unique_ptr<OrthancStone::LookupTableTextureSceneLayer> overlay;
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2578
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2579 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2580 OverlaysRegistry::Accessor accessor(OverlaysRegistry::GetInstance(), instance.GetSopInstanceUid());
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2581 if (accessor.IsValid())
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2582 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2583 overlay.reset(accessor.CreateTexture());
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
2584 overlay->SetLinearInterpolation(false);
1924
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2585 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2586 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2587
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2588 std::unique_ptr<OrthancStone::MacroSceneLayer> annotationsOsiriX;
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2589
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
2590 if (osiriXAnnotations_)
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2591 {
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2592 std::set<size_t> a;
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
2593 osiriXAnnotations_->LookupSopInstanceUid(a, instance.GetSopInstanceUid());
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2594 if (plane.IsValid() &&
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2595 !a.empty())
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2596 {
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2597 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
2598 // annotationsOsiriX->Reserve(a.size());
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2599
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2600 OrthancStone::OsiriXLayerFactory factory;
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2601 factory.SetColor(0, 255, 0);
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2602
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2603 for (std::set<size_t>::const_iterator it = a.begin(); it != a.end(); ++it)
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2604 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
2605 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
2606 annotationsOsiriX->AddLayer(factory.Create(annotation, plane));
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2607 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2608 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2609 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2610
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
2611 StoneAnnotationsRegistry::GetInstance().Load(*stoneAnnotations_, instance.GetSopInstanceUid(), frameIndex);
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
2612
1962
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2613 // 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
2614 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
2615
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2616 if (instance.GetGeometry().IsValid())
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2617 {
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2618 orientationMarkers.reset(new OrthancStone::MacroSceneLayer);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2619
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2620 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
2621 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
2622
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2623 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
2624
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2625 text.reset(new OrthancStone::TextSceneLayer);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2626 text->SetText(top);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2627 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
2628 text->SetAnchor(OrthancStone::BitmapAnchor_TopCenter);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2629 orientationMarkers->AddLayer(text.release());
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2630
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2631 text.reset(new OrthancStone::TextSceneLayer);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2632 text->SetText(bottom);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2633 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
2634 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
2635 text->SetAnchor(OrthancStone::BitmapAnchor_BottomCenter);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2636 orientationMarkers->AddLayer(text.release());
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2637
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2638 text.reset(new OrthancStone::TextSceneLayer);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2639 text->SetText(left);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2640 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
2641 text->SetAnchor(OrthancStone::BitmapAnchor_CenterLeft);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2642 orientationMarkers->AddLayer(text.release());
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2643
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2644 text.reset(new OrthancStone::TextSceneLayer);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2645 text->SetText(right);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2646 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
2647 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
2648 text->SetAnchor(OrthancStone::BitmapAnchor_CenterRight);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2649 orientationMarkers->AddLayer(text.release());
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2650 }
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2651
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2652
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
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 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
2655
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2656 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
2657
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2658 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
2659
1924
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2660 if (overlay.get() != NULL)
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2661 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2662 scene.SetLayer(LAYER_OVERLAY, overlay.release());
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2663 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2664 else
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2665 {
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2666 scene.DeleteLayer(LAYER_OVERLAY);
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2667 }
f4050908c6bc display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1916
diff changeset
2668
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2669 if (annotationsOsiriX.get() != NULL)
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2670 {
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2671 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
2672 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2673 else
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 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
2676 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2677
1962
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2678 if (orientationMarkers.get() != NULL)
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2679 {
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2680 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
2681 }
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2682 else
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2683 {
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2684 scene.DeleteLayer(LAYER_ORIENTATION_MARKERS);
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2685 }
c6272d7bb6d9 display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1948
diff changeset
2686
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
2687 stoneAnnotations_->Render(scene); // Necessary for "FitContent()" to work
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
2688
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2689 if (fitNextContent_)
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2690 {
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2691 lock->RefreshCanvasSize();
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2692 lock->GetCompositor().FitContent(scene);
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
2693 stoneAnnotations_->Render(scene);
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2694 fitNextContent_ = false;
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2695 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2696
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2697 //lock->GetCompositor().Refresh(scene);
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2698 lock->Invalidate();
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2699 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2700 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2701
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
2702
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2703 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
2704 const std::string& loadedSopInstanceUid,
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2705 unsigned int loadedFrameNumber,
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2706 DisplayedFrameQuality quality)
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2707 {
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2708 if (cursor_.get() != NULL &&
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2709 frames_.get() != NULL)
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2710 {
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2711 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
2712 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
2713 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
2714
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2715 // 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
2716 if (instance.GetSopInstanceUid() == loadedSopInstanceUid &&
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2717 frameNumber == loadedFrameNumber)
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2718 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2719 const OrthancStone::CoordinateSystem3D plane = IFramesCollection::GetFrameGeometry(*frames_, cursorIndex);
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2720
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2721 if (quality == DisplayedFrameQuality_Low)
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2722 {
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2723 FramesCache::Accessor accessor(*framesCache_, instance.GetSopInstanceUid(), frameNumber);
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2724 if (accessor.IsValid() &&
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2725 accessor.GetQuality() == QUALITY_FULL)
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2726 {
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2727 // 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
2728 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
2729 SetupPrefetchAfterRendering(frame, DisplayedFrameQuality_High);
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2730 }
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2731 else
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2732 {
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2733 // 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
2734 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
2735 SetupPrefetchAfterRendering(frame, quality);
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2736
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2737 /**
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2738 * The command "SetupPrefetchAfterRendering()" must be
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2739 * after "SetupPrefetchAfterRendering(quality)", as the
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2740 * DICOM instance might already be cached by the oracle,
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2741 * which makes a call to "observer_->SignalFrameUpdated()"
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2742 * with a low quality, whereas the high quality is
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2743 * available.
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2744 **/
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2745 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */);
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2746 }
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2747 }
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2748 else
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2749 {
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2750 assert(quality == DisplayedFrameQuality_High);
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2751 SetupPrefetchAfterRendering(frame, quality);
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
2752 RenderCurrentScene(frame, instance, frameNumber, plane);
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
2753 }
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2754 }
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2755 }
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2756 }
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
2757
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2758 void ScheduleLoadFullDicomFrame(const std::string& studyInstanceUid,
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2759 const std::string& seriesInstanceUid,
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2760 const std::string& sopInstanceUid,
1682
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2761 unsigned int frameNumber,
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2762 int priority,
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2763 bool isPrefetch)
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2764 {
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2765 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
2766 {
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2767 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
2768 lock->Schedule(
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2769 GetSharedObserver(), priority, OrthancStone::ParseDicomFromWadoCommand::Create(
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2770 source_, studyInstanceUid, seriesInstanceUid, sopInstanceUid, serverSideTranscoding_,
1682
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2771 Orthanc::DicomTransferSyntax_LittleEndianExplicit,
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2772 new SetFullDicomFrame(GetSharedObserver(), studyInstanceUid, seriesInstanceUid,
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2773 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
2774 }
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2775 }
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
2776
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2777 void ScheduleLoadFullDicomFrame(size_t cursorIndex,
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2778 int priority,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2779 bool isPrefetch)
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 if (frames_.get() != NULL)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2782 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2783 std::string studyInstanceUid = frames_->GetInstanceOfFrame(cursorIndex).GetStudyInstanceUid();
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2784 std::string seriesInstanceUid = frames_->GetInstanceOfFrame(cursorIndex).GetSeriesInstanceUid();
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2785 std::string sopInstanceUid = frames_->GetInstanceOfFrame(cursorIndex).GetSopInstanceUid();
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2786 unsigned int frameNumber = frames_->GetFrameNumberInInstance(cursorIndex);
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2787 ScheduleLoadFullDicomFrame(studyInstanceUid, seriesInstanceUid, sopInstanceUid, frameNumber, priority, isPrefetch);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2788 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2789 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2790
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2791 void ScheduleLoadRenderedFrame(size_t cursorIndex,
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2792 int priority,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2793 bool isPrefetch)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2794 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2795 if (!source_.HasDicomWebRendered())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2796 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2797 ScheduleLoadFullDicomFrame(cursorIndex, priority, isPrefetch);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2798 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2799 else if (frames_.get() != NULL)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2800 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2801 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex);
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2802 unsigned int frameNumber = frames_->GetFrameNumberInInstance(cursorIndex);
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2803
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
2804 /**
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
2805 * 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
2806 * 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
2807 * 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
2808 **/
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
2809 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
2810 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
2811
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
2812 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
2813 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
2814 {
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
2815 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
2816 {
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2817 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
2818 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
2819 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
2820 }
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
2821 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
2822 {
1722
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2823 /**
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2824 * 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
2825 * 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
2826 * 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
2827 * the DICOM file using server-side transcoding. This
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2828 * happens on WRIX dataset.
802cb1272f3a fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1721
diff changeset
2829 **/
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
2830 }
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
2831 }
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
2832
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2833 bool isMonochrome1 = (instance.GetImageInformation().GetPhotometricInterpretation() ==
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2834 Orthanc::PhotometricInterpretation_Monochrome1);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2835
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2836 const std::string uri = ("studies/" + instance.GetStudyInstanceUid() +
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2837 "/series/" + instance.GetSeriesInstanceUid() +
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2838 "/instances/" + instance.GetSopInstanceUid() +
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
2839 "/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
2840
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2841 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
2842 // 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
2843 arguments["window"] = (
1536
7b326e5ee97b reduce blinking
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1534
diff changeset
2844 boost::lexical_cast<std::string>(windowingCenter_) + "," +
7b326e5ee97b reduce blinking
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1534
diff changeset
2845 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
2846
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2847 std::unique_ptr<OrthancStone::IOracleCommand> command(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2848 source_.CreateDicomWebCommand(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2849 uri, arguments, headers, new SetLowQualityFrame(
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
2850 GetSharedObserver(), instance.GetSopInstanceUid(), frameNumber,
1536
7b326e5ee97b reduce blinking
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1534
diff changeset
2851 windowingCenter_, windowingWidth_, isMonochrome1, isPrefetch)));
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2852
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2853 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2854 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
2855 lock->Schedule(GetSharedObserver(), priority, command.release());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2856 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2857 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2858 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2859
1554
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2860 void UpdateCurrentTextureParameters()
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2861 {
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2862 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
2863
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2864 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
2865 {
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2866 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
2867 OrthancStone::ISceneLayer::Type_FloatTexture)
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2868 {
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2869 dynamic_cast<OrthancStone::FloatTextureSceneLayer&>(
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2870 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE)).
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2871 SetCustomWindowing(windowingCenter_, windowingWidth_);
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2872 }
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2873
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2874 lock->Invalidate();
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2875 }
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2876 }
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
2877
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
2878 ViewerViewport(OrthancStone::WebAssemblyLoadersContext& context,
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2879 const OrthancStone::DicomSource& source,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2880 const std::string& canvas,
1552
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2881 boost::shared_ptr<FramesCache> cache,
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
2882 bool softwareRendering,
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
2883 bool linearInterpolation) :
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2884 context_(context),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2885 source_(source),
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2886 framesCache_(cache),
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2887 fitNextContent_(true),
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
2888 hasFocusOnInstance_(false),
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2889 focusFrameNumber_(0),
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2890 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
2891 synchronizationEnabled_(false),
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
2892 centralPhysicalWidth_(1),
1822
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2893 centralPhysicalHeight_(1),
0489fe25ce48 support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1816
diff changeset
2894 centralPixelSpacingX_(1),
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
2895 centralPixelSpacingY_(1),
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
2896 linearInterpolation_(linearInterpolation)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2897 {
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
2898 if (!framesCache_)
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2901 }
1552
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2902
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2903 if (softwareRendering)
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2904 {
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2905 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
2906 viewport_ = OrthancStone::WebAssemblyCairoViewport::Create(canvas);
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2907 }
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2908 else
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2909 {
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2910 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
2911 viewport_ = OrthancStone::WebGLViewport::Create(canvas);
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
2912 }
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
2913
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
2914 {
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
2915 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
2916 std::string ttf;
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
2917 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
2918 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
2919 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2920
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2921 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
2922
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
2923 SetWindowingPreset();
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
2924
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
2925 stoneAnnotations_.reset(new OrthancStone::AnnotationsSceneLayer(LAYER_ANNOTATIONS_STONE));
1975
5a434f5889f8 starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1970
diff changeset
2926 stoneAnnotations_->SetProbedLayer(LAYER_TEXTURE);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2927 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2928
1721
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2929
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2930 void Handle(const OrthancStone::ViewportController::GrayscaleWindowingChanged& message)
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2931 {
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2932 // 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
2933 windowingCenter_ = message.GetWindowingCenter();
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2934 windowingWidth_ = message.GetWindowingWidth();
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2935
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2936 if (observer_.get() != NULL)
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2937 {
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2938 observer_->SignalWindowingUpdated(*this, message.GetWindowingCenter(), message.GetWindowingWidth());
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2939 }
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2940 }
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
2941
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2942
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2943 static EM_BOOL OnWheel(int eventType,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2944 const EmscriptenWheelEvent *wheelEvent,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2945 void *userData)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2946 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2947 ViewerViewport& that = *reinterpret_cast<ViewerViewport*>(userData);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2948
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2949 if (that.frames_.get() != NULL &&
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2950 that.cursor_.get() != NULL)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2951 {
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2952 const bool isCtrl = wheelEvent->mouse.ctrlKey;
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2953 const bool isShift = wheelEvent->mouse.shiftKey;
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2954
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2955 const size_t previousCursorIndex = that.cursor_->GetCurrentIndex();
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2956
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2957 if (wheelEvent->deltaY < 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2958 {
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2959 that.ChangeFrame(isCtrl ? SeriesCursor::Action_FastMinus :
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2960 SeriesCursor::Action_Minus, false /* not circular */);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2961 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2962 else if (wheelEvent->deltaY > 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2963 {
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2964 that.ChangeFrame(isCtrl ? SeriesCursor::Action_FastPlus :
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2965 SeriesCursor::Action_Plus, false /* not circular */);
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2966 }
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2967
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2968 if (that.synchronizationEnabled_)
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2969 {
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2970 const size_t currentCursorIndex = that.cursor_->GetCurrentIndex();
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2971
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2972 const OrthancStone::CoordinateSystem3D current = IFramesCollection::GetFrameGeometry(*that.frames_, currentCursorIndex);
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2973
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2974 if (isShift &&
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2975 previousCursorIndex != currentCursorIndex)
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2976 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
2977 const OrthancStone::CoordinateSystem3D previous = IFramesCollection::GetFrameGeometry(*that.frames_, previousCursorIndex);
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2978 that.synchronizationOffset_ += previous.GetOrigin() - current.GetOrigin();
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2979 }
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
2980
1694
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
2981 that.observer_->SignalSynchronizedBrowsing(
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
2982 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
2983 }
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2986 return true;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2987 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2988
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2989 void Handle(const OrthancStone::DicomResourcesLoader::SuccessMessage& message)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2990 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2991 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
2992 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2993
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2994 void Handle(const OrthancStone::HttpCommand::SuccessMessage& message)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2995 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2996 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
2997 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2998
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2999 void Handle(const OrthancStone::ParseDicomSuccessMessage& message)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3000 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3001 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
3002 }
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
3003
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3004
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3005 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
3006 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3007 {
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3008 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3009 stoneAnnotations_->Render(lock->GetController().GetScene());
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3010 lock->Invalidate();
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3011 }
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3012
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3013 if (save)
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3014 {
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3015 if (cursor_.get() != NULL &&
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3016 frames_.get() != NULL)
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3017 {
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3018 const size_t cursorIndex = cursor_->GetCurrentIndex();
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3019 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex);
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3020 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3021
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3022 StoneAnnotationsRegistry::GetInstance().Save(instance.GetSopInstanceUid(), frameNumber, *stoneAnnotations_);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3023
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3024 if (observer_.get() != NULL)
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3025 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3026 observer_->SignalStoneAnnotationsChanged(*this, instance.GetSopInstanceUid(), frameNumber);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3027 }
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3028 }
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3029 }
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3030 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3031
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3032 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
3033 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3034 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
3035 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3036
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3037 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
3038 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3039 RefreshAnnotations(true /* save */);
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3040 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3041
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3042 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
3043 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3044 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
3045
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3046 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
3047 {
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3048 observer_->SignalStoneAnnotationAdded(*this);
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3049 }
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3050 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3051
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3052 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
3053 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3054 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
3055
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3056 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
3057 {
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3058 observer_->SignalStoneAnnotationRemoved(*this);
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3059 }
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3060 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3061
2001
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3062 void Handle(const OrthancStone::AnnotationsSceneLayer::TextAnnotationRequiredMessage& message)
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3063 {
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3064 if (observer_.get() != NULL)
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3065 {
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3066 observer_->SignalStoneTextAnnotationRequired(*this, message.GetPointedPosition(), message.GetLabelPosition());
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3067 }
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3068 }
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3069
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3070 public:
1622
0f8d6791b403 fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1620
diff changeset
3071 virtual ~ViewerViewport()
0f8d6791b403 fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1620
diff changeset
3072 {
0f8d6791b403 fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1620
diff changeset
3073 // 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
3074 // 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
3075 // 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
3076 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
3077 }
0f8d6791b403 fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1620
diff changeset
3078
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
3079 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
3080 const OrthancStone::DicomSource& source,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3081 const std::string& canvas,
1552
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
3082 boost::shared_ptr<FramesCache> cache,
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3083 bool softwareRendering,
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3084 bool linearInterpolation)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3085 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3086 boost::shared_ptr<ViewerViewport> viewport(
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3087 new ViewerViewport(context, source, canvas, cache, softwareRendering, linearInterpolation));
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
3088
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
3089 {
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
3090 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
3091
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
3092 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
3093 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
3094 *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
3095
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
3096 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
3097 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
3098
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
3099 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
3100 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
3101
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3102 viewport->Register<OrthancStone::AnnotationsSceneLayer::AnnotationChangedMessage>(
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3103 *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
3104
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3105 viewport->Register<OrthancStone::AnnotationsSceneLayer::AnnotationAddedMessage>(
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3106 *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
3107
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3108 viewport->Register<OrthancStone::AnnotationsSceneLayer::AnnotationRemovedMessage>(
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3109 *viewport->stoneAnnotations_, &ViewerViewport::Handle);
2001
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3110
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3111 viewport->Register<OrthancStone::AnnotationsSceneLayer::TextAnnotationRequiredMessage>(
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3112 *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
3113 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3114
1721
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
3115 {
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
3116 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
3117 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
3118 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
3119 }
d4a8e2b19a65 new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1720
diff changeset
3120
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3121 return viewport;
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
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
3124 void SetFrames(IFramesCollection* frames)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3125 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3126 if (frames == NULL)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3127 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3128 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3129 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3130
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3131 fitNextContent_ = true;
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3132 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
3133 inverted_ = false;
1682
84fe7089ccaa switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1681
diff changeset
3134 serverSideTranscoding_ = false;
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3135 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
3136
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3137 frames_.reset(frames);
1970
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3138 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
3139
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3140 if (frames_->GetFramesCount() != 0)
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3141 {
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3142 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
3143 std::string modality;
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3144 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
3145 {
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3146 if (modality == "MR" ||
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3147 modality == "CT" ||
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3148 modality == "NM" ||
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3149 modality == "OPT" ||
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3150 modality == "PT" ||
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3151 modality == "RTDOSE" ||
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3152 modality == "XA")
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3153 {
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3154 // 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
3155 // 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
3156 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
3157 }
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3158 }
33d2ff1aeaae start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1963
diff changeset
3159 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3160
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3161 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
3162
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3163 SetWindowingPreset();
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3164 ClearViewport();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3165 prefetchQueue_.clear();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3166
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3167 if (observer_.get() != NULL)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3168 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3169 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
3170 frames_->GetFramesCount(), DisplayedFrameQuality_None, 0, "", "");
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3171 }
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
3172
1695
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
3173 centralPhysicalWidth_ = 1;
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
3174 centralPhysicalHeight_ = 1;
a691ab50d416 support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1694
diff changeset
3175
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3176 if (frames_->GetFramesCount() != 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3177 {
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
3178 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
3179
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
3180 /**
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
3181 * 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
3182 * "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
3183 * 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
3184 * 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
3185 **/
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
3186 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
3187 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
3188 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
3189 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
3190 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
3191 GetSeriesThumbnailType(uid) != OrthancStone::SeriesThumbnailType_Video)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3192 {
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3193 // Fetch the details of the series from the central instance
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
3194 const std::string uri = ("studies/" + centralInstance.GetStudyInstanceUid() +
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
3195 "/series/" + centralInstance.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
3196 "/instances/" + centralInstance.GetSopInstanceUid() + "/metadata");
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3197
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3198 loader_->ScheduleGetDicomWeb(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3199 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
3200 0, source_, uri, new LoadSeriesDetailsFromInstance(GetSharedObserver()));
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3201 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3202 }
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3203
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3204 ApplyScheduledFocus();
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3205 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3206
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
3207
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3208 // 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
3209 // 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
3210 void UpdateSize(bool fitContent)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3211 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3212 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
3213 lock->RefreshCanvasSize();
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3214
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3215 if (fitContent)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3216 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3217 lock->GetCompositor().FitContent(lock->GetController().GetScene());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3218 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3219
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3220 stoneAnnotations_->ClearHover();
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3221 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
3222
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3223 lock->Invalidate();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3224 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3225
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3226 void AcquireObserver(IObserver* observer)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3227 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3228 observer_.reset(observer);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3229 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3230
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3231 const std::string& GetCanvasId() const
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3232 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3233 assert(viewport_);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3234 return viewport_->GetCanvasId();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3235 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3236
1669
d82a141e08d7 make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
3237
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3238 void Redraw()
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3239 {
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3240 if (cursor_.get() != NULL &&
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3241 frames_.get() != NULL)
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3242 {
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3243 const size_t cursorIndex = cursor_->GetCurrentIndex();
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3244
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3245 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex);
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3246 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex);
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3247
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
3248 FramesCache::Accessor accessor(*framesCache_, instance.GetSopInstanceUid(), frameNumber);
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3249 if (accessor.IsValid())
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3250 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
3251 RenderCurrentScene(accessor.GetImage(), instance, frameNumber, IFramesCollection::GetFrameGeometry(*frames_, cursorIndex));
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3252
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3253 DisplayedFrameQuality quality;
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3254
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3255 if (accessor.GetQuality() < QUALITY_FULL)
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3256 {
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3257 // 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
3258 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */);
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3259 quality = DisplayedFrameQuality_Low;
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3260 }
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3261 else
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3262 {
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3263 quality = DisplayedFrameQuality_High;
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3264 }
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3265
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
3266 SetupPrefetchAfterRendering(accessor.GetImage(), quality);
1671
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3267 }
2c2512918a0f fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1670
diff changeset
3268 else
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3269 {
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3270 // This frame is not cached yet: Load it
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3271 if (source_.HasDicomWebRendered())
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3272 {
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3273 ScheduleLoadRenderedFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */);
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3274 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3275 else
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3276 {
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3277 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */);
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3278 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3279 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3280 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3281 }
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3282
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3283
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3284 // Returns "true" iff the frame has indeed changed
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3285 bool ChangeFrame(SeriesCursor::Action action,
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3286 bool isCircular)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3287 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3288 if (cursor_.get() != NULL)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3289 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3290 size_t previous = cursor_->GetCurrentIndex();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3291
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3292 cursor_->Apply(action, isCircular);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3293
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3294 size_t current = cursor_->GetCurrentIndex();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3295 if (previous != current)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3296 {
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3297 Redraw();
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3298 return true;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3299 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3300 }
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3301
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3302 return false;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3303 }
1719
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3304
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3305
1948
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3306 void SetFrame(unsigned int frameNumber)
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3307 {
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3308 if (cursor_.get() != NULL &&
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3309 frameNumber < cursor_->GetFramesCount() &&
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3310 frameNumber != cursor_->GetCurrentIndex())
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3311 {
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3312 cursor_->SetCurrentIndex(frameNumber);
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3313 Redraw();
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3314 }
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3315 }
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3316
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
3317
1719
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3318 void GoToFirstFrame()
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3319 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3320 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
3321 cursor_->GetCurrentIndex() != 0)
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3322 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3323 cursor_->SetCurrentIndex(0);
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3324 Redraw();
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3325 }
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3326 }
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3327
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3328
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3329 void GoToLastFrame()
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3330 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3331 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
3332 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3333 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
3334 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
3335 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3336 cursor_->SetCurrentIndex(last);
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3337 Redraw();
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3338 }
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3339 }
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
3340 }
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3341
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3342
1649
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3343 bool GetCurrentFrameOfReferenceUid(std::string& frameOfReferenceUid) const
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3344 {
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3345 if (cursor_.get() != NULL &&
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3346 frames_.get() != NULL)
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3347 {
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3348 frameOfReferenceUid = frames_->GetInstanceOfFrame(cursor_->GetCurrentIndex()).GetFrameOfReferenceUid();
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3349 return true;
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3350 }
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3351 else
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3352 {
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3353 return false;
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3354 }
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3355 }
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3356
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3357 bool GetCurrentPlane(OrthancStone::CoordinateSystem3D& plane) const
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3358 {
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3359 if (cursor_.get() != NULL &&
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3360 frames_.get() != NULL)
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3361 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
3362 plane = IFramesCollection::GetFrameGeometry(*frames_, cursor_->GetCurrentIndex());
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3363 return true;
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3364 }
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3365 else
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3366 {
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3367 return false;
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3368 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3369 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3370
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3371 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
3372 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3373 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
3374
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3375 if (cursor_.get() != NULL &&
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3376 frames_.get() != NULL)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3377 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3378 const size_t cursorIndex = cursor_->GetCurrentIndex();
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3379 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex);
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3380 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
3381
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3382 for (std::list<const ViewerViewport*>::const_iterator
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3383 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
3384 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3385 assert(*it != NULL);
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3386
1649
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3387 OrthancStone::CoordinateSystem3D otherPlane;
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3388 std::string otherFrameOfReferenceUid;
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3389 if ((*it)->GetCurrentPlane(otherPlane) &&
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3390 (*it)->GetCurrentFrameOfReferenceUid(otherFrameOfReferenceUid) &&
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3391 otherFrameOfReferenceUid == instance.GetFrameOfReferenceUid())
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3392 {
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3393 double x1, y1, x2, y2;
1649
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3394 if (GetReferenceLineCoordinates(x1, y1, x2, y2, instance, frame, otherPlane))
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3395 {
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3396 OrthancStone::PolylineSceneLayer::Chain chain;
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3397 chain.push_back(OrthancStone::ScenePoint2D(x1, y1));
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3398 chain.push_back(OrthancStone::ScenePoint2D(x2, y2));
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3399 layer->AddChain(chain, false, 0, 255, 0);
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3400 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3401 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3402 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3403 }
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3404
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3405 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3406 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
3407
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3408 if (layer->GetChainsCount() == 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3409 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3410 lock->GetController().GetScene().DeleteLayer(LAYER_REFERENCE_LINES);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3411 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3412 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3413 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3414 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
3415 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3416
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3417 //lock->GetCompositor().Refresh(lock->GetController().GetScene());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3418 lock->Invalidate();
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 void ClearReferenceLines()
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 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3426 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
3427 lock->GetController().GetScene().DeleteLayer(LAYER_REFERENCE_LINES);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3428 lock->Invalidate();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3429 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3430 }
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
1679
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
3433 void SetWindowingPreset()
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3434 {
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3435 assert(windowingPresetCenters_.size() == windowingPresetWidths_.size());
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
3436
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3437 if (windowingPresetCenters_.empty())
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3438 {
1720
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
3439 SetWindowing(128, 256);
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3440 }
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3441 else
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3442 {
1720
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
3443 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
3444 }
1495
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3447 void SetWindowing(float windowingCenter,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3448 float windowingWidth)
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 windowingCenter_ = windowingCenter;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3451 windowingWidth_ = windowingWidth;
1554
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
3452 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
3453
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
3454 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
3455 {
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
3456 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
3457 }
1554
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
3458 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3459
2030
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3460 void StretchWindowing()
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3461 {
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3462 float minValue, maxValue;
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3463
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3464 {
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3465 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock());
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3466
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3467 if (!lock->GetController().GetScene().HasLayer(LAYER_TEXTURE) ||
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3468 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE).GetType() !=
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3469 OrthancStone::ISceneLayer::Type_FloatTexture)
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3470 {
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3471 return;
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3472 }
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3473
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3474 const Orthanc::ImageAccessor& texture =
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3475 dynamic_cast<OrthancStone::FloatTextureSceneLayer&>(
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3476 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE)).GetTexture();
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3477 if (texture.GetFormat() != Orthanc::PixelFormat_Float32)
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3478 {
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3479 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3480 }
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3481
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3482 Orthanc::ImageProcessing::GetMinMaxFloatValue(minValue, maxValue, texture);
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3483 }
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3484
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3485 SetWindowing((minValue + maxValue) / 2.0f, maxValue - minValue);
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3486 }
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
3487
1554
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
3488 void FlipX()
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
3489 {
1989
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3490 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3491 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
3492 lock->GetController().GetScene().FlipViewportX(
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3493 lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight());
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3494 lock->Invalidate();
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3495 }
1554
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
3496 }
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
3497
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
3498 void FlipY()
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
3499 {
1989
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3500 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3501 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
3502 lock->GetController().GetScene().FlipViewportY(
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3503 lock->GetCompositor().GetCanvasWidth(), lock->GetCompositor().GetCanvasHeight());
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3504 lock->Invalidate();
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3505 }
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3506 }
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3507
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3508 void RotateLeft()
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3509 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3510 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3511 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
3512 lock->GetController().GetScene().RotateViewport(
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3513 -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
3514 lock->Invalidate();
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3515 }
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3516 }
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3517
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3518 void RotateRight()
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3519 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3520 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3521 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
3522 lock->GetController().GetScene().RotateViewport(
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3523 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
3524 lock->Invalidate();
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
3525 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3526 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3527
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3528 void Invert()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3529 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3530 inverted_ = !inverted_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3531
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3532 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3533 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
3534
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3535 if (lock->GetController().GetScene().HasLayer(LAYER_TEXTURE) &&
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3536 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE).GetType() ==
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3537 OrthancStone::ISceneLayer::Type_FloatTexture)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3538 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3539 OrthancStone::FloatTextureSceneLayer& layer =
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3540 dynamic_cast<OrthancStone::FloatTextureSceneLayer&>(
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3541 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE));
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3542
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3543 // 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
3544 // compatibility with MONOCHROME1 images
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3545 layer.SetInverted(!layer.IsInverted());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3546 lock->Invalidate();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3547 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3548 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3549 }
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
3550
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3551
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3552
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3553 class Interactor : public OrthancStone::DefaultViewportInteractor
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
3554 {
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3555 private:
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3556 ViewerViewport& viewer_;
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3557 WebViewerAction leftAction_;
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3558 WebViewerAction middleAction_;
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3559 WebViewerAction rightAction_;
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3560
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3561 bool IsAction(const OrthancStone::PointerEvent& event,
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3562 WebViewerAction action)
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3563 {
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3564 switch (event.GetMouseButton())
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3565 {
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3566 case OrthancStone::MouseButton_Left:
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3567 return (leftAction_ == action);
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3568
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3569 case OrthancStone::MouseButton_Middle:
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3570 return (middleAction_ == action);
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3571
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3572 case OrthancStone::MouseButton_Right:
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3573 return (rightAction_ == action);
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3574
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3575 default:
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3576 return false;
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3577 }
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3578 }
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
3579
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3580 public:
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3581 Interactor(ViewerViewport& viewer,
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3582 WebViewerAction leftAction,
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3583 WebViewerAction middleAction,
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3584 WebViewerAction rightAction) :
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3585 viewer_(viewer),
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3586 leftAction_(leftAction),
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3587 middleAction_(middleAction),
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3588 rightAction_(rightAction)
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3589 {
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3590 SetLeftButtonAction(ConvertWebViewerAction(leftAction));
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3591 SetMiddleButtonAction(ConvertWebViewerAction(middleAction));
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3592 SetRightButtonAction(ConvertWebViewerAction(rightAction));
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3593 }
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
3594
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3595 virtual OrthancStone::IFlexiblePointerTracker* CreateTracker(
1607
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1603
diff changeset
3596 boost::weak_ptr<OrthancStone::IViewport> viewport,
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3597 const OrthancStone::PointerEvent& event,
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3598 unsigned int viewportWidth,
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3599 unsigned int viewportHeight) ORTHANC_OVERRIDE
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3600 {
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3601 boost::shared_ptr<OrthancStone::IViewport> lock1(viewport.lock());
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3602
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3603 if (lock1 &&
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3604 IsAction(event, WebViewerAction_Crosshair))
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3605 {
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3606 OrthancStone::CoordinateSystem3D plane;
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3607 if (viewer_.GetCurrentPlane(plane))
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3608 {
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3609 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
3610
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3611 const OrthancStone::ScenePoint2D p = event.GetMainPosition();
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3612 double x = p.GetX();
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3613 double y = p.GetY();
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3614 lock2->GetController().GetCanvasToSceneTransform().Apply(x, y);
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3615
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3616 OrthancStone::Vector click = plane.MapSliceToWorldCoordinates(x, y);
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3617 if (viewer_.observer_.get() != NULL)
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3618 {
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3619 viewer_.observer_->SignalCrosshair(viewer_, click);
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3620 }
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3621 }
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3622
1580
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1579
diff changeset
3623 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
3624 }
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3625 else
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3626 {
1815
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3627 // 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
3628 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
3629 {
1815
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3630 switch (leftAction_)
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3631 {
1815
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3632 case WebViewerAction_CreateAngle:
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3633 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
3634 break;
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3635
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3636 case WebViewerAction_CreateCircle:
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3637 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
3638 break;
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3639
1998
1fa3f484008e added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1996
diff changeset
3640 case WebViewerAction_CreateLength:
1fa3f484008e added arrows to AnnotationsSceneLayer::Segment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1996
diff changeset
3641 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Length);
1815
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3642 break;
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3643
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3644 case WebViewerAction_RemoveMeasure:
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3645 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
3646 break;
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3647
1975
5a434f5889f8 starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1970
diff changeset
3648 case WebViewerAction_CreatePixelProbe:
5a434f5889f8 starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1970
diff changeset
3649 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_PixelProbe);
5a434f5889f8 starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1970
diff changeset
3650 break;
5a434f5889f8 starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1970
diff changeset
3651
1982
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
3652 case WebViewerAction_CreateEllipseProbe:
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
3653 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
3654 break;
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
3655
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
3656 case WebViewerAction_CreateRectangleProbe:
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
3657 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
3658 break;
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
3659
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
3660 case WebViewerAction_CreateTextAnnotation:
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
3661 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
3662 break;
ba45e1b0812a preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1980
diff changeset
3663
1815
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3664 default:
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3665 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
3666 break;
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 {
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3670 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
3671
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3672 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
3673 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
3674
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3675 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
3676 {
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3677 return t.release();
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
3678 }
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3679 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3680 }
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1795
diff changeset
3681
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3682 return DefaultViewportInteractor::CreateTracker(
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3683 viewport, event, viewportWidth, viewportHeight);
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3684 }
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3685 }
1811
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3686
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3687 virtual bool HasMouseHover() const ORTHANC_OVERRIDE
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3688 {
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3689 return true;
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3690 }
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3691
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3692 virtual void HandleMouseHover(OrthancStone::IViewport& viewport,
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3693 const OrthancStone::PointerEvent& event) ORTHANC_OVERRIDE
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3694 {
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3695 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
3696
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3697 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
3698 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3699 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
3700 lock->Invalidate();
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3701 }
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
3702 }
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3703 };
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3704
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3705
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3706 void SetMouseButtonActions(WebViewerAction leftAction,
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3707 WebViewerAction middleAction,
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3708 WebViewerAction rightAction)
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
3709 {
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
3710 assert(viewport_ != NULL);
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3711 viewport_->AcquireInteractor(new Interactor(*this, leftAction, middleAction, rightAction));
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
3712 }
1575
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
3713
1578
1f812f4c95be comments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1576
diff changeset
3714 void FitForPrint()
1575
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
3715 {
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
3716 viewport_->FitForPrint();
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
3717 }
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
3718
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3719 void SetOsiriXAnnotations(boost::shared_ptr<OrthancStone::OsiriX::CollectionOfAnnotations> annotations)
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
3720 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3721 osiriXAnnotations_ = annotations;
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
3722 }
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
3723
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3724 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
3725 unsigned int frameNumber)
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3726 {
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3727 hasFocusOnInstance_ = true;
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3728 focusSopInstanceUid_ = sopInstanceUid;
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3729 focusFrameNumber_ = frameNumber;
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3730
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3731 ApplyScheduledFocus();
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3732 }
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3733
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3734 void ApplyScheduledFocus()
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3735 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3736 size_t cursorIndex;
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3737
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3738 if (hasFocusOnInstance_ &&
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3739 cursor_.get() != NULL &&
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3740 frames_.get() != NULL &&
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3741 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
3742 {
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3743 size_t current = cursor_->GetCurrentIndex();
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3744
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3745 if (current != cursorIndex)
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3746 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3747 cursor_->SetCurrentIndex(cursorIndex);
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3748 Redraw();
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3749 }
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3750
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3751 hasFocusOnInstance_ = false;
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3752 }
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3753 }
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3754
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3755 void FocusOnPoint(const OrthancStone::Vector& p)
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3756 {
1649
d77618883551 verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1648
diff changeset
3757 //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
3758 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
3759
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3760 size_t cursorIndex;
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3761 if (cursor_.get() != NULL &&
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3762 frames_.get() != NULL &&
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3763 frames_->FindClosestFrame(cursorIndex, p, MAX_DISTANCE))
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3764 {
1667
9584df157a9e clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1666
diff changeset
3765 cursor_->SetCurrentIndex(cursorIndex);
1668
ab1bc8de1798 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1667
diff changeset
3766 Redraw();
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3767 }
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3768 }
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3769
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3770 unsigned int GetCineRate() const
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3771 {
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3772 return cineRate_;
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3773 }
1679
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
3774
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
3775 void FormatWindowingPresets(Json::Value& target) const
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
3776 {
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3777 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
3778
1679
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
3779 target = Json::arrayValue;
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3780
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3781 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
3782 {
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3783 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
3784 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
3785
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3786 std::string name = "Preset";
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3787 if (windowingPresetCenters_.size() > 1)
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3788 {
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3789 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
3790 }
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3791
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3792 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
3793 preset["name"] = name;
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3794 preset["center"] = c;
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3795 preset["width"] = w;
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3796 preset["info"] =
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3797 ("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
3798 ", 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
3799
1681
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3800 target.append(preset);
f2e8b3ac1dcd handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1680
diff changeset
3801 }
1679
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
3802 }
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3803
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3804
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3805 void SetSynchronizedBrowsingEnabled(int enabled)
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3806 {
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3807 OrthancStone::LinearAlgebra::AssignVector(synchronizationOffset_, 0, 0, 0);
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3808 synchronizationEnabled_ = enabled;
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3809 }
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3810
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3811
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3812 void SignalStoneAnnotationsChanged(const std::string& sopInstanceUid,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3813 size_t frame)
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3814 {
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3815 if (cursor_.get() != NULL &&
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3816 frames_.get() != NULL)
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3817 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3818 const size_t cursorIndex = cursor_->GetCurrentIndex();
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3819 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3820 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3821
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3822 if (instance.GetSopInstanceUid() == sopInstanceUid &&
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3823 frameNumber == frame)
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3824 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3825 StoneAnnotationsRegistry::GetInstance().Load(*stoneAnnotations_, instance.GetSopInstanceUid(), frame);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3826
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3827 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3828 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
3829 stoneAnnotations_->Render(lock->GetController().GetScene());
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3830 lock->Invalidate();
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3831 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3832 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
3833 }
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3834 }
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3835
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3836 void SetLinearInterpolation(bool linearInterpolation)
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3837 {
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3838 if (linearInterpolation_ != linearInterpolation)
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3839 {
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3840 linearInterpolation_ = linearInterpolation;
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3841 Redraw();
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3842 }
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
3843 }
2001
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3844
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3845 void AddTextAnnotation(const std::string& label,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3846 const OrthancStone::ScenePoint2D& pointedPosition,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3847 const OrthancStone::ScenePoint2D& labelPosition)
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3848 {
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3849 stoneAnnotations_->AddTextAnnotation(label, pointedPosition, labelPosition);
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3850 Redraw();
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
3851 }
2018
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3852
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3853
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3854 void SignalSynchronizedBrowsing()
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3855 {
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3856 if (synchronizationEnabled_ &&
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3857 frames_.get() != NULL &&
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3858 cursor_.get() != NULL)
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3859 {
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3860 const size_t currentCursorIndex = cursor_->GetCurrentIndex();
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3861
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
3862 const OrthancStone::CoordinateSystem3D current = IFramesCollection::GetFrameGeometry(*frames_, currentCursorIndex);
2018
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3863
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3864 observer_->SignalSynchronizedBrowsing(
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3865 *this, current.GetOrigin() + synchronizationOffset_, current.GetNormal());
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3866 }
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
3867 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3868 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3869
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3870
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3871
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3872
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 typedef std::map<std::string, boost::shared_ptr<ViewerViewport> > Viewports;
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3875
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3876 static Viewports allViewports_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3877 static bool showReferenceLines_ = true;
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
3878 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
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 static void UpdateReferenceLines()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3882 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3883 if (showReferenceLines_)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3884 {
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3885 std::list<const ViewerViewport*> viewports;
1495
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 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
3888 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3889 assert(it->second != NULL);
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3890 viewports.push_back(it->second.get());
1495
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3893 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
3894 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3895 assert(it->second != NULL);
1647
adff3cd78775 removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1646
diff changeset
3896 it->second->UpdateReferenceLines(viewports);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3897 }
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 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3900 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3901 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
3902 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3903 assert(it->second != NULL);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3904 it->second->ClearReferenceLines();
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 }
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
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 class WebAssemblyObserver : public ResourcesLoader::IObserver,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3911 public ViewerViewport::IObserver
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 public:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3914 virtual void SignalResourcesLoaded() ORTHANC_OVERRIDE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3915 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3916 DISPATCH_JAVASCRIPT_EVENT("ResourcesLoaded");
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3917 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3918
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3919 virtual void SignalSeriesThumbnailLoaded(const std::string& studyInstanceUid,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3920 const std::string& seriesInstanceUid) ORTHANC_OVERRIDE
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 EM_ASM({
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3923 const customEvent = document.createEvent("CustomEvent");
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3924 customEvent.initCustomEvent("ThumbnailLoaded", false, false,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3925 { "studyInstanceUid" : UTF8ToString($0),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3926 "seriesInstanceUid" : UTF8ToString($1) });
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3927 window.dispatchEvent(customEvent);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3928 },
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3929 studyInstanceUid.c_str(),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3930 seriesInstanceUid.c_str());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3931 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3932
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3933 virtual void SignalSeriesMetadataLoaded(const std::string& studyInstanceUid,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3934 const std::string& seriesInstanceUid) ORTHANC_OVERRIDE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3935 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3936 EM_ASM({
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3937 const customEvent = document.createEvent("CustomEvent");
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3938 customEvent.initCustomEvent("MetadataLoaded", false, false,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3939 { "studyInstanceUid" : UTF8ToString($0),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3940 "seriesInstanceUid" : UTF8ToString($1) });
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3941 window.dispatchEvent(customEvent);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3942 },
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3943 studyInstanceUid.c_str(),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3944 seriesInstanceUid.c_str());
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3945
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3946 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
3947 {
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3948 assert(it->second != NULL);
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3949 it->second->ApplyScheduledFocus();
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
3950 }
1495
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
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3953 virtual void SignalSeriesDetailsReady(const ViewerViewport& viewport) ORTHANC_OVERRIDE
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3954 {
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3955 EM_ASM({
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3956 const customEvent = document.createEvent("CustomEvent");
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3957 customEvent.initCustomEvent("SeriesDetailsReady", false, false,
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3958 { "canvasId" : UTF8ToString($0) });
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3959 window.dispatchEvent(customEvent);
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3960 },
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3961 viewport.GetCanvasId().c_str()
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3962 );
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3963 }
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
3964
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3965 virtual void SignalFrameUpdated(const ViewerViewport& viewport,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3966 size_t currentFrame,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3967 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
3968 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
3969 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
3970 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
3971 const std::string& contentTime) ORTHANC_OVERRIDE
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3972 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3973 EM_ASM({
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3974 const customEvent = document.createEvent("CustomEvent");
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3975 customEvent.initCustomEvent("FrameUpdated", false, false,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3976 { "canvasId" : UTF8ToString($0),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3977 "currentFrame" : $1,
1674
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
3978 "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
3979 "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
3980 "instanceNumber" : $4,
58681a5c727b overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents: 1855
diff changeset
3981 "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
3982 "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
3983 });
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3984 window.dispatchEvent(customEvent);
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 viewport.GetCanvasId().c_str(),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3987 static_cast<int>(currentFrame),
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3988 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
3989 quality,
58681a5c727b overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents: 1855
diff changeset
3990 instanceNumber,
58681a5c727b overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents: 1855
diff changeset
3991 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
3992 contentTime.c_str());
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3993
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3994 UpdateReferenceLines();
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3995 }
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3996
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3997 virtual void SignalCrosshair(const ViewerViewport& viewport,
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
3998 const OrthancStone::Vector& click) ORTHANC_OVERRIDE
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
3999 {
1811
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
4000 if (click.size() != 3u)
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
4001 {
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
4002 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
4003 }
fdc6a8089eb9 hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1809
diff changeset
4004
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
4005 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
4006 {
1694
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4007 // TODO - One could check the "Frame Of Reference UID" here
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4008 assert(it->second.get() != NULL);
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4009 if (it->second.get() != &viewport)
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4010 {
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4011 it->second->FocusOnPoint(click);
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4012 }
1648
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
4013 }
4a43106bc122 cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1647
diff changeset
4014 }
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4015
1694
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4016 virtual void SignalSynchronizedBrowsing(const ViewerViewport& viewport,
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4017 const OrthancStone::Vector& click,
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4018 const OrthancStone::Vector& normal) ORTHANC_OVERRIDE
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4019 {
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4020 for (Viewports::const_iterator it = allViewports_.begin(); it != allViewports_.end(); ++it)
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4021 {
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4022 assert(it->second.get() != NULL);
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4023
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4024 OrthancStone::CoordinateSystem3D plane;
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4025 bool isOpposite;
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4026
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4027 if (it->second.get() != &viewport &&
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4028 it->second->GetCurrentPlane(plane) &&
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4029 OrthancStone::GeometryToolbox::IsParallelOrOpposite(isOpposite, plane.GetNormal(), normal))
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4030 {
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4031 it->second->FocusOnPoint(click);
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4032 }
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4033 }
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4034 }
7226b68e2742 print button
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1693
diff changeset
4035
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4036 virtual void SignalSeriesPdfLoaded(const std::string& studyInstanceUid,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4037 const std::string& seriesInstanceUid,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4038 const std::string& pdf) ORTHANC_OVERRIDE
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4039 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4040 EM_ASM({
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4041 const customEvent = document.createEvent("CustomEvent");
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4042 customEvent.initCustomEvent("PdfLoaded", false, false,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4043 { "studyInstanceUid" : UTF8ToString($0),
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4044 "seriesInstanceUid" : UTF8ToString($1),
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4045 "pdfPointer" : $2,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4046 "pdfSize": $3});
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4047 window.dispatchEvent(customEvent);
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4048 },
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4049 studyInstanceUid.c_str(),
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4050 seriesInstanceUid.c_str(),
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4051 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
4052 pdf.size());
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4053 }
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4054
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4055
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4056 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
4057 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
4058 {
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4059 std::string dataUriScheme;
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4060 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
4061
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4062 EM_ASM({
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4063 const customEvent = document.createEvent("CustomEvent");
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4064 customEvent.initCustomEvent("VirtualSeriesThumbnailLoaded", false, false,
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4065 { "virtualSeriesId" : UTF8ToString($0),
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4066 "thumbnail" : UTF8ToString($1) });
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4067 window.dispatchEvent(customEvent);
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4068 },
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4069 virtualSeriesId.c_str(),
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4070 dataUriScheme.c_str());
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4071 }
1720
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
4072
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
4073 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
4074 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
4075 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
4076 {
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
4077 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
4078 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
4079 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
4080 { "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
4081 "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
4082 "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
4083 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
4084 },
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
4085 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
4086 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
4087 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
4088
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
4089 UpdateReferenceLines();
b8d19f53aaca display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1719
diff changeset
4090 }
1813
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4091
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4092 virtual void SignalStoneAnnotationsChanged(const ViewerViewport& viewport,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4093 const std::string& sopInstanceUid,
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4094 size_t frame) ORTHANC_OVERRIDE
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4095 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4096 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
4097 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4098 assert(it->second.get() != NULL);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4099
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4100 if (it->second.get() != &viewport)
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4101 {
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4102 it->second->SignalStoneAnnotationsChanged(sopInstanceUid, frame);
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4103 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4104 }
53aa3f72b539 synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1812
diff changeset
4105 }
1815
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4106
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4107 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
4108 {
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4109 EM_ASM({
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4110 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
4111 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
4112 { "canvasId" : UTF8ToString($0) });
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4113 window.dispatchEvent(customEvent);
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4114 },
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4115 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
4116 }
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4117
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4118 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
4119 {
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4120 EM_ASM({
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4121 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
4122 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
4123 { "canvasId" : UTF8ToString($0) });
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4124 window.dispatchEvent(customEvent);
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4125 },
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4126 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
4127 }
2001
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4128
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4129 virtual void SignalStoneTextAnnotationRequired(const ViewerViewport& viewport,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4130 const OrthancStone::ScenePoint2D& pointedPosition,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4131 const OrthancStone::ScenePoint2D& labelPosition) ORTHANC_OVERRIDE
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4132 {
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4133 EM_ASM({
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4134 const customEvent = document.createEvent("CustomEvent");
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4135 customEvent.initCustomEvent("TextAnnotationRequired", false, false,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4136 { "canvasId" : UTF8ToString($0),
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4137 "pointedX" : $1,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4138 "pointedY" : $2,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4139 "labelX" : $3,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4140 "labelY" : $4 });
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4141 window.dispatchEvent(customEvent);
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4142 },
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4143 viewport.GetCanvasId().c_str(),
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4144 pointedPosition.GetX(),
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4145 pointedPosition.GetY(),
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4146 labelPosition.GetX(),
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4147 labelPosition.GetY() );
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4148 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4149 };
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4150
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4151
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4152
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4153 static OrthancStone::DicomSource source_;
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
4154 static boost::shared_ptr<FramesCache> framesCache_;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4155 static boost::shared_ptr<OrthancStone::WebAssemblyLoadersContext> context_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4156 static std::string stringBuffer_;
1552
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4157 static bool softwareRendering_ = false;
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4158 static bool linearInterpolation_ = true;
1701
b5a8bf32d969 new configuration options: "CombinedToolEnabled", "CombinedToolBehaviour" and "DownloadAsJpegEnabled"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1695
diff changeset
4159 static WebViewerAction leftButtonAction_ = WebViewerAction_Windowing;
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
4160 static WebViewerAction middleButtonAction_ = WebViewerAction_Pan;
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
4161 static WebViewerAction rightButtonAction_ = WebViewerAction_Zoom;
1495
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4164 static void FormatTags(std::string& target,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4165 const Orthanc::DicomMap& tags)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4166 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4167 Orthanc::DicomArray arr(tags);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4168 Json::Value v = Json::objectValue;
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 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
4171 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4172 const Orthanc::DicomElement& element = arr.GetElement(i);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4173 if (!element.GetValue().IsBinary() &&
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4174 !element.GetValue().IsNull())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4175 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4176 v[element.GetTag().Format()] = element.GetValue().GetContent();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4177 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4178 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4179
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4180 target = v.toStyledString();
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
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4184 static ResourcesLoader& GetResourcesLoader()
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 static boost::shared_ptr<ResourcesLoader> resourcesLoader_;
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 if (!resourcesLoader_)
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 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
4191 resourcesLoader_ = ResourcesLoader::Create(*lock, source_);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4192 resourcesLoader_->AcquireObserver(new WebAssemblyObserver);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4193 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4194
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4195 return *resourcesLoader_;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4196 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4197
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4198
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4199 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
4200 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4201 Viewports::iterator found = allViewports_.find(canvas);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4202 if (found == allViewports_.end())
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4203 {
1552
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4204 boost::shared_ptr<ViewerViewport> viewport(
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4205 ViewerViewport::Create(*context_, source_, canvas, framesCache_, softwareRendering_, linearInterpolation_));
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4206 viewport->SetMouseButtonActions(leftButtonAction_, middleButtonAction_, rightButtonAction_);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4207 viewport->AcquireObserver(new WebAssemblyObserver);
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4208 viewport->SetOsiriXAnnotations(osiriXAnnotations_);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4209 allViewports_[canvas] = viewport;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4210 return viewport;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4211 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4212 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4213 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4214 return found->second;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4215 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4216 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4217
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4218
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4219 extern "C"
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4220 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4221 int main(int argc, char const *argv[])
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4222 {
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
4223 printf("Initializing Stone\n");
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4224 Orthanc::InitializeFramework("", true);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4225 Orthanc::Logging::EnableInfoLevel(true);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4226 //Orthanc::Logging::EnableTraceLevel(true);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4227
2007
c818be7cb940 log DCMTK version
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2001
diff changeset
4228 LOG(INFO) << "Using DCMTK version: " << DCMTK_VERSION_NUMBER;
c818be7cb940 log DCMTK version
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2001
diff changeset
4229
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4230 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
4231 context_->SetDicomCacheSize(128 * 1024 * 1024); // 128MB
fc883105ee11 enable cache of ParsedDicomFile in oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1657
diff changeset
4232
1676
5e76d5e8167a limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1675
diff changeset
4233 framesCache_.reset(new FramesCache);
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4234 osiriXAnnotations_.reset(new OrthancStone::OsiriX::CollectionOfAnnotations);
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4235
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4236 DISPATCH_JAVASCRIPT_EVENT("StoneInitialized");
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4237 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4238
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4239
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4240 EMSCRIPTEN_KEEPALIVE
1713
aec45e0b2528 configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1704
diff changeset
4241 void SetDicomWebRoot(const char* uri,
aec45e0b2528 configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1704
diff changeset
4242 int useRendered)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4243 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4244 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4245 {
1713
aec45e0b2528 configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1704
diff changeset
4246 source_.SetDicomWebSource(uri);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4247 source_.SetDicomWebRendered(useRendered != 0);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4248 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4249 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4250 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4251
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4252
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4253 EMSCRIPTEN_KEEPALIVE
1713
aec45e0b2528 configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1704
diff changeset
4254 void SetDicomWebThroughOrthanc(const char* orthancRoot,
aec45e0b2528 configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1704
diff changeset
4255 const char* serverName,
aec45e0b2528 configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1704
diff changeset
4256 int hasRendered)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4257 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4258 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4259 {
1713
aec45e0b2528 configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1704
diff changeset
4260 context_->SetLocalOrthanc(orthancRoot);
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4261 source_.SetDicomWebThroughOrthancSource(serverName);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4262 source_.SetDicomWebRendered(hasRendered != 0);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4263 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4264 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4265 }
1761
28755e42c007 Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
4266
28755e42c007 Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
4267
28755e42c007 Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
4268 EMSCRIPTEN_KEEPALIVE
28755e42c007 Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
4269 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
4270 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
4271 {
28755e42c007 Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
4272 try
28755e42c007 Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
4273 {
28755e42c007 Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
4274 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
4275 }
28755e42c007 Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
4276 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
4277 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4278
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4279
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4280 EMSCRIPTEN_KEEPALIVE
1714
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4281 void SetDicomCacheSize(int sizeMB)
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4282 {
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4283 try
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4284 {
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4285 if (sizeMB == 0)
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4286 {
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4287 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
4288 }
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4289 else
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4290 {
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4291 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
4292 }
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4293
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4294 if (sizeMB >= 0)
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4295 {
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4296 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
4297 }
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4298 }
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4299 EXTERN_CATCH_EXCEPTIONS;
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4300 }
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4301
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4302
a878e807cd96 configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1713
diff changeset
4303 EMSCRIPTEN_KEEPALIVE
1862
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4304 void SetSkipSeriesFromModalities(const char* value)
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4305 {
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4306 try
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4307 {
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4308 LOG(WARNING) << "SetSkipSeriesFromModalities " << value;
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4309
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4310 Json::Value modalities;
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4311 Orthanc::Toolbox::ReadJson(modalities, value);
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4312 std::vector<std::string> skipSeriesFromModalities;
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4313
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4314 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
4315 {
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4316 skipSeriesFromModalities.push_back(modalities[i].asString());
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4317 }
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4318 GetResourcesLoader().SetSkipSeriesFromModalities(skipSeriesFromModalities);
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4319 }
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4320 EXTERN_CATCH_EXCEPTIONS;
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4321 }
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4322
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4323
63587fdeec69 added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents: 1859
diff changeset
4324 EMSCRIPTEN_KEEPALIVE
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4325 void FetchAllStudies()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4326 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4327 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4328 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4329 GetResourcesLoader().FetchAllStudies();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4330 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4331 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4332 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4333
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4334 EMSCRIPTEN_KEEPALIVE
1702
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4335 void FetchPatient(const char* patientId)
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4336 {
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4337 try
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4338 {
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4339 GetResourcesLoader().FetchPatient(patientId);
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4340 }
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4341 EXTERN_CATCH_EXCEPTIONS;
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4342 }
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4343
bc40b6450261 "patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1701
diff changeset
4344 EMSCRIPTEN_KEEPALIVE
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4345 void FetchStudy(const char* studyInstanceUid)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4346 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4347 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4348 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4349 GetResourcesLoader().FetchStudy(studyInstanceUid);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4350 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4351 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4352 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4353
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4354 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4355 void FetchSeries(const char* studyInstanceUid,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4356 const char* seriesInstanceUid)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4357 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4358 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4359 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4360 GetResourcesLoader().FetchSeries(studyInstanceUid, seriesInstanceUid);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4361 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4362 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4363 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4364
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4365 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4366 int GetStudiesCount()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4367 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4368 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4369 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4370 return GetResourcesLoader().GetStudiesCount();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4371 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4372 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4373 return 0; // on exception
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4374 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4375
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4376 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4377 int GetSeriesCount()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4378 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4379 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4380 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4381 return GetResourcesLoader().GetSeriesCount();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4382 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4383 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4384 return 0; // on exception
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4385 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4386
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4387
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4388 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4389 const char* GetStringBuffer()
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4390 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4391 return stringBuffer_.c_str();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4392 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4393
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4394
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4395 EMSCRIPTEN_KEEPALIVE
1827
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4396 const char* GetStoneWebViewerVersion()
1824
a56bf4c534ef display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1822
diff changeset
4397 {
1827
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4398 return STONE_WEB_VIEWER_VERSION;
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4399 }
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4400
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4401
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4402 EMSCRIPTEN_KEEPALIVE
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4403 const char* GetEmscriptenVersion()
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4404 {
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4405 // 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
4406 // freed when returning to JavaScript
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4407 static const std::string EMSCRIPTEN_VERSION = (
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4408 boost::lexical_cast<std::string>(__EMSCRIPTEN_major__) + "." +
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4409 boost::lexical_cast<std::string>(__EMSCRIPTEN_minor__) + "." +
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4410 boost::lexical_cast<std::string>(__EMSCRIPTEN_tiny__));
21ccc00839f7 upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1824
diff changeset
4411 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
4412 }
a56bf4c534ef display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1822
diff changeset
4413
a56bf4c534ef display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1822
diff changeset
4414
a56bf4c534ef display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1822
diff changeset
4415 EMSCRIPTEN_KEEPALIVE
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4416 void LoadStudyTags(int i)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4417 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4418 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4419 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4420 if (i < 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4421 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4422 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4423 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4424
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4425 Orthanc::DicomMap dicom;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4426 GetResourcesLoader().GetStudy(dicom, i);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4427 FormatTags(stringBuffer_, dicom);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4428 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4429 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4430 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4431
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4432
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4433 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4434 void LoadSeriesTags(int i)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4435 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4436 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4437 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4438 if (i < 0)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4439 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4440 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4441 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4442
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4443 Orthanc::DicomMap dicom;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4444 GetResourcesLoader().GetSeries(dicom, i);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4445 FormatTags(stringBuffer_, dicom);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4446 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4447 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4448 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4449
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4450
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4451 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4452 int LoadSeriesThumbnail(const char* seriesInstanceUid)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4453 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4454 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4455 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4456 std::string image, mime;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4457 switch (GetResourcesLoader().GetSeriesThumbnail(image, mime, seriesInstanceUid))
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4458 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4459 case OrthancStone::SeriesThumbnailType_Image:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4460 Orthanc::Toolbox::EncodeDataUriScheme(stringBuffer_, mime, image);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4461 return ThumbnailType_Image;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4462
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4463 case OrthancStone::SeriesThumbnailType_Pdf:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4464 return ThumbnailType_Pdf;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4465
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4466 case OrthancStone::SeriesThumbnailType_Video:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4467 return ThumbnailType_Video;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4468
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4469 case OrthancStone::SeriesThumbnailType_NotLoaded:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4470 return ThumbnailType_Loading;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4471
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4472 case OrthancStone::SeriesThumbnailType_Unsupported:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4473 return ThumbnailType_NoPreview;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4474
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4475 default:
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4476 return ThumbnailType_Unknown;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4477 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4478 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4479 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4480 return ThumbnailType_Unknown;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4481 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4482
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4483
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4484 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4485 void SpeedUpFetchSeriesMetadata(const char* studyInstanceUid,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4486 const char* seriesInstanceUid)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4487 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4488 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4489 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4490 GetResourcesLoader().FetchSeriesMetadata(PRIORITY_HIGH, studyInstanceUid, seriesInstanceUid);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4491 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4492 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4493 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4494
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4496 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4497 int IsSeriesComplete(const char* seriesInstanceUid)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4498 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4499 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4500 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4501 return GetResourcesLoader().IsSeriesComplete(seriesInstanceUid) ? 1 : 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4502 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4503 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4504 return 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4505 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4506
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4507 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4508 int LoadSeriesInViewport(const char* canvas,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4509 const char* seriesInstanceUid)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4510 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4511 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4512 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
4513 std::unique_ptr<IFramesCollection> frames(GetResourcesLoader().GetSeriesFrames(seriesInstanceUid));
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
4514
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
4515 if (frames.get() != NULL)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4516 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4517 GetViewport(canvas)->SetFrames(frames.release());
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4518 return 1;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4519 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4520 else
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4521 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4522 return 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4523 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4524 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4525 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4526 return 0;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4527 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4528
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4529
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4530 EMSCRIPTEN_KEEPALIVE
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4531 int LoadVirtualSeriesInViewport(const char* canvas,
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4532 const char* virtualSeriesId)
1704
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4533 {
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4534 try
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4535 {
2095
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
4536 std::unique_ptr<IFramesCollection> frames(GetResourcesLoader().GetVirtualSeriesFrames(virtualSeriesId));
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
4537
ec676dbe85ac partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2094
diff changeset
4538 if (frames.get() != NULL)
1704
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4539 {
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4540 GetViewport(canvas)->SetFrames(frames.release());
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4541 return 1;
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4542 }
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4543 else
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4544 {
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4545 return 0;
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4546 }
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4547 }
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4548 EXTERN_CATCH_EXCEPTIONS;
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4549 return 0;
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4550 }
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4551
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4552
902d13889ae4 LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1703
diff changeset
4553 EMSCRIPTEN_KEEPALIVE
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4554 void AllViewportsUpdateSize(int fitContent)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4555 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4556 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4557 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4558 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
4559 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4560 assert(it->second != NULL);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4561 it->second->UpdateSize(fitContent != 0);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4562 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4563 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4564 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4565 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4566
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4567
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4568 EMSCRIPTEN_KEEPALIVE
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4569 int DecrementFrame(const char* canvas,
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4570 int isCircular)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4571 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4572 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4573 {
2018
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
4574 bool changed = GetViewport(canvas)->ChangeFrame(SeriesCursor::Action_Minus, isCircular);
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
4575 GetViewport(canvas)->SignalSynchronizedBrowsing();
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
4576 return changed ? 1 : 0;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4577 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4578 EXTERN_CATCH_EXCEPTIONS;
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4579 return 0;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4580 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4581
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4582
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4583 EMSCRIPTEN_KEEPALIVE
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4584 int IncrementFrame(const char* canvas,
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4585 int isCircular)
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4586 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4587 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4588 {
2018
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
4589 bool changed = GetViewport(canvas)->ChangeFrame(SeriesCursor::Action_Plus, isCircular);
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
4590 GetViewport(canvas)->SignalSynchronizedBrowsing();
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
4591 return changed ? 1 : 0;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4592 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4593 EXTERN_CATCH_EXCEPTIONS;
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4594 return 0;
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4595 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4596
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4597
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4598 EMSCRIPTEN_KEEPALIVE
1948
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4599 void SetFrame(const char* canvas,
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4600 int frameNumber)
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4601 {
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4602 try
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4603 {
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4604 if (frameNumber >= 0)
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4605 {
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4606 GetViewport(canvas)->SetFrame(static_cast<unsigned int>(frameNumber));
2018
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
4607 GetViewport(canvas)->SignalSynchronizedBrowsing();
1948
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4608 }
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4609 }
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4610 EXTERN_CATCH_EXCEPTIONS;
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4611 }
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4612
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4613
d459477804bf added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1925
diff changeset
4614 EMSCRIPTEN_KEEPALIVE
1719
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4615 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
4616 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4617 try
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4618 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4619 GetViewport(canvas)->GoToFirstFrame();
2018
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
4620 GetViewport(canvas)->SignalSynchronizedBrowsing();
1719
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4621 }
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4622 EXTERN_CATCH_EXCEPTIONS;
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4623 }
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4624
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4625
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4626 EMSCRIPTEN_KEEPALIVE
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4627 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
4628 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4629 try
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4630 {
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4631 GetViewport(canvas)->GoToLastFrame();
2018
6099c7925202 synchronized browsing against the vertical slider
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
4632 GetViewport(canvas)->SignalSynchronizedBrowsing();
1719
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4633 }
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4634 EXTERN_CATCH_EXCEPTIONS;
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4635 }
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4636
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4637
9a1f79d21a3f added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1717
diff changeset
4638 EMSCRIPTEN_KEEPALIVE
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4639 void ShowReferenceLines(int show)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4640 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4641 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4642 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4643 showReferenceLines_ = (show != 0);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4644 UpdateReferenceLines();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4645 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4646 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4647 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4648
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4649
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4650 EMSCRIPTEN_KEEPALIVE
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4651 void SetWindowing(const char* canvas,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4652 int center,
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4653 int width)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4654 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4655 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4656 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4657 GetViewport(canvas)->SetWindowing(center, width);
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4658 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4659 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4660 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4661
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4662
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4663 EMSCRIPTEN_KEEPALIVE
2030
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4664 void StretchWindowing(const char* canvas)
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4665 {
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4666 try
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4667 {
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4668 GetViewport(canvas)->StretchWindowing();
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4669 }
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4670 EXTERN_CATCH_EXCEPTIONS;
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4671 }
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4672
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4673
f36de3ba43c8 added button "Stretch to whole range" in the "Change windowing" menu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2018
diff changeset
4674 EMSCRIPTEN_KEEPALIVE
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4675 void InvertContrast(const char* canvas)
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4676 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4677 try
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4678 {
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4679 GetViewport(canvas)->Invert();
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4680 }
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4681 EXTERN_CATCH_EXCEPTIONS;
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4682 }
1552
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4683
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4684
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4685 EMSCRIPTEN_KEEPALIVE
1554
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4686 void FlipX(const char* canvas)
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4687 {
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4688 try
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4689 {
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4690 GetViewport(canvas)->FlipX();
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4691 }
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4692 EXTERN_CATCH_EXCEPTIONS;
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4693 }
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4694
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4695
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4696 EMSCRIPTEN_KEEPALIVE
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4697 void FlipY(const char* canvas)
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4698 {
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4699 try
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4700 {
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4701 GetViewport(canvas)->FlipY();
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4702 }
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4703 EXTERN_CATCH_EXCEPTIONS;
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4704 }
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4705
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4706
6d14ed6163b1 flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1552
diff changeset
4707 EMSCRIPTEN_KEEPALIVE
1989
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4708 void RotateLeft(const char* canvas)
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4709 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4710 try
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4711 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4712 GetViewport(canvas)->RotateLeft();
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4713 }
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4714 EXTERN_CATCH_EXCEPTIONS;
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4715 }
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4716
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4717
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4718 EMSCRIPTEN_KEEPALIVE
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4719 void RotateRight(const char* canvas)
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4720 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4721 try
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4722 {
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4723 GetViewport(canvas)->RotateRight();
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4724 }
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4725 EXTERN_CATCH_EXCEPTIONS;
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4726 }
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4727
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4728
e8b9a2ba1df1 Added left/right rotation buttons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1982
diff changeset
4729 EMSCRIPTEN_KEEPALIVE
1552
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4730 void SetSoftwareRendering(int softwareRendering)
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4731 {
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4732 softwareRendering_ = softwareRendering;
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4733 }
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4734
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4735
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4736 EMSCRIPTEN_KEEPALIVE
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4737 int IsSoftwareRendering()
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4738 {
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4739 return softwareRendering_;
a4d82f1bcb10 user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1551
diff changeset
4740 }
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4741
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4742
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4743 EMSCRIPTEN_KEEPALIVE
1996
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4744 void SetLinearInterpolation(int linearInterpolation)
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4745 {
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4746 linearInterpolation_ = linearInterpolation;
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4747
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4748 try
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4749 {
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4750 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it)
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4751 {
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4752 assert(it->second != NULL);
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4753 it->second->SetLinearInterpolation(linearInterpolation);
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4754 }
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4755 }
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4756 EXTERN_CATCH_EXCEPTIONS;
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4757 }
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4758
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4759
6e4ef6e3b2bf linear interpolation of images can be turned off in the user preferences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1993
diff changeset
4760 EMSCRIPTEN_KEEPALIVE
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4761 void SetMouseButtonActions(int leftAction,
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4762 int middleAction,
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4763 int rightAction)
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4764 {
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4765 try
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4766 {
1579
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
4767 leftButtonAction_ = static_cast<WebViewerAction>(leftAction);
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
4768 middleButtonAction_ = static_cast<WebViewerAction>(middleAction);
c476b0d5e59c skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1578
diff changeset
4769 rightButtonAction_ = static_cast<WebViewerAction>(rightAction);
1561
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4770
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4771 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it)
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4772 {
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4773 assert(it->second != NULL);
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4774 it->second->SetMouseButtonActions(leftButtonAction_, middleButtonAction_, rightButtonAction_);
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4775 }
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4776 }
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4777 EXTERN_CATCH_EXCEPTIONS;
cf652990abb1 tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1558
diff changeset
4778 }
1575
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4779
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4780
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4781 EMSCRIPTEN_KEEPALIVE
1815
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4782 int GetLeftMouseButtonAction()
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4783 {
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4784 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
4785 }
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4786
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4787
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4788 EMSCRIPTEN_KEEPALIVE
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4789 int GetMiddleMouseButtonAction()
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4790 {
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4791 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
4792 }
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4793
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4794
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4795 EMSCRIPTEN_KEEPALIVE
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4796 int GetRightMouseButtonAction()
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4797 {
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4798 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
4799 }
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4800
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4801
b81775f1b196 New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1814
diff changeset
4802 EMSCRIPTEN_KEEPALIVE
1578
1f812f4c95be comments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1576
diff changeset
4803 void FitForPrint()
1575
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4804 {
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4805 try
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4806 {
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4807 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it)
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4808 {
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4809 assert(it->second != NULL);
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4810 it->second->FitForPrint();
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4811 }
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4812 }
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4813 EXTERN_CATCH_EXCEPTIONS;
e4a52cbbdd70 working on print
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
4814 }
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4815
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4816
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4817 // 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
4818 // Instance UID" of the first loaded annotation
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4819 EMSCRIPTEN_KEEPALIVE
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4820 int LoadOsiriXAnnotations(const char* xml,
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4821 int clearPreviousAnnotations)
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4822 {
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4823 try
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4824 {
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4825 if (clearPreviousAnnotations)
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4826 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4827 osiriXAnnotations_->Clear();
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4828 }
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4829
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4830 osiriXAnnotations_->LoadXml(xml);
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4831
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4832 // Force redraw, as the annotations might have changed
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4833 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it)
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4834 {
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4835 assert(it->second != NULL);
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4836 it->second->Redraw();
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4837 }
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4838
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4839 if (osiriXAnnotations_->GetSize() == 0)
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4840 {
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4841 stringBuffer_.clear();
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4842 }
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4843 else
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4844 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4845 stringBuffer_ = osiriXAnnotations_->GetAnnotation(0).GetSeriesInstanceUid();
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4846 }
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4847
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4848 LOG(WARNING) << "Loaded " << osiriXAnnotations_->GetSize() << " annotations from OsiriX";
1593
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4849 return 1;
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4850 }
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4851 EXTERN_CATCH_EXCEPTIONS;
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4852 return 0;
b782f78aed42 rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1591
diff changeset
4853 }
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4854
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4855
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4856 EMSCRIPTEN_KEEPALIVE
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4857 void FocusFirstOsiriXAnnotation(const char* canvas)
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4858 {
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4859 try
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4860 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4861 if (osiriXAnnotations_->GetSize() != 0)
1603
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4862 {
1812
db341679dc9f ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1811
diff changeset
4863 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
4864
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4865 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
4866 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
4867
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4868 // 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
4869 viewport->Redraw();
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4870 }
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4871 }
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4872 EXTERN_CATCH_EXCEPTIONS;
595c0952ef7e focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
4873 }
1657
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4874
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4875
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4876 EMSCRIPTEN_KEEPALIVE
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4877 void FetchPdf(const char* studyInstanceUid,
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4878 const char* seriesInstanceUid)
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4879 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4880 try
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4881 {
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4882 LOG(INFO) << "Fetching PDF series: " << seriesInstanceUid;
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4883 GetResourcesLoader().FetchPdf(studyInstanceUid, seriesInstanceUid);
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4884 }
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4885 EXTERN_CATCH_EXCEPTIONS;
66e5fcdf5597 pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1654
diff changeset
4886 }
1672
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4887
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4888
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4889 EMSCRIPTEN_KEEPALIVE
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4890 unsigned int GetCineRate(const char* canvas)
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4891 {
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4892 try
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4893 {
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4894 return GetViewport(canvas)->GetCineRate();
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4895 }
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4896 EXTERN_CATCH_EXCEPTIONS;
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4897 return 0;
570398585b5f start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1671
diff changeset
4898 }
1674
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4899
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4900
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4901 EMSCRIPTEN_KEEPALIVE
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4902 unsigned int GetSeriesNumberOfFrames(const char* seriesInstanceUid)
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4903 {
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4904 try
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4905 {
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4906 return GetResourcesLoader().GetSeriesNumberOfFrames(seriesInstanceUid);
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4907 }
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4908 EXTERN_CATCH_EXCEPTIONS;
0621e523b670 number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1672
diff changeset
4909 return 0;
1679
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4910 }
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4911
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4912
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4913 EMSCRIPTEN_KEEPALIVE
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4914 void LoadWindowingPresets(const char* canvas)
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4915 {
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4916 try
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4917 {
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4918 Json::Value v;
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4919 GetViewport(canvas)->FormatWindowingPresets(v);
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4920 stringBuffer_ = v.toStyledString();
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4921 }
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4922 EXTERN_CATCH_EXCEPTIONS;
5b8b88e5bfd6 successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1677
diff changeset
4923 }
1693
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4924
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4925
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4926 EMSCRIPTEN_KEEPALIVE
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4927 void SetSynchronizedBrowsingEnabled(int enabled)
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4928 {
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4929 try
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4930 {
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4931 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it)
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4932 {
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4933 assert(it->second != NULL);
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4934 it->second->SetSynchronizedBrowsingEnabled(enabled);
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4935 }
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4936 }
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4937 EXTERN_CATCH_EXCEPTIONS;
eafb10992e73 synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1682
diff changeset
4938 }
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4939
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4940
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4941 EMSCRIPTEN_KEEPALIVE
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4942 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
4943 {
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4944 try
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4945 {
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
4946 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
4947
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
4948 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
4949 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
4950 {
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4951 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
4952 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
4953 {
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4954 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
4955 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
4956 item["NumberOfFrames"] = it->second;
1849
023cce3d7844 introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1827
diff changeset
4957 json.append(item);
1703
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4958 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4959
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4960 stringBuffer_ = json.toStyledString();
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4961 return true;
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4962 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4963 else
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4964 {
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4965 return false;
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4966 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4967 }
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4968 EXTERN_CATCH_EXCEPTIONS;
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4969 return false;
76c590a62755 start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1702
diff changeset
4970 }
2001
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4971
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4972
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4973 EMSCRIPTEN_KEEPALIVE
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4974 void AddTextAnnotation(const char* canvas,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4975 const char* label,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4976 double pointedX,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4977 double pointedY,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4978 double labelX,
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4979 double labelY)
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4980 {
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4981 try
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4982 {
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4983 GetViewport(canvas)->AddTextAnnotation(label, OrthancStone::ScenePoint2D(pointedX, pointedY),
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4984 OrthancStone::ScenePoint2D(labelX, labelY));
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4985 }
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4986 EXTERN_CATCH_EXCEPTIONS;
e943a84da9ac creation of text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
4987 }
1495
fb74ed5d8c22 initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4988 }