comparison Applications/Samples/SimpleViewerApplicationSingleFile.h @ 860:238693c3bc51 am-dev

merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents be9c1530d40a
children b537002f83a9 2d8ab34c8c91
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "SampleApplicationBase.h" 24 #include "SampleApplicationBase.h"
25 25
26 #include "../../Framework/Layers/CircleMeasureTracker.h" 26 #include "../../Framework/Deprecated/Layers/CircleMeasureTracker.h"
27 #include "../../Framework/Layers/LineMeasureTracker.h" 27 #include "../../Framework/Deprecated/Layers/LineMeasureTracker.h"
28 #include "../../Framework/Widgets/SliceViewerWidget.h" 28 #include "../../Framework/Deprecated/SmartLoader.h"
29 #include "../../Framework/Widgets/LayoutWidget.h" 29 #include "../../Framework/Deprecated/Widgets/LayoutWidget.h"
30 #include "../../Framework/Deprecated/Widgets/SliceViewerWidget.h"
30 #include "../../Framework/Messages/IObserver.h" 31 #include "../../Framework/Messages/IObserver.h"
31 #include "../../Framework/SmartLoader.h"
32 32
33 #if ORTHANC_ENABLE_WASM==1 33 #if ORTHANC_ENABLE_WASM==1
34 #include "../../Platforms/Wasm/WasmPlatformApplicationAdapter.h" 34 #include "../../Platforms/Wasm/WasmPlatformApplicationAdapter.h"
35 #include "../../Platforms/Wasm/Defaults.h" 35 #include "../../Platforms/Wasm/Defaults.h"
36 #endif 36 #endif
310 mainLayout_->AddWidget(thumbnailsLayout_); 310 mainLayout_->AddWidget(thumbnailsLayout_);
311 mainLayout_->AddWidget(mainWidget_); 311 mainLayout_->AddWidget(mainWidget_);
312 312
313 // sources 313 // sources
314 smartLoader_.reset(new Deprecated::SmartLoader(GetBroker(), context->GetOrthancApiClient())); 314 smartLoader_.reset(new Deprecated::SmartLoader(GetBroker(), context->GetOrthancApiClient()));
315 smartLoader_->SetImageQuality(SliceImageQuality_FullPam); 315 smartLoader_->SetImageQuality(Deprecated::SliceImageQuality_FullPam);
316 316
317 mainLayout_->SetTransmitMouseOver(true); 317 mainLayout_->SetTransmitMouseOver(true);
318 mainWidgetInteractor_.reset(new MainWidgetInteractor(*this)); 318 mainWidgetInteractor_.reset(new MainWidgetInteractor(*this));
319 mainWidget_->SetInteractor(*mainWidgetInteractor_); 319 mainWidget_->SetInteractor(*mainWidgetInteractor_);
320 thumbnailInteractor_.reset(new ThumbnailInteractor(*this)); 320 thumbnailInteractor_.reset(new ThumbnailInteractor(*this));