Mercurial > hg > orthanc-stone
comparison Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp @ 1551:c54bc5bffd01
software rendering
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 13 Aug 2020 22:05:13 +0200 |
parents | a48ae10857b1 |
children | a4d82f1bcb10 |
comparison
equal
deleted
inserted
replaced
1550:012ab2c1f23b | 1551:c54bc5bffd01 |
---|---|
77 #include <StoneException.h> | 77 #include <StoneException.h> |
78 #include <Toolbox/DicomInstanceParameters.h> | 78 #include <Toolbox/DicomInstanceParameters.h> |
79 #include <Toolbox/GeometryToolbox.h> | 79 #include <Toolbox/GeometryToolbox.h> |
80 #include <Toolbox/SortedFrames.h> | 80 #include <Toolbox/SortedFrames.h> |
81 #include <Viewport/WebGLViewport.h> | 81 #include <Viewport/WebGLViewport.h> |
82 #include <Viewport/WebAssemblyCairoViewport.h> | |
82 | 83 |
83 #include <boost/make_shared.hpp> | 84 #include <boost/make_shared.hpp> |
84 #include <stdio.h> | 85 #include <stdio.h> |
85 | 86 |
86 | 87 |
1220 }; | 1221 }; |
1221 | 1222 |
1222 | 1223 |
1223 std::unique_ptr<IObserver> observer_; | 1224 std::unique_ptr<IObserver> observer_; |
1224 OrthancStone::ILoadersContext& context_; | 1225 OrthancStone::ILoadersContext& context_; |
1225 boost::shared_ptr<OrthancStone::WebGLViewport> viewport_; | 1226 boost::shared_ptr<OrthancStone::WebAssemblyViewport> viewport_; |
1226 boost::shared_ptr<OrthancStone::DicomResourcesLoader> loader_; | 1227 boost::shared_ptr<OrthancStone::DicomResourcesLoader> loader_; |
1227 OrthancStone::DicomSource source_; | 1228 OrthancStone::DicomSource source_; |
1228 boost::shared_ptr<FramesCache> cache_; | 1229 boost::shared_ptr<FramesCache> cache_; |
1229 std::unique_ptr<OrthancStone::SortedFrames> frames_; | 1230 std::unique_ptr<OrthancStone::SortedFrames> frames_; |
1230 std::unique_ptr<SeriesCursor> cursor_; | 1231 std::unique_ptr<SeriesCursor> cursor_; |
1523 const std::string& canvas, | 1524 const std::string& canvas, |
1524 boost::shared_ptr<FramesCache> cache) : | 1525 boost::shared_ptr<FramesCache> cache) : |
1525 context_(context), | 1526 context_(context), |
1526 source_(source), | 1527 source_(source), |
1527 viewport_(OrthancStone::WebGLViewport::Create(canvas)), | 1528 viewport_(OrthancStone::WebGLViewport::Create(canvas)), |
1529 //viewport_(OrthancStone::WebAssemblyCairoViewport::Create(canvas)), | |
1528 cache_(cache), | 1530 cache_(cache), |
1529 fitNextContent_(true), | 1531 fitNextContent_(true), |
1530 isCtrlDown_(false) | 1532 isCtrlDown_(false) |
1531 { | 1533 { |
1532 if (!cache_) | 1534 if (!cache_) |