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

Revert "block 可以拖拽到内部，还有少量问题待解决"

Browse Source 
This reverts commit 538898d238.
This commit is contained in:
艾竹
2023-06-11 23:57:59 +08:00
parent 538898d238
commit fcd7beb193
73 changed files with 242 additions and 7132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
View File

@@ -261,7 +261,7 @@ namespace AIStudio.Wpf.DiagramDesigner
{
get
{
return new SizeBase(GetItemWidth(), GetItemHeight());
return new SizeBase(ItemWidth, ItemHeight);
}
set
{
@@ -445,7 +445,7 @@ namespace AIStudio.Wpf.DiagramDesigner
{
get
{
return new Point(Left + GetItemWidth(), Top + GetItemHeight());
return new Point(Left + ItemWidth, Top + ItemHeight);
}
}
@@ -557,32 +557,6 @@ namespace AIStudio.Wpf.DiagramDesigner
}
}
private double _actualItemWidth;
public double ActualItemWidth
{
get
{
return _actualItemWidth;
}
set
{
SetProperty(ref _actualItemWidth, value);
}
}
private double _actualItemHeight;
public double ActualItemHeight
{
get
{
return _actualItemHeight;
}
set
{
SetProperty(ref _actualItemHeight, value);
}
}
/// <summary>
/// 连接点是否可以按偏移自定义
/// </summary>
@@ -663,9 +637,9 @@ namespace AIStudio.Wpf.DiagramDesigner
{
if (Root.DiagramOption.LayoutOption.CellHorizontalAlignment == CellHorizontalAlignment.Center)
{
if (Root.DiagramOption.LayoutOption.GridCellSize.Width > this.GetItemWidth())
if (Root.DiagramOption.LayoutOption.GridCellSize.Width > this.ItemWidth)
{
this.Left = (int)(this.Left / Root.DiagramOption.LayoutOption.GridCellSize.Width) * Root.DiagramOption.LayoutOption.GridCellSize.Width + Root.DiagramOption.LayoutOption.GridMarginSize.Width + (Root.DiagramOption.LayoutOption.GridCellSize.Width - this.GetItemWidth()) / 2;
this.Left = (int)(this.Left / Root.DiagramOption.LayoutOption.GridCellSize.Width) * Root.DiagramOption.LayoutOption.GridCellSize.Width + Root.DiagramOption.LayoutOption.GridMarginSize.Width + (Root.DiagramOption.LayoutOption.GridCellSize.Width - this.ItemWidth) / 2;
}
}
else if (Root.DiagramOption.LayoutOption.CellHorizontalAlignment == CellHorizontalAlignment.Left)
@@ -674,17 +648,17 @@ namespace AIStudio.Wpf.DiagramDesigner
}
else if (Root.DiagramOption.LayoutOption.CellHorizontalAlignment == CellHorizontalAlignment.Right)
{
if (Root.DiagramOption.LayoutOption.GridCellSize.Width > this.GetItemWidth())
if (Root.DiagramOption.LayoutOption.GridCellSize.Width > this.ItemWidth)
{
this.Left = (int)(this.Left / Root.DiagramOption.LayoutOption.GridCellSize.Width) * Root.DiagramOption.LayoutOption.GridCellSize.Width + Root.DiagramOption.LayoutOption.GridMarginSize.Width + (Root.DiagramOption.LayoutOption.GridCellSize.Width - this.GetItemWidth());
this.Left = (int)(this.Left / Root.DiagramOption.LayoutOption.GridCellSize.Width) * Root.DiagramOption.LayoutOption.GridCellSize.Width + Root.DiagramOption.LayoutOption.GridMarginSize.Width + (Root.DiagramOption.LayoutOption.GridCellSize.Width - this.ItemWidth);
}
}
if (Root.DiagramOption.LayoutOption.CellVerticalAlignment == CellVerticalAlignment.Center)
{
if (Root.DiagramOption.LayoutOption.GridCellSize.Height > this.GetItemHeight())
if (Root.DiagramOption.LayoutOption.GridCellSize.Height > this.ItemHeight)
{
this.Top = (int)(this.Top / Root.DiagramOption.LayoutOption.GridCellSize.Height) * Root.DiagramOption.LayoutOption.GridCellSize.Height + Root.DiagramOption.LayoutOption.GridMarginSize.Height + (Root.DiagramOption.LayoutOption.GridCellSize.Height - this.GetItemHeight()) / 2;
this.Top = (int)(this.Top / Root.DiagramOption.LayoutOption.GridCellSize.Height) * Root.DiagramOption.LayoutOption.GridCellSize.Height + Root.DiagramOption.LayoutOption.GridMarginSize.Height + (Root.DiagramOption.LayoutOption.GridCellSize.Height - this.ItemHeight) / 2;
}
}
else if (Root.DiagramOption.LayoutOption.CellVerticalAlignment == CellVerticalAlignment.Top)
@@ -693,9 +667,9 @@ namespace AIStudio.Wpf.DiagramDesigner
}
else if (Root.DiagramOption.LayoutOption.CellVerticalAlignment == CellVerticalAlignment.Bottom)
{
if (Root.DiagramOption.LayoutOption.GridCellSize.Height > this.GetItemHeight())
if (Root.DiagramOption.LayoutOption.GridCellSize.Height > this.ItemHeight)
{
this.Top = (int)(this.Top / Root.DiagramOption.LayoutOption.GridCellSize.Height) * Root.DiagramOption.LayoutOption.GridCellSize.Height + Root.DiagramOption.LayoutOption.GridMarginSize.Height + (Root.DiagramOption.LayoutOption.GridCellSize.Height - this.GetItemHeight());
this.Top = (int)(this.Top / Root.DiagramOption.LayoutOption.GridCellSize.Height) * Root.DiagramOption.LayoutOption.GridCellSize.Height + Root.DiagramOption.LayoutOption.GridMarginSize.Height + (Root.DiagramOption.LayoutOption.GridCellSize.Height - this.ItemHeight);
}
}
}
@@ -766,24 +740,14 @@ namespace AIStudio.Wpf.DiagramDesigner
var left = leftPort == null ? Position.X : Math.Min(Position.X, leftPort.Position.X);
var top = topPort == null ? Position.Y : Math.Min(Position.Y, topPort.Position.Y);
var right = rightPort == null ? Position.X + GetItemWidth() :
Math.Max(rightPort.Position.X + rightPort.ConnectorWidth, Position.X + GetItemWidth());
var right = rightPort == null ? Position.X + ItemWidth :
Math.Max(rightPort.Position.X + rightPort.ConnectorWidth, Position.X + ItemWidth);
var bottom = bottomPort == null ? Position.Y + ItemHeight :
Math.Max(bottomPort.Position.Y + bottomPort.ConnectorHeight, Position.Y + GetItemHeight());
Math.Max(bottomPort.Position.Y + bottomPort.ConnectorHeight, Position.Y + ItemHeight);
return new RectangleBase(left, top, right, bottom, true);
}
public double GetItemWidth()
{
return double.IsNaN(ItemWidth) ? ActualItemWidth : ItemWidth;
}
public double GetItemHeight()
{
return double.IsNaN(ItemHeight) ? ActualItemHeight : ItemHeight;
}
public IShape GetShape() => ShapeDefiner(this);
public override string ToString()