Mercurial > hg > orthanc-stone

comparison Applications/Samples/SimpleViewerApplicationSingleFile.h @ 334:c34784e5f299 am-2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compatibility fixes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 18 Oct 2018 09:02:24 +0200
parents 7a364e44fbb4
children c7fdc8bac581
comparison
equal deleted inserted replaced
333:08683537a227 334:c34784e5f299
210 enum Tools { 210 enum Tools {
211 Tools_LineMeasure, 211 Tools_LineMeasure,
212 Tools_CircleMeasure 212 Tools_CircleMeasure
213 }; 213 };
214 214
215 Tools currentTool_; 215 Tools currentTool_;
216 std::unique_ptr<MainWidgetInteractor> mainWidgetInteractor_; 216 std::auto_ptr<MainWidgetInteractor> mainWidgetInteractor_;
217 std::unique_ptr<ThumbnailInteractor> thumbnailInteractor_; 217 std::auto_ptr<ThumbnailInteractor> thumbnailInteractor_;
218 LayoutWidget* mainLayout_; 218 LayoutWidget* mainLayout_;
219 LayoutWidget* thumbnailsLayout_; 219 LayoutWidget* thumbnailsLayout_;
220 std::vector<LayerWidget*> thumbnails_; 220 std::vector<LayerWidget*> thumbnails_;
221 std::map<std::string, std::vector<std::string>> instancesIdsPerSeriesId_; 221
222 std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_;
222 std::map<std::string, Json::Value> seriesTags_; 223 std::map<std::string, Json::Value> seriesTags_;
223 224
224 unsigned int currentInstanceIndex_; 225 unsigned int currentInstanceIndex_;
225 OrthancStone::WidgetViewport* wasmViewport1_; 226 OrthancStone::WidgetViewport* wasmViewport1_;
226 OrthancStone::WidgetViewport* wasmViewport2_; 227 OrthancStone::WidgetViewport* wasmViewport2_;
227 228
228 IStatusBar* statusBar_; 229 IStatusBar* statusBar_;
229 std::unique_ptr<SmartLoader> smartLoader_; 230 std::auto_ptr<SmartLoader> smartLoader_;
230 std::unique_ptr<OrthancApiClient> orthancApiClient_; 231 std::auto_ptr<OrthancApiClient> orthancApiClient_;
231 232
232 public: 233 public:
233 SimpleViewerApplication(MessageBroker& broker) : 234 SimpleViewerApplication(MessageBroker& broker) :
234 IObserver(broker), 235 IObserver(broker),
235 currentTool_(Tools_LineMeasure), 236 currentTool_(Tools_LineMeasure),