# HG changeset patch # User Benjamin Golinvaux # Date 1586869026 -7200 # Node ID c53a4667f895644c3b4a849904d55240a214aaa7 # Parent b1e6bef869558bf774c7d1bd6f4fd0daeed5dd1e Sample paths have been adapted diff -r b1e6bef86955 -r c53a4667f895 .hgignore --- a/.hgignore Fri Apr 10 16:12:14 2020 +0200 +++ b/.hgignore Tue Apr 14 14:57:06 2020 +0200 @@ -5,15 +5,15 @@ .vs/ .vscode/ Applications/Qt/archive/ -Applications/Samples/ThirdPartyDownloads/ -Applications/Samples/build-wasm/ -Applications/Samples/build-web/ -Applications/Samples/node_modules/ -Applications/Samples/rt-viewer-demo/ThirdPartyDownloads/ -Applications/Samples/rt-viewer-demo/build-sdl-msvc15/ -Applications/Samples/rt-viewer-demo/build-tsc-output/ -Applications/Samples/rt-viewer-demo/build-wasm/ -Applications/Samples/rt-viewer-demo/build-web/ +Applications/Samples/Deprecated/ThirdPartyDownloads/ +Applications/Samples/Deprecated/build-wasm/ +Applications/Samples/Deprecated/build-web/ +Applications/Samples/Deprecated/node_modules/ +Applications/Samples/Deprecated/rt-viewer-demo/ThirdPartyDownloads/ +Applications/Samples/Deprecated/rt-viewer-demo/build-sdl-msvc15/ +Applications/Samples/Deprecated/rt-viewer-demo/build-tsc-output/ +Applications/Samples/Deprecated/rt-viewer-demo/build-wasm/ +Applications/Samples/Deprecated/rt-viewer-demo/build-web/ Applications/build-* CMakeLists.txt.user Platforms/Generic/ThirdPartyDownloads/ @@ -31,12 +31,12 @@ Resources/CommandTool/protoc-tests/generated_js/ Resources/CommandTool/protoc-tests/generated_ts/ Resources/CommandTool/protoc-tests/node_modules/ -Samples/Sdl/ThirdPartyDownloads/ -Samples/Sdl/CMakeLists.txt.orig -Samples/Qt/ThirdPartyDownloads/ +Samples/WebAssembly/*/ThirdPartyDownloads/ +Samples/Deprecated/Sdl/ThirdPartyDownloads/ +Samples/Deprecated/Sdl/CMakeLists.txt.orig +Samples/Deprecated/Qt/ThirdPartyDownloads/ +Samples/Deprecated/WebAssembly/build/ +Samples/Deprecated/WebAssembly/ThirdPartyDownloads/ +Samples/Deprecated/WebAssembly/installDir/ +node_modules/ -Samples/WebAssembly/build/ -Samples/WebAssembly/ThirdPartyDownloads/ -Samples/WebAssembly/installDir/ - -node_modules/ diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/CMakeLists.txt --- a/Applications/Samples/Deprecated/CMakeLists.txt Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/CMakeLists.txt Tue Apr 14 14:57:06 2020 +0200 @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.8.3) project(OrthancStone) -include(../../Resources/CMake/OrthancStoneParameters.cmake) +include(../../../Resources/CMake/OrthancStoneParameters.cmake) set(ENABLE_STONE_DEPRECATED ON) # Need deprecated classes for these samples set(EMSCRIPTEN_SET_LLVM_WASM_BACKEND ON) @@ -126,7 +126,7 @@ LIST(APPEND ORTHANC_BOOST_COMPONENTS program_options) -include(../../Resources/CMake/OrthancStoneConfiguration.cmake) +include(../../../Resources/CMake/OrthancStoneConfiguration.cmake) add_library(OrthancStone STATIC ${ORTHANC_STONE_SOURCES} @@ -140,39 +140,39 @@ # files common to all samples list(APPEND SAMPLE_APPLICATIONS_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Samples/SampleInteractor.h - ${ORTHANC_STONE_ROOT}/Applications/Samples/SampleApplicationBase.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SampleInteractor.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SampleApplicationBase.h ) if (ENABLE_QT) list(APPEND SAMPLE_APPLICATIONS_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Samples/Qt/SampleQtApplicationRunner.h - ${ORTHANC_STONE_ROOT}/Applications/Samples/Qt/SampleMainWindow.cpp - ${ORTHANC_STONE_ROOT}/Applications/Samples/Qt/SampleMainWindowWithButtons.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/Qt/SampleQtApplicationRunner.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/Qt/SampleMainWindow.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/Qt/SampleMainWindowWithButtons.cpp ) ORTHANC_QT_WRAP_UI(SAMPLE_APPLICATIONS_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Samples/Qt/SampleMainWindow.ui - ${ORTHANC_STONE_ROOT}/Applications/Samples/Qt/SampleMainWindowWithButtons.ui + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/Qt/SampleMainWindow.ui + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/Qt/SampleMainWindowWithButtons.ui ) ORTHANC_QT_WRAP_CPP(SAMPLE_APPLICATIONS_SOURCES ${ORTHANC_STONE_ROOT}/Applications/Qt/QCairoWidget.h ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.h - ${ORTHANC_STONE_ROOT}/Applications/Samples/Qt/SampleMainWindow.h - ${ORTHANC_STONE_ROOT}/Applications/Samples/Qt/SampleMainWindowWithButtons.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/Qt/SampleMainWindow.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/Qt/SampleMainWindowWithButtons.h ) endif() if (ENABLE_NATIVE) list(APPEND SAMPLE_APPLICATIONS_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Samples/SampleMainNative.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SampleMainNative.cpp ) elseif (ENABLE_WASM) list(APPEND SAMPLE_APPLICATIONS_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Samples/SampleMainWasm.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SampleMainWasm.cpp ${STONE_WASM_SOURCES} ) endif() @@ -180,7 +180,7 @@ macro(BuildSingleFileSample Target Header Sample) add_executable(${Target} - ${ORTHANC_STONE_ROOT}/Applications/Samples/${Header} + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/${Header} ${SAMPLE_APPLICATIONS_SOURCES} ) set_target_properties(${Target} PROPERTIES COMPILE_DEFINITIONS ORTHANC_STONE_SAMPLE=${Sample}) @@ -206,36 +206,36 @@ if (ENABLE_QT) list(APPEND SIMPLE_VIEWER_APPLICATION_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/Qt/SimpleViewerMainWindow.cpp - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/Qt/SimpleViewerMainWindow.ui - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/Qt/mainQt.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/Qt/SimpleViewerMainWindow.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/Qt/SimpleViewerMainWindow.ui + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/Qt/mainQt.cpp ) ORTHANC_QT_WRAP_UI(SIMPLE_VIEWER_APPLICATION_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/Qt/SimpleViewerMainWindow.ui + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/Qt/SimpleViewerMainWindow.ui ) ORTHANC_QT_WRAP_CPP(SIMPLE_VIEWER_APPLICATION_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/Qt/SimpleViewerMainWindow.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/Qt/SimpleViewerMainWindow.h ) elseif (ENABLE_WASM) list(APPEND SIMPLE_VIEWER_APPLICATION_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/Wasm/mainWasm.cpp - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.cpp - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/Wasm/mainWasm.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h ${STONE_WASM_SOURCES} ) endif() add_executable(OrthancStoneSimpleViewer - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/AppStatus.h - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/MainWidgetInteractor.cpp - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/MainWidgetInteractor.h - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/SimpleViewerApplication.cpp - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/SimpleViewerApplication.h - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/ThumbnailInteractor.cpp - ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/ThumbnailInteractor.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/AppStatus.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/MainWidgetInteractor.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/MainWidgetInteractor.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/SimpleViewerApplication.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/SimpleViewerApplication.h + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/ThumbnailInteractor.cpp + ${ORTHANC_STONE_ROOT}/Applications/Samples/Deprecated/SimpleViewer/ThumbnailInteractor.h ${SIMPLE_VIEWER_APPLICATION_SOURCES} ) target_link_libraries(OrthancStoneSimpleViewer OrthancStone) diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/EmptyApplication.h --- a/Applications/Samples/Deprecated/EmptyApplication.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/EmptyApplication.h Tue Apr 14 14:57:06 2020 +0200 @@ -23,7 +23,7 @@ #include "SampleApplicationBase.h" -#include "../../Framework/Widgets/EmptyWidget.h" +#include "../../../Framework/Widgets/EmptyWidget.h" namespace OrthancStone { diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/LayoutPetCtFusionApplication.h --- a/Applications/Samples/Deprecated/LayoutPetCtFusionApplication.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/LayoutPetCtFusionApplication.h Tue Apr 14 14:57:06 2020 +0200 @@ -23,9 +23,9 @@ #include "SampleInteractor.h" -#include "../../Framework/Layers/ReferenceLineFactory.h" -#include "../../Framework/Layers/DicomStructureSetSlicer.h" -#include "../../Framework/Widgets/LayoutWidget.h" +#include "../../../Framework/Layers/ReferenceLineFactory.h" +#include "../../../Framework/Layers/DicomStructureSetSlicer.h" +#include "../../../Framework/Widgets/LayoutWidget.h" #include diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/Qt/SampleMainWindow.cpp --- a/Applications/Samples/Deprecated/Qt/SampleMainWindow.cpp Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/Qt/SampleMainWindow.cpp Tue Apr 14 14:57:06 2020 +0200 @@ -25,7 +25,7 @@ * this makes CMake unable to detect when the UI file changes. **/ #include -#include "../../Applications/Samples/SampleApplicationBase.h" +#include "../../../Applications/Samples/SampleApplicationBase.h" namespace OrthancStone { diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/Qt/SampleMainWindow.h --- a/Applications/Samples/Deprecated/Qt/SampleMainWindow.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/Qt/SampleMainWindow.h Tue Apr 14 14:57:06 2020 +0200 @@ -19,8 +19,8 @@ **/ #pragma once -#include "../../Qt/QCairoWidget.h" -#include "../../Qt/QStoneMainWindow.h" +#include "../../../Qt/QCairoWidget.h" +#include "../../../Qt/QStoneMainWindow.h" namespace Ui { diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/Qt/SampleMainWindowWithButtons.cpp --- a/Applications/Samples/Deprecated/Qt/SampleMainWindowWithButtons.cpp Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/Qt/SampleMainWindowWithButtons.cpp Tue Apr 14 14:57:06 2020 +0200 @@ -25,7 +25,7 @@ * this makes CMake unable to detect when the UI file changes. **/ #include -#include "../../Applications/Samples/SampleApplicationBase.h" +#include "../../../Applications/Samples/SampleApplicationBase.h" namespace OrthancStone { diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/Qt/SampleMainWindowWithButtons.h --- a/Applications/Samples/Deprecated/Qt/SampleMainWindowWithButtons.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/Qt/SampleMainWindowWithButtons.h Tue Apr 14 14:57:06 2020 +0200 @@ -19,8 +19,8 @@ **/ #pragma once -#include "../../Qt/QCairoWidget.h" -#include "../../Qt/QStoneMainWindow.h" +#include "../../../Qt/QCairoWidget.h" +#include "../../../Qt/QStoneMainWindow.h" namespace Ui { diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/Qt/SampleQtApplicationRunner.h --- a/Applications/Samples/Deprecated/Qt/SampleQtApplicationRunner.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/Qt/SampleQtApplicationRunner.h Tue Apr 14 14:57:06 2020 +0200 @@ -21,7 +21,7 @@ #pragma once -#include "../../Qt/QtStoneApplicationRunner.h" +#include "../../../Qt/QtStoneApplicationRunner.h" #if ORTHANC_ENABLE_QT != 1 #error this file shall be included only with the ORTHANC_ENABLE_QT set to 1 diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SampleApplicationBase.h --- a/Applications/Samples/Deprecated/SampleApplicationBase.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SampleApplicationBase.h Tue Apr 14 14:57:06 2020 +0200 @@ -21,12 +21,12 @@ #pragma once -#include "../../Applications/IStoneApplication.h" -#include "../../Framework/Deprecated/Widgets/WorldSceneWidget.h" +#include "../../../Applications/IStoneApplication.h" +#include "../../../Framework/Deprecated/Widgets/WorldSceneWidget.h" #if ORTHANC_ENABLE_WASM==1 -#include "../../Platforms/Wasm/WasmPlatformApplicationAdapter.h" -#include "../../Platforms/Wasm/Defaults.h" +#include "../../../Platforms/Wasm/WasmPlatformApplicationAdapter.h" +#include "../../../Platforms/Wasm/Defaults.h" #endif #if ORTHANC_ENABLE_QT==1 diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SampleInteractor.h --- a/Applications/Samples/Deprecated/SampleInteractor.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SampleInteractor.h Tue Apr 14 14:57:06 2020 +0200 @@ -23,9 +23,9 @@ #include "SampleApplicationBase.h" -#include "../../Framework/Widgets/LayeredSceneWidget.h" -#include "../../Framework/Widgets/IWorldSceneInteractor.h" -#include "../../Framework/Toolbox/ParallelSlicesCursor.h" +#include "../../../Framework/Widgets/LayeredSceneWidget.h" +#include "../../../Framework/Widgets/IWorldSceneInteractor.h" +#include "../../../Framework/Toolbox/ParallelSlicesCursor.h" namespace OrthancStone { diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SampleMainNative.cpp --- a/Applications/Samples/Deprecated/SampleMainNative.cpp Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SampleMainNative.cpp Tue Apr 14 14:57:06 2020 +0200 @@ -21,7 +21,7 @@ #include "SampleList.h" #if ORTHANC_ENABLE_SDL==1 -#include "../Sdl/SdlStoneApplicationRunner.h" +#include "../../Sdl/SdlStoneApplicationRunner.h" #endif #if ORTHANC_ENABLE_QT==1 #include "Qt/SampleQtApplicationRunner.h" diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SimpleViewer/MainWidgetInteractor.h --- a/Applications/Samples/Deprecated/SimpleViewer/MainWidgetInteractor.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SimpleViewer/MainWidgetInteractor.h Tue Apr 14 14:57:06 2020 +0200 @@ -20,7 +20,7 @@ #pragma once -#include "../../../Framework/Deprecated/Widgets/IWorldSceneInteractor.h" +#include "../../../../Framework/Deprecated/Widgets/IWorldSceneInteractor.h" using namespace OrthancStone; diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SimpleViewer/Qt/SimpleViewerMainWindow.cpp --- a/Applications/Samples/Deprecated/SimpleViewer/Qt/SimpleViewerMainWindow.cpp Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SimpleViewer/Qt/SimpleViewerMainWindow.cpp Tue Apr 14 14:57:06 2020 +0200 @@ -25,7 +25,7 @@ * this makes CMake unable to detect when the UI file changes. **/ #include -#include "../SimpleViewerApplication.h" +#include "../../SimpleViewerApplication.h" namespace SimpleViewer diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SimpleViewer/Qt/mainQt.cpp --- a/Applications/Samples/Deprecated/SimpleViewer/Qt/mainQt.cpp Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SimpleViewer/Qt/mainQt.cpp Tue Apr 14 14:57:06 2020 +0200 @@ -1,6 +1,6 @@ #include "Applications/Qt/QtStoneApplicationRunner.h" -#include "../SimpleViewerApplication.h" +#include "../../SimpleViewerApplication.h" #include "Framework/Messages/MessageBroker.h" diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SimpleViewer/SimpleViewerApplication.h --- a/Applications/Samples/Deprecated/SimpleViewer/SimpleViewerApplication.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SimpleViewer/SimpleViewerApplication.h Tue Apr 14 14:57:06 2020 +0200 @@ -29,12 +29,12 @@ #include "Applications/IStoneApplication.h" -#include "../../../Framework/Deprecated/Layers/CircleMeasureTracker.h" -#include "../../../Framework/Deprecated/Layers/LineMeasureTracker.h" -#include "../../../Framework/Deprecated/SmartLoader.h" -#include "../../../Framework/Deprecated/Widgets/LayoutWidget.h" -#include "../../../Framework/Deprecated/Widgets/SliceViewerWidget.h" -#include "../../../Framework/Messages/IObserver.h" +#include "../../../../Framework/Deprecated/Layers/CircleMeasureTracker.h" +#include "../../../../Framework/Deprecated/Layers/LineMeasureTracker.h" +#include "../../../../Framework/Deprecated/SmartLoader.h" +#include "../../../../Framework/Deprecated/Widgets/LayoutWidget.h" +#include "../../../../Framework/Deprecated/Widgets/SliceViewerWidget.h" +#include "../../../../Framework/Messages/IObserver.h" #if ORTHANC_ENABLE_WASM==1 #include "Platforms/Wasm/WasmPlatformApplicationAdapter.h" diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SimpleViewer/ThumbnailInteractor.h --- a/Applications/Samples/Deprecated/SimpleViewer/ThumbnailInteractor.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SimpleViewer/ThumbnailInteractor.h Tue Apr 14 14:57:06 2020 +0200 @@ -21,7 +21,7 @@ #pragma once -#include "../../../Framework/Deprecated/Widgets/IWorldSceneInteractor.h" +#include "../../../../Framework/Deprecated/Widgets/IWorldSceneInteractor.h" using namespace OrthancStone; diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h --- a/Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h Tue Apr 14 14:57:06 2020 +0200 @@ -24,7 +24,7 @@ #include #include -#include "../SimpleViewerApplication.h" +#include "../../SimpleViewerApplication.h" namespace SimpleViewer { diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SimpleViewer/Wasm/mainWasm.cpp --- a/Applications/Samples/Deprecated/SimpleViewer/Wasm/mainWasm.cpp Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SimpleViewer/Wasm/mainWasm.cpp Tue Apr 14 14:57:06 2020 +0200 @@ -23,7 +23,7 @@ #include -#include "../SimpleViewerApplication.h" +#include "../../SimpleViewerApplication.h" #include "SimpleViewerWasmApplicationAdapter.h" diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SimpleViewerApplicationSingleFile.h --- a/Applications/Samples/Deprecated/SimpleViewerApplicationSingleFile.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SimpleViewerApplicationSingleFile.h Tue Apr 14 14:57:06 2020 +0200 @@ -23,16 +23,16 @@ #include "SampleApplicationBase.h" -#include "../../Framework/Deprecated/Layers/CircleMeasureTracker.h" -#include "../../Framework/Deprecated/Layers/LineMeasureTracker.h" -#include "../../Framework/Deprecated/SmartLoader.h" -#include "../../Framework/Deprecated/Widgets/LayoutWidget.h" -#include "../../Framework/Deprecated/Widgets/SliceViewerWidget.h" -#include "../../Framework/Messages/IObserver.h" +#include "../../../Framework/Deprecated/Layers/CircleMeasureTracker.h" +#include "../../../Framework/Deprecated/Layers/LineMeasureTracker.h" +#include "../../../Framework/Deprecated/SmartLoader.h" +#include "../../../Framework/Deprecated/Widgets/LayoutWidget.h" +#include "../../../Framework/Deprecated/Widgets/SliceViewerWidget.h" +#include "../../../Framework/Messages/IObserver.h" #if ORTHANC_ENABLE_WASM==1 -#include "../../Platforms/Wasm/WasmPlatformApplicationAdapter.h" -#include "../../Platforms/Wasm/Defaults.h" +#include "../../../Platforms/Wasm/WasmPlatformApplicationAdapter.h" +#include "../../../Platforms/Wasm/Defaults.h" #endif #include diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SingleFrameApplication.h --- a/Applications/Samples/Deprecated/SingleFrameApplication.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SingleFrameApplication.h Tue Apr 14 14:57:06 2020 +0200 @@ -23,8 +23,8 @@ #include "SampleApplicationBase.h" -#include "../../Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.h" -#include "../../Framework/Deprecated/Widgets/SliceViewerWidget.h" +#include "../../../Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.h" +#include "../../../Framework/Deprecated/Widgets/SliceViewerWidget.h" #include #include diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SingleFrameEditorApplication.h --- a/Applications/Samples/Deprecated/SingleFrameEditorApplication.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SingleFrameEditorApplication.h Tue Apr 14 14:57:06 2020 +0200 @@ -23,19 +23,19 @@ #include "SampleApplicationBase.h" -#include "../../Framework/Radiography/RadiographyLayerCropTracker.h" -#include "../../Framework/Radiography/RadiographyLayerMaskTracker.h" -#include "../../Framework/Radiography/RadiographyLayerMoveTracker.h" -#include "../../Framework/Radiography/RadiographyLayerResizeTracker.h" -#include "../../Framework/Radiography/RadiographyLayerRotateTracker.h" -#include "../../Framework/Radiography/RadiographyMaskLayer.h" -#include "../../Framework/Radiography/RadiographyScene.h" -#include "../../Framework/Radiography/RadiographySceneCommand.h" -#include "../../Framework/Radiography/RadiographySceneReader.h" -#include "../../Framework/Radiography/RadiographySceneWriter.h" -#include "../../Framework/Radiography/RadiographyWidget.h" -#include "../../Framework/Radiography/RadiographyWindowingTracker.h" -#include "../../Framework/Toolbox/TextRenderer.h" +#include "../../../Framework/Radiography/RadiographyLayerCropTracker.h" +#include "../../../Framework/Radiography/RadiographyLayerMaskTracker.h" +#include "../../../Framework/Radiography/RadiographyLayerMoveTracker.h" +#include "../../../Framework/Radiography/RadiographyLayerResizeTracker.h" +#include "../../../Framework/Radiography/RadiographyLayerRotateTracker.h" +#include "../../../Framework/Radiography/RadiographyMaskLayer.h" +#include "../../../Framework/Radiography/RadiographyScene.h" +#include "../../../Framework/Radiography/RadiographySceneCommand.h" +#include "../../../Framework/Radiography/RadiographySceneReader.h" +#include "../../../Framework/Radiography/RadiographySceneWriter.h" +#include "../../../Framework/Radiography/RadiographyWidget.h" +#include "../../../Framework/Radiography/RadiographyWindowingTracker.h" +#include "../../../Framework/Toolbox/TextRenderer.h" #include #include diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SingleVolumeApplication.h --- a/Applications/Samples/Deprecated/SingleVolumeApplication.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SingleVolumeApplication.h Tue Apr 14 14:57:06 2020 +0200 @@ -22,16 +22,16 @@ #pragma once #include "SampleApplicationBase.h" -#include "../../Framework/dev.h" -#include "../../Framework/Layers/LineMeasureTracker.h" -#include "../../Framework/Layers/CircleMeasureTracker.h" +#include "../../../Framework/dev.h" +#include "../../../Framework/Layers/LineMeasureTracker.h" +#include "../../../Framework/Layers/CircleMeasureTracker.h" #include #include #include // TODO REMOVE -#include "../../Framework/Layers/DicomStructureSetSlicer.h" // TODO REMOVE -#include "../../Framework/Toolbox/MessagingToolbox.h" // TODO REMOVE +#include "../../../Framework/Layers/DicomStructureSetSlicer.h" // TODO REMOVE +#include "../../../Framework/Toolbox/MessagingToolbox.h" // TODO REMOVE namespace OrthancStone { diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/SynchronizedSeriesApplication.h --- a/Applications/Samples/Deprecated/SynchronizedSeriesApplication.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/SynchronizedSeriesApplication.h Tue Apr 14 14:57:06 2020 +0200 @@ -23,10 +23,10 @@ #include "SampleInteractor.h" -#include "../../Framework/Toolbox/OrthancSeriesLoader.h" -#include "../../Framework/Layers/SeriesFrameRendererFactory.h" -#include "../../Framework/Layers/ReferenceLineFactory.h" -#include "../../Framework/Widgets/LayoutWidget.h" +#include "../../../Framework/Toolbox/OrthancSeriesLoader.h" +#include "../../../Framework/Layers/SeriesFrameRendererFactory.h" +#include "../../../Framework/Layers/ReferenceLineFactory.h" +#include "../../../Framework/Widgets/LayoutWidget.h" #include diff -r b1e6bef86955 -r c53a4667f895 Applications/Samples/Deprecated/TestPatternApplication.h --- a/Applications/Samples/Deprecated/TestPatternApplication.h Fri Apr 10 16:12:14 2020 +0200 +++ b/Applications/Samples/Deprecated/TestPatternApplication.h Tue Apr 14 14:57:06 2020 +0200 @@ -23,9 +23,9 @@ #include "SampleApplicationBase.h" -#include "../../Framework/Widgets/TestCairoWidget.h" -#include "../../Framework/Widgets/TestWorldSceneWidget.h" -#include "../../Framework/Widgets/LayoutWidget.h" +#include "../../../Framework/Widgets/TestCairoWidget.h" +#include "../../../Framework/Widgets/TestWorldSceneWidget.h" +#include "../../../Framework/Widgets/LayoutWidget.h" namespace OrthancStone { diff -r b1e6bef86955 -r c53a4667f895 README.md --- a/README.md Fri Apr 10 16:12:14 2020 +0200 +++ b/README.md Tue Apr 14 14:57:06 2020 +0200 @@ -91,133 +91,11 @@ http://book.orthanc-server.com/developers/stone.html Stone of Orthanc comes with several sample applications in the -`Samples` folder. These samples can be compiled into Web Assembly or -into native SDL applications. - -The following assumes that the source code to be downloaded in -`~/orthanc-stone` and Orthanc source code to be checked out in -`~/orthanc`. - -Building the WASM samples -------------------------------------- -``` -cd ~/orthanc-stone/Applications/Samples -./build-wasm.sh -``` - -Serving the WASM samples ------------------------------------- -``` -# launch an Orthanc listening on 8042 port: -Orthanc - -# launch an nginx that will serve the WASM static files and reverse -# proxy -sudo nginx -p $(pwd) -c nginx.local.conf -``` - -You can now open the samples in http://localhost:9977 - -Building the SDL native samples (SimpleViewer only) ---------------------------------------------------- - -The following also assumes that you have checked out the Orthanc -source code in an `orthanc` folder next to the Stone of Orthanc -repository, please enter the following: - -**Simple make generator with dynamic build** - -``` -# Please set $currentDir to the current folder -mkdir -p ~/builds/orthanc-stone-build -cd ~/builds/orthanc-stone-build -cmake -DORTHANC_FRAMEWORK_SOURCE=path \ - -DORTHANC_FRAMEWORK_ROOT=$currentDir/../../../orthanc \ - -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON \ - ~/orthanc-stone/Applications/Samples/ -``` - -**Ninja generator with static SDL build (pwsh script)** - -``` -# Please yourself one level above the orthanc-stone and orthanc folders -if( -not (test-path stone_build_sdl)) { mkdir stone_build_sdl } -cd stone_build_sdl -cmake -G Ninja -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Applications/Samples/ -``` - -**Ninja generator with static SDL build (bash/zsh script)** - -``` -# Please yourself one level above the orthanc-stone and orthanc folders -if( -not (test-path stone_build_sdl)) { mkdir stone_build_sdl } -cd stone_build_sdl -cmake -G Ninja -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="`pwd`/../orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Applications/Samples/ -``` +`Samples` folder. -**Visual Studio 2017 generator with static SDL build (pwsh script)** - -``` -# The following will use Visual Studio 2017 to build the SDL samples -# in debug mode (with multiple compilers in parallel). NOTE: place -# yourself one level above the `orthanc-stone` and `orthanc` folders - -if( -not (test-path stone_build_sdl)) { mkdir stone_build_sdl } -cd stone_build_sdl -cmake -G "Visual Studio 15 2017 Win64" -DMSVC_MULTIPLE_PROCESSES=ON -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Applications/Samples/ -cmake --build . --config Debug -``` - -If you are working on Windows, add the correct generator option to -cmake to, for instance, generate msbuild files for Visual Studio. - -Then, under Linux: -``` -cmake --build . --target OrthancStoneSimpleViewer -- -j 5 -``` - -Note: replace `$($pwd)` with the current directory when not using Powershell - -Building the Qt native samples (SimpleViewer only) under Windows: ------------------------------------------------------------------- - -**Visual Studio 2017 generator with static Qt build (pwsh script)** - -For instance, if Qt is installed in `C:\Qt\5.12.0\msvc2017_64` +Please see the Samples/README.md file for information on the samples building +and running procedure. -``` -# The following will use Visual Studio 2017 to build the SDL samples -# in debug mode (with multiple compilers in parallel). NOTE: place -# yourself one level above the `orthanc-stone` and `orthanc` folders - -if( -not (test-path stone_build_qt)) { mkdir stone_build_qt } -cd stone_build_qt -cmake -G "Visual Studio 15 2017 Win64" -DMSVC_MULTIPLE_PROCESSES=ON -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DCMAKE_PREFIX_PATH=C:\Qt\5.12.0\msvc2017_64 -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_QT=ON ../orthanc-stone/Applications/Samples/ -cmake --build . --config Debug -``` - -Note: replace `$($pwd)` with the current directory when not using Powershell - - - - - - -Building the SDL native samples (SimpleViewer only) under Windows: ------------------------------------------------------------------- -`cmake -DSTATIC_BUILD=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON -G "Visual Studio 15 2017 Win64" ../orthanc-stone/Applications/Samples/` - -Note: replace `$($pwd)` with the current directory when not using Powershell - -Executing the native samples: --------------------------------- -``` -# launch an Orthanc listening on 8042 port: -Orthanc - -# launch the sample -./OrthancStoneSimpleViewer --studyId=XX -``` Licensing --------- @@ -245,59 +123,3 @@ url="https://doi.org/10.1007/s10278-018-0082-y" } -Build the Application Samples ------------------------------ - -**Visual Studio 2008 (v90) ** - -``` -cmake -G "Visual Studio 9 2008" -DUSE_LEGACY_JSONCPP=ON -DENABLE_OPENGL=ON -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Applications/Samples -``` - -**Visual Studio 2019 (v142) ** - -``` -cmake -G "Visual Studio 16 2019" -A x64 -DMSVC_MULTIPLE_PROCESSES=ON -DENABLE_OPENGL=ON -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Applications/Samples -``` - -**Visual Studio 2017 (v140) ** - -``` -cmake -G "Visual Studio 15 2017 Win64" -DMSVC_MULTIPLE_PROCESSES=ON -DENABLE_OPENGL=ON -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Applications/Samples -``` - - -Build the core Samples ---------------------------- -How to build the newest (2019-04-29) SDL samples under Windows, *inside* a -folder that is sibling to the orthanc-stone folder: - -**Visual Studio 2019 (v142) ** - -``` -cmake -G "Visual Studio 16 2019" -A x64 -DMSVC_MULTIPLE_PROCESSES=ON -DENABLE_OPENGL=ON -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Samples/Sdl -``` - -**Visual Studio 2017 (v140) ** - -``` -cmake -G "Visual Studio 15 2017 Win64" -DMSVC_MULTIPLE_PROCESSES=ON -DENABLE_OPENGL=ON -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Samples/Sdl -``` - -**Visual Studio 2008 (v90) ** - -``` -cmake -G "Visual Studio 9 2008" -DUSE_LEGACY_JSONCPP=ON -DENABLE_OPENGL=ON -DSTATIC_BUILD=ON -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="$($pwd)\..\orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Samples/Sdl -``` - -And under Ubuntu (note the /mnt/c/osi/dev/orthanc folder): -``` -cmake -G "Ninja" -DENABLE_OPENGL=ON -DSTATIC_BUILD=OFF -DOPENSSL_NO_CAPIENG=ON -DORTHANC_FRAMEWORK_SOURCE=path -DORTHANC_FRAMEWORK_ROOT="/mnt/c/osi/dev/orthanc" -DALLOW_DOWNLOADS=ON -DENABLE_SDL=ON ../orthanc-stone/Samples/Sdl -``` - -TODO trackers: -- CANCELLED (using outlined text now) text overlay 50% --> ColorTextureLayer 50% -- DONE angle tracker: draw arcs -- Handles on arc -- Select measure tool with hit test --> Delete command -