校对模式下右键删除选框
Browse files- src/WpfEditor/MainWindow.xaml.cs +56 -0
- src/WpfEditor/ViewModel.cs +19 -0
src/WpfEditor/MainWindow.xaml.cs
CHANGED
|
@@ -280,11 +280,67 @@ namespace WpfEditor
|
|
| 280 |
}
|
| 281 |
}
|
| 282 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 283 |
private void Grid_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
|
| 284 |
{
|
| 285 |
if (ViewModel.Image != null)
|
| 286 |
{
|
| 287 |
rectangleStartPoint = e.GetPosition(image);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 288 |
isDrawingRectangle = true;
|
| 289 |
ViewModel.IsDrawingRectangle = true;
|
| 290 |
ViewModel.RectangleVisible = true;
|
|
|
|
| 280 |
}
|
| 281 |
}
|
| 282 |
|
| 283 |
+
// 修改检测方法,返回被点击的具体选框
|
| 284 |
+
private RectangleItem GetClickedRectangle(Point point)
|
| 285 |
+
{
|
| 286 |
+
// 只在校对模式下进行检测
|
| 287 |
+
if (_mode != EditorMode.ReviseEdit)
|
| 288 |
+
return null;
|
| 289 |
+
|
| 290 |
+
// 检查点击位置是否在任何现有的绿色选框内部
|
| 291 |
+
foreach (var rectangle in ViewModel.Rectangles)
|
| 292 |
+
{
|
| 293 |
+
if (rectangle.IsVisible &&
|
| 294 |
+
point.X >= rectangle.Left &&
|
| 295 |
+
point.X <= rectangle.Left + rectangle.Width &&
|
| 296 |
+
point.Y >= rectangle.Top &&
|
| 297 |
+
point.Y <= rectangle.Top + rectangle.Height)
|
| 298 |
+
{
|
| 299 |
+
return rectangle;
|
| 300 |
+
}
|
| 301 |
+
}
|
| 302 |
+
return null;
|
| 303 |
+
}
|
| 304 |
+
|
| 305 |
+
// 显示删除选框的右键菜单
|
| 306 |
+
private void ShowDeleteContextMenu(RectangleItem rectangle, Point position)
|
| 307 |
+
{
|
| 308 |
+
var contextMenu = new ContextMenu();
|
| 309 |
+
var deleteMenuItem = new MenuItem()
|
| 310 |
+
{
|
| 311 |
+
Header = "删除选框",
|
| 312 |
+
Tag = rectangle
|
| 313 |
+
};
|
| 314 |
+
deleteMenuItem.Click += (s, e) =>
|
| 315 |
+
{
|
| 316 |
+
var rect = (RectangleItem)((MenuItem)s).Tag;
|
| 317 |
+
ViewModel.RemoveRectangle(rect);
|
| 318 |
+
};
|
| 319 |
+
|
| 320 |
+
contextMenu.Items.Add(deleteMenuItem);
|
| 321 |
+
contextMenu.IsOpen = true;
|
| 322 |
+
contextMenu.PlacementTarget = image;
|
| 323 |
+
contextMenu.Placement = PlacementMode.MousePoint;
|
| 324 |
+
}
|
| 325 |
+
|
| 326 |
private void Grid_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
|
| 327 |
{
|
| 328 |
if (ViewModel.Image != null)
|
| 329 |
{
|
| 330 |
rectangleStartPoint = e.GetPosition(image);
|
| 331 |
+
|
| 332 |
+
// 在校对模式下,检查是否点击在现有绿色选框内部
|
| 333 |
+
if (_mode == EditorMode.ReviseEdit)
|
| 334 |
+
{
|
| 335 |
+
var clickedRectangle = GetClickedRectangle(rectangleStartPoint);
|
| 336 |
+
if (clickedRectangle != null)
|
| 337 |
+
{
|
| 338 |
+
// 如果点击在现有绿色选框内部,显示删除菜单
|
| 339 |
+
ShowDeleteContextMenu(clickedRectangle, rectangleStartPoint);
|
| 340 |
+
return;
|
| 341 |
+
}
|
| 342 |
+
}
|
| 343 |
+
|
| 344 |
isDrawingRectangle = true;
|
| 345 |
ViewModel.IsDrawingRectangle = true;
|
| 346 |
ViewModel.RectangleVisible = true;
|
src/WpfEditor/ViewModel.cs
CHANGED
|
@@ -168,5 +168,24 @@ namespace WpfEditor
|
|
| 168 |
// 当加载新图片时调用,重置尺寸记录
|
| 169 |
// 这个方法需要在MainWindow中调用
|
| 170 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 171 |
}
|
| 172 |
}
|
|
|
|
| 168 |
// 当加载新图片时调用,重置尺寸记录
|
| 169 |
// 这个方法需要在MainWindow中调用
|
| 170 |
}
|
| 171 |
+
|
| 172 |
+
// 删除指定的矩形框
|
| 173 |
+
public void RemoveRectangle(RectangleItem rectangle)
|
| 174 |
+
{
|
| 175 |
+
if (rectangle != null && Rectangles.Contains(rectangle))
|
| 176 |
+
{
|
| 177 |
+
Rectangles.Remove(rectangle);
|
| 178 |
+
}
|
| 179 |
+
}
|
| 180 |
+
|
| 181 |
+
// 根据ID删除矩形框
|
| 182 |
+
public void RemoveRectangleById(int id)
|
| 183 |
+
{
|
| 184 |
+
var rectangle = Rectangles.FirstOrDefault(r => r.Id == id);
|
| 185 |
+
if (rectangle != null)
|
| 186 |
+
{
|
| 187 |
+
Rectangles.Remove(rectangle);
|
| 188 |
+
}
|
| 189 |
+
}
|
| 190 |
}
|
| 191 |
}
|