Mercurial > hg > orthanc-stone
comparison Samples/Sdl/TrackerSampleApp.cpp @ 722:28b9e3a54200
Undo mechanism implemented (not connected to UI yet). Undo stack and measuring
tools are now handled by the ViewportController. Multi-touch does not crash
trackers anymore.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Tue, 21 May 2019 10:27:54 +0200 |
parents | af0aa0c149fa |
children | 4d69256d2a46 284f37dc1c66 |
comparison
equal
deleted
inserted
replaced
721:af0aa0c149fa | 722:28b9e3a54200 |
---|---|
320 controller_, e)); | 320 controller_, e)); |
321 case GuiTool_Zoom: | 321 case GuiTool_Zoom: |
322 return FlexiblePointerTrackerPtr(new ZoomSceneTracker( | 322 return FlexiblePointerTrackerPtr(new ZoomSceneTracker( |
323 controller_, e, compositor_->GetCanvasHeight())); | 323 controller_, e, compositor_->GetCanvasHeight())); |
324 //case GuiTool_AngleMeasure: | 324 //case GuiTool_AngleMeasure: |
325 // return new AngleMeasureTracker(GetScene(), measureTools_, undoStack_, e); | 325 // return new AngleMeasureTracker(GetScene(), e); |
326 //case GuiTool_CircleMeasure: | 326 //case GuiTool_CircleMeasure: |
327 // return new CircleMeasureTracker(GetScene(), measureTools_, undoStack_, e); | 327 // return new CircleMeasureTracker(GetScene(), e); |
328 //case GuiTool_EllipseMeasure: | 328 //case GuiTool_EllipseMeasure: |
329 // return new EllipseMeasureTracker(GetScene(), measureTools_, undoStack_, e); | 329 // return new EllipseMeasureTracker(GetScene(), e); |
330 case GuiTool_LineMeasure: | 330 case GuiTool_LineMeasure: |
331 return FlexiblePointerTrackerPtr(new CreateLineMeasureTracker( | 331 return FlexiblePointerTrackerPtr(new CreateLineMeasureTracker( |
332 IObserver::GetBroker(), controller_, undoStack_, measureTools_, e)); | 332 IObserver::GetBroker(), controller_, e)); |
333 case GuiTool_AngleMeasure: | 333 case GuiTool_AngleMeasure: |
334 return FlexiblePointerTrackerPtr(new CreateAngleMeasureTracker( | 334 return FlexiblePointerTrackerPtr(new CreateAngleMeasureTracker( |
335 IObserver::GetBroker(), controller_, undoStack_, measureTools_, e)); | 335 IObserver::GetBroker(), controller_, e)); |
336 case GuiTool_CircleMeasure: | 336 case GuiTool_CircleMeasure: |
337 LOG(ERROR) << "Not implemented yet!"; | 337 LOG(ERROR) << "Not implemented yet!"; |
338 return FlexiblePointerTrackerPtr(); | 338 return FlexiblePointerTrackerPtr(); |
339 case GuiTool_EllipseMeasure: | 339 case GuiTool_EllipseMeasure: |
340 LOG(ERROR) << "Not implemented yet!"; | 340 LOG(ERROR) << "Not implemented yet!"; |