comparison Applications/Samples/SimpleViewer/SimpleViewerApplication.h @ 388:20f149669c1f

renamed LayerWidget as SliceViewerWidget
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 09 Nov 2018 17:26:39 +0100
parents a8b5cf760473
children ed7146fa2c98
comparison
equal deleted inserted replaced
387:a8b5cf760473 388:20f149669c1f
24 #include "Applications/IStoneApplication.h" 24 #include "Applications/IStoneApplication.h"
25 25
26 #include "Framework/Layers/OrthancFrameLayerSource.h" 26 #include "Framework/Layers/OrthancFrameLayerSource.h"
27 #include "Framework/Layers/CircleMeasureTracker.h" 27 #include "Framework/Layers/CircleMeasureTracker.h"
28 #include "Framework/Layers/LineMeasureTracker.h" 28 #include "Framework/Layers/LineMeasureTracker.h"
29 #include "Framework/Widgets/LayerWidget.h" 29 #include "Framework/Widgets/SliceViewerWidget.h"
30 #include "Framework/Widgets/LayoutWidget.h" 30 #include "Framework/Widgets/LayoutWidget.h"
31 #include "Framework/Messages/IObserver.h" 31 #include "Framework/Messages/IObserver.h"
32 #include "Framework/SmartLoader.h" 32 #include "Framework/SmartLoader.h"
33 33
34 #if ORTHANC_ENABLE_WASM==1 34 #if ORTHANC_ENABLE_WASM==1
86 Actions_Invert, 86 Actions_Invert,
87 Actions_UndoCrop 87 Actions_UndoCrop
88 }; 88 };
89 89
90 private: 90 private:
91 Tools currentTool_; 91 Tools currentTool_;
92 std::auto_ptr<MainWidgetInteractor> mainWidgetInteractor_; 92 std::auto_ptr<MainWidgetInteractor> mainWidgetInteractor_;
93 std::auto_ptr<ThumbnailInteractor> thumbnailInteractor_; 93 std::auto_ptr<ThumbnailInteractor> thumbnailInteractor_;
94 LayoutWidget* mainLayout_; 94 LayoutWidget* mainLayout_;
95 LayoutWidget* thumbnailsLayout_; 95 LayoutWidget* thumbnailsLayout_;
96 LayerWidget* mainWidget_; 96 SliceViewerWidget* mainWidget_;
97 std::vector<LayerWidget*> thumbnails_; 97 std::vector<SliceViewerWidget*> thumbnails_;
98 std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_; 98 std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_;
99 std::map<std::string, Json::Value> seriesTags_; 99 std::map<std::string, Json::Value> seriesTags_;
100 BaseCommandBuilder commandBuilder_; 100 BaseCommandBuilder commandBuilder_;
101 101
102 unsigned int currentInstanceIndex_; 102 unsigned int currentInstanceIndex_;
103 OrthancStone::WidgetViewport* wasmViewport1_; 103 OrthancStone::WidgetViewport* wasmViewport1_;
104 OrthancStone::WidgetViewport* wasmViewport2_; 104 OrthancStone::WidgetViewport* wasmViewport2_;
105 105
106 IStatusBar* statusBar_; 106 IStatusBar* statusBar_;
107 std::auto_ptr<SmartLoader> smartLoader_; 107 std::auto_ptr<SmartLoader> smartLoader_;
108 std::auto_ptr<OrthancApiClient> orthancApiClient_; 108 std::auto_ptr<OrthancApiClient> orthancApiClient_;
109 109
110 Orthanc::Font font_; 110 Orthanc::Font font_;
111 111
112 public: 112 public:
113 SimpleViewerApplication(MessageBroker& broker) : 113 SimpleViewerApplication(MessageBroker& broker) :
114 IObserver(broker), 114 IObserver(broker),
115 IObservable(broker), 115 IObservable(broker),
138 138
139 void LoadThumbnailForSeries(const std::string& seriesId, const std::string& instanceId); 139 void LoadThumbnailForSeries(const std::string& seriesId, const std::string& instanceId);
140 140
141 void SelectStudy(const std::string& studyId); 141 void SelectStudy(const std::string& studyId);
142 142
143 void OnWidgetGeometryChanged(const LayerWidget::GeometryChangedMessage& message); 143 void OnWidgetGeometryChanged(const SliceViewerWidget::GeometryChangedMessage& message);
144 144
145 void SelectSeriesInMainViewport(const std::string& seriesId); 145 void SelectSeriesInMainViewport(const std::string& seriesId);
146 146
147 void SelectTool(Tools tool); 147 void SelectTool(Tools tool);
148 148