Mercurial > hg > orthanc-stone

changeset 1560:b4ccd4963d37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix sdl and wasm samples
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Aug 2020 13:57:52 +0200
parents 97b34cb88600
children cf652990abb1
files Applications/Samples/Common/RtViewerApp.h Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewerApplication.h Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h OrthancStone/Sources/Viewport/SdlViewport.cpp OrthancStone/Sources/Viewport/SdlViewport.h
diffstat 6 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Samples/Common/RtViewerApp.h	Thu Aug 20 11:57:41 2020 +0200
+++ b/Applications/Samples/Common/RtViewerApp.h	Thu Aug 20 13:57:52 2020 +0200
@@ -30,6 +30,7 @@
 #include "../../../OrthancStone/Sources/Messages/ObserverBase.h"
 #include "../../../OrthancStone/Sources/Oracle/OracleCommandExceptionMessage.h"
 #include "../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h"
+#include "../../../OrthancStone/Sources/Viewport/DefaultViewportInteractor.h"
 #include "../../../OrthancStone/Sources/Viewport/IViewport.h"
 #include "../../../OrthancStone/Sources/Volumes/DicomVolumeImage.h"
 
--- a/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Thu Aug 20 11:57:41 2020 +0200
+++ b/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Thu Aug 20 13:57:52 2020 +0200
@@ -24,9 +24,10 @@
 #include "../../Common/SampleHelpers.h"
 
 #include "../../../../OrthancStone/Sources/Loaders/GenericLoadersContext.h"
+#include "../../../../OrthancStone/Sources/StoneEnumerations.h"
 #include "../../../../OrthancStone/Sources/StoneException.h"
-#include "../../../../OrthancStone/Sources/StoneEnumerations.h"
 #include "../../../../OrthancStone/Sources/StoneInitialization.h"
+#include "../../../../OrthancStone/Sources/Viewport/DefaultViewportInteractor.h"
 #include "../../../../OrthancStone/Sources/Viewport/SdlViewport.h"
 
 #include <Compatibility.h>  // For std::unique_ptr<>
--- a/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewerApplication.h	Thu Aug 20 11:57:41 2020 +0200
+++ b/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewerApplication.h	Thu Aug 20 13:57:52 2020 +0200
@@ -21,11 +21,12 @@
 
 #pragma once
 
-#include "../../../../OrthancStone/Sources/Viewport/IViewport.h"
 #include "../../../../OrthancStone/Sources/Loaders/DicomResourcesLoader.h"
 #include "../../../../OrthancStone/Sources/Loaders/ILoadersContext.h"
 #include "../../../../OrthancStone/Sources/Loaders/SeriesFramesLoader.h"
 #include "../../../../OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.h"
+#include "../../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h"
+#include "../../../../OrthancStone/Sources/Viewport/IViewport.h"
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 
--- a/Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h	Thu Aug 20 11:57:41 2020 +0200
+++ b/Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h	Thu Aug 20 13:57:52 2020 +0200
@@ -25,7 +25,7 @@
 #include "../../../../OrthancStone/Sources/Loaders/ILoadersContext.h"
 #include "../../../../OrthancStone/Sources/Loaders/SeriesFramesLoader.h"
 #include "../../../../OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.h"
-#include "../../../../OrthancStone/Sources/Viewport/IViewport.h"
+#include "../../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h"
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 
--- a/OrthancStone/Sources/Viewport/SdlViewport.cpp	Thu Aug 20 11:57:41 2020 +0200
+++ b/OrthancStone/Sources/Viewport/SdlViewport.cpp	Thu Aug 20 13:57:52 2020 +0200
@@ -20,6 +20,8 @@
 
 #include "SdlViewport.h"
 
+#include "../Scene2DViewport/ViewportController.h"
+
 #include <OrthancException.h>
 
 #include <boost/make_shared.hpp>
--- a/OrthancStone/Sources/Viewport/SdlViewport.h	Thu Aug 20 11:57:41 2020 +0200
+++ b/OrthancStone/Sources/Viewport/SdlViewport.h	Thu Aug 20 13:57:52 2020 +0200
@@ -48,6 +48,7 @@
 #include <boost/weak_ptr.hpp>
 
 #include <boost/thread/recursive_mutex.hpp>
+#include <boost/enable_shared_from_this.hpp>
 
 namespace OrthancStone
 {