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

block demo 已经完成到第三个了

Browse Source
This commit is contained in:
艾竹
2023-08-13 11:36:47 +08:00
parent 9485ce6684
commit d68fe22a05
7 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AIStudio.Wpf.DiagramDesigner/Controls/BlockDragThumb.cs
View File

@@ -28,7 +28,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
if (e.LeftButton == MouseButtonState.Pressed && firstPoint == null)
{
firstPoint = e.GetPosition(this);
DesignerItem.BeforeExecute();
DesignerItem.BeforeExecution();
}
}

2
AIStudio.Wpf.DiagramDesigner/Helpers/DrawingHelper.cs
View File

@@ -84,7 +84,7 @@ namespace AIStudio.Wpf.DiagramDesigner
}
static double ConvertToPositive360(double angle)
public static double ConvertToPositive360(double angle)
{
double positiveAngle = angle % 360;
if (positiveAngle < 0)

17
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Container/BlockItemsContainerInfo.cs
View File

@@ -70,7 +70,7 @@ namespace AIStudio.Wpf.DiagramDesigner
foreach (var child in designer.Children)
{
BlockDesignerItemViewModel fullyCreatedConnectorInfo = new BlockDesignerItemViewModel(this.Root, child);
InsertChild(fullyCreatedConnectorInfo);
InsertChild(fullyCreatedConnectorInfo, -1);
}
}
}
@@ -273,16 +273,17 @@ namespace AIStudio.Wpf.DiagramDesigner
return double.IsNaN(ItemHeight) ? ActualItemHeight : ItemHeight;
}
public void InsertChild(BlockDesignerItemViewModel child)
{
child.ParentContainer = this;
Children.Add(child);
}
public void InsertChild(BlockDesignerItemViewModel child, int index)
{
child.ParentContainer = this;
Children.Insert(index, child);
if (index == -1)
{
Children.Add(child);
}
else
{
Children.Insert(index, child);
}
}
public void RemoveChild(BlockDesignerItemViewModel child)

19
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
View File

@@ -392,15 +392,6 @@ namespace AIStudio.Wpf.DiagramDesigner
}
}
private ICommand _nextCommand;
public ICommand NextCommand
{
get
{
return this._nextCommand ?? (this._nextCommand = new SimpleCommand(ExecuteEnable, ExecuteNextCommand));
}
}
private ICommand _alignTopCommand;
public ICommand AlignTopCommand
{
@@ -1067,10 +1058,10 @@ namespace AIStudio.Wpf.DiagramDesigner
}
}
public virtual void ExecuteNextCommand(object parameter)
public virtual bool Next()
{
}
return false;
}
private void ExecuteSelectAllCommand(object parameter)
{
@@ -2777,8 +2768,8 @@ namespace AIStudio.Wpf.DiagramDesigner
}
else if (DiagramOption.ShortcutOption.Next(e))
{
NextCommand.Execute(null);
return true;
//NextCommand.Execute(null);
return Next();
}
return false;
}

24
AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
View File

@@ -469,23 +469,35 @@ namespace AIStudio.Wpf.DiagramDesigner
public async Task Execute()
{
await BeforeExecute();
await Executing();
await AfterExecute();
await StopExecution();
await BeforeExecution();
if (await Executing())
{
await AfterExecution();
}
else
{
IsExecuting = false;
}
}
public virtual Task BeforeExecute()
public virtual Task BeforeExecution()
{
IsExecuting = true;
return Task.CompletedTask;
}
public virtual Task Executing()
public virtual Task<bool> Executing()
{
return Task.FromResult(true);
}
public virtual Task StopExecution()
{
return Task.CompletedTask;
}
public virtual async Task AfterExecute()
public virtual async Task AfterExecution()
{
if (IsExecuting)
{

6
AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramViewModel.cs
View File

@@ -41,10 +41,6 @@ namespace AIStudio.Wpf.DiagramDesigner
{
get;
}
ICommand NextCommand
{
get;
}
ICommand AlignTopCommand
{
get;
@@ -340,6 +336,8 @@ namespace AIStudio.Wpf.DiagramDesigner
void Delete(object parameter);
bool Next();
void ClearSelectedItems();
bool ExecuteShortcut(KeyEventArgs e);