Mercurial > hg > orthanc-stone

comparison Applications/Samples/SingleFrameEditorApplication.h @ 480:2f6ecb5037ea am-touch-events

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added mouse tracker for Layer Mask. Everything seems ok
author am@osimis.io
date Thu, 14 Feb 2019 10:18:02 +0100
parents a95090305dd4
children e4febcef669e
comparison
equal deleted inserted replaced
479:e3d316ba34ba 480:2f6ecb5037ea
22 #pragma once 22 #pragma once
23 23
24 #include "SampleApplicationBase.h" 24 #include "SampleApplicationBase.h"
25 25
26 #include "../../Framework/Radiography/RadiographyLayerCropTracker.h" 26 #include "../../Framework/Radiography/RadiographyLayerCropTracker.h"
27 #include "../../Framework/Radiography/RadiographyLayerMaskTracker.h"
27 #include "../../Framework/Radiography/RadiographyLayerMoveTracker.h" 28 #include "../../Framework/Radiography/RadiographyLayerMoveTracker.h"
28 #include "../../Framework/Radiography/RadiographyLayerResizeTracker.h" 29 #include "../../Framework/Radiography/RadiographyLayerResizeTracker.h"
29 #include "../../Framework/Radiography/RadiographyLayerRotateTracker.h" 30 #include "../../Framework/Radiography/RadiographyLayerRotateTracker.h"
30 #include "../../Framework/Radiography/RadiographyScene.h" 31 #include "../../Framework/Radiography/RadiographyScene.h"
31 #include "../../Framework/Radiography/RadiographySceneCommand.h" 32 #include "../../Framework/Radiography/RadiographySceneCommand.h"
132 widget.Select(layer); 133 widget.Select(layer);
133 } 134 }
134 135
135 return NULL; 136 return NULL;
136 } 137 }
137 else if (tool_ == Tool_Mask)
138 {
139 // maskLayer_
140 // case Tool_Mask:
141 // return new RadiographyLayerMaskTracker
142 // (undoRedoStack_, widget.GetScene(), view, selected, x, y, corner);
143 return NULL;
144 }
145 else if (tool_ == Tool_Crop || 138 else if (tool_ == Tool_Crop ||
146 tool_ == Tool_Resize) 139 tool_ == Tool_Resize ||
140 tool_ == Tool_Mask)
147 { 141 {
148 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected); 142 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected);
149 143
150 ControlPoint controlPoint; 144 ControlPoint controlPoint;
151 if (accessor.GetLayer().LookupControlPoint(controlPoint, x, y, view.GetZoom(), GetHandleSize())) 145 if (accessor.GetLayer().LookupControlPoint(controlPoint, x, y, view.GetZoom(), GetHandleSize()))
154 { 148 {
155 case Tool_Crop: 149 case Tool_Crop:
156 return new RadiographyLayerCropTracker 150 return new RadiographyLayerCropTracker
157 (undoRedoStack_, widget.GetScene(), view, selected, controlPoint); 151 (undoRedoStack_, widget.GetScene(), view, selected, controlPoint);
158 152
153 case Tool_Mask:
154 return new RadiographyLayerMaskTracker
155 (undoRedoStack_, widget.GetScene(), view, selected, controlPoint);
159 156
160 case Tool_Resize: 157 case Tool_Resize:
161 return new RadiographyLayerResizeTracker 158 return new RadiographyLayerResizeTracker
162 (undoRedoStack_, widget.GetScene(), selected, controlPoint, 159 (undoRedoStack_, widget.GetScene(), selected, controlPoint,
163 (modifiers & KeyboardModifiers_Shift)); 160 (modifiers & KeyboardModifiers_Shift));