zhusenlin/aistudio-wpf-diagram
1
0
Fork 0
mirror of https://gitee.com/akwkevin/aistudio.-wpf.-diagram synced 2026-04-11 03:36:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

分组，取消分组 ReDo UnDo 整理

Browse Source
This commit is contained in:
艾竹
2023-04-08 21:48:43 +08:00
parent fa96573cbd
commit 8ad42aec49
15 changed files with 123 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
View File

@@ -540,7 +540,7 @@ namespace AIStudio.Wpf.DiagramDesigner
DragObject dragObject = e.Data.GetData(typeof(DragObject)) as DragObject;
if (dragObject != null)
{
_viewModel.ClearSelectedItemsCommand.Execute(null);
_viewModel.ClearSelectedItems();
Point position = e.GetPosition(this);
if (dragObject.DesignerItem is SerializableObject serializableObject)
{
@@ -587,7 +587,7 @@ namespace AIStudio.Wpf.DiagramDesigner
{
foreach (var file in files)
{
_viewModel.ClearSelectedItemsCommand.Execute(null);
_viewModel.ClearSelectedItems();
Point position = e.GetPosition(this);
ImageItemViewModel itemBase = new ImageItemViewModel();
itemBase.Icon = file;

9
AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Windows;
using System.Windows.Controls.Primitives;
using System.Windows.Media;
@@ -59,7 +60,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
designerItems = designerItems.Distinct().ToList();
DiagramViewModel.DoCommandManager.BeginDo = true;
Interlocked.Increment(ref DiagramViewModel.DoCommandManager.BeginDo);
foreach (DesignerItemViewModelBase item in designerItems.OfType<DesignerItemViewModelBase>())
{
item.SetOldValue(item.TopLeft, nameof(item.TopLeft));
@@ -76,8 +77,8 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
private void DragThumb_DragCompleted(object sender, DragCompletedEventArgs e)
{
if (drag == false)
{
DiagramViewModel.DoCommandManager.BeginDo = false;
{
Interlocked.Decrement(ref DiagramViewModel.DoCommandManager.BeginDo);
return;
}
@@ -91,7 +92,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
Dictionary<DesignerItemViewModelBase, Tuple<PointBase, PointBase>> infos =
designerItems.OfType<DesignerItemViewModelBase>().ToDictionary(p => p,
p => new Tuple<PointBase, PointBase>(p.GetOldValue<PointBase>(nameof(p.TopLeft)), p.TopLeft));
DiagramViewModel.DoCommandManager.BeginDo = false;
Interlocked.Decrement(ref DiagramViewModel.DoCommandManager.BeginDo);
DiagramViewModel.DoCommandManager.DoNewCommand(this.ToString(),
() => {
foreach (var info in infos)

5
AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
@@ -35,7 +36,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
{
designerItems = designerItem.Root.SelectedItems.ToList();
DiagramViewModel.DoCommandManager.BeginDo = true;
Interlocked.Increment(ref DiagramViewModel.DoCommandManager.BeginDo);
foreach (DesignerItemViewModelBase item in designerItems.OfType<DesignerItemViewModelBase>())
{
item.SetOldValue(item.Size, nameof(item.Size));
@@ -57,7 +58,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
designerItems.OfType<DesignerItemViewModelBase>().ToDictionary(p => p,
p => new Tuple<SizeBase, SizeBase>(p.GetOldValue<SizeBase>(nameof(p.Size)), p.Size));
DiagramViewModel.DoCommandManager.BeginDo = false;
Interlocked.Decrement(ref DiagramViewModel.DoCommandManager.BeginDo);
DiagramViewModel.DoCommandManager.DoNewCommand(this.ToString(),
() => {
foreach (var info in infos)

5
AIStudio.Wpf.DiagramDesigner/Controls/RotateThumb.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
@@ -42,7 +43,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
{
designerItems = designerItem.Root.SelectedItems.ToList();
DiagramViewModel.DoCommandManager.BeginDo = true;
Interlocked.Increment(ref DiagramViewModel.DoCommandManager.BeginDo);
foreach (DesignerItemViewModelBase item in designerItems.OfType<DesignerItemViewModelBase>())
{
item.SetOldValue(this.designerItem.Angle, nameof(this.designerItem.Angle));
@@ -78,7 +79,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
Dictionary<DesignerItemViewModelBase, Tuple<double, double>> infos =
designerItems.OfType<DesignerItemViewModelBase>().ToDictionary(p => p,
p => new Tuple<double, double>(p.GetOldValue<double>(nameof(p.Angle)), p.Angle));
DiagramViewModel.DoCommandManager.BeginDo = false;
Interlocked.Decrement(ref DiagramViewModel.DoCommandManager.BeginDo);
DiagramViewModel.DoCommandManager.DoNewCommand(this.ToString(),
() => {
foreach (var info in infos)