comparison Applications/Samples/SimpleViewer/MainWidgetInteractor.cpp @ 527:b1377625e4ba bgo-commands-codegen

Removed ICommand and friends + fixed warnings + added missing header files in solution (in CMakeLists.txt file)
author Benjamin Golinvaux <bgo@osimis.io>
date Sun, 17 Mar 2019 20:14:20 +0100
parents 3b4df9925db6
children 4f2416d519b4
comparison
equal deleted inserted replaced
522:700aa66f2f29 527:b1377625e4ba
35 IStatusBar* statusBar, 35 IStatusBar* statusBar,
36 const std::vector<Touch>& displayTouches) 36 const std::vector<Touch>& displayTouches)
37 { 37 {
38 if (button == MouseButton_Left) 38 if (button == MouseButton_Left)
39 { 39 {
40 if (application_.GetCurrentTool() == SimpleViewerApplication::Tools_LineMeasure) 40 if (application_.GetCurrentTool() == Tool_LineMeasure)
41 { 41 {
42 return new LineMeasureTracker(statusBar, dynamic_cast<SliceViewerWidget&>(widget).GetSlice(), 42 return new LineMeasureTracker(statusBar, dynamic_cast<SliceViewerWidget&>(widget).GetSlice(),
43 x, y, 255, 0, 0, application_.GetFont()); 43 x, y, 255, 0, 0, application_.GetFont());
44 } 44 }
45 else if (application_.GetCurrentTool() == SimpleViewerApplication::Tools_CircleMeasure) 45 else if (application_.GetCurrentTool() == Tool_CircleMeasure)
46 { 46 {
47 return new CircleMeasureTracker(statusBar, dynamic_cast<SliceViewerWidget&>(widget).GetSlice(), 47 return new CircleMeasureTracker(statusBar, dynamic_cast<SliceViewerWidget&>(widget).GetSlice(),
48 x, y, 255, 0, 0, application_.GetFont()); 48 x, y, 255, 0, 0, application_.GetFont());
49 } 49 }
50 else if (application_.GetCurrentTool() == SimpleViewerApplication::Tools_Crop) 50 else if (application_.GetCurrentTool() == Tool_Crop)
51 { 51 {
52 // TODO 52 // TODO
53 } 53 }
54 else if (application_.GetCurrentTool() == SimpleViewerApplication::Tools_Windowing) 54 else if (application_.GetCurrentTool() == Tool_Windowing)
55 { 55 {
56 // TODO 56 // TODO
57 } 57 }
58 else if (application_.GetCurrentTool() == SimpleViewerApplication::Tools_Zoom) 58 else if (application_.GetCurrentTool() == Tool_Zoom)
59 { 59 {
60 // TODO 60 // TODO
61 } 61 }
62 else if (application_.GetCurrentTool() == SimpleViewerApplication::Tools_Pan) 62 else if (application_.GetCurrentTool() == Tool_Pan)
63 { 63 {
64 // TODO 64 // TODO
65 } 65 }
66
67 } 66 }
68 return NULL; 67 return NULL;
69 } 68 }
70 69
71 void MainWidgetInteractor::MouseOver(CairoContext& context, 70 void MainWidgetInteractor::MouseOver(CairoContext& context,