大部分完成,还有写要解决的问题

This commit is contained in:
艾竹
2023-01-26 22:25:48 +08:00
parent 04db0ef13b
commit 64ea56f01e
38 changed files with 499 additions and 56 deletions

View File

@@ -53,7 +53,7 @@ namespace AIStudio.Wpf.DiagramDesigner
protected virtual void Init(FullyCreatedConnectorInfo sourceConnectorInfo, ConnectorInfoBase sinkConnectorInfo)
{
this.Root = sourceConnectorInfo.DataItem.Root;
this.ColorViewModel.FillColor.Color = Colors.Red;
if (sinkConnectorInfo is FullyCreatedConnectorInfo sink && sink.DataItem.ShowArrow == false)
{
@@ -715,10 +715,7 @@ namespace AIStudio.Wpf.DiagramDesigner
MouseButtonEventArgs mosueArg = ((EventToCommandArgs)parameter).EventArgs as MouseButtonEventArgs;
var position = mosueArg.GetPosition(((EventToCommandArgs)parameter).Sender as IInputElement);
var vertice = new ConnectorVertexModel(this, new PointBase(position.X, position.Y));
vertice.PropertyChanged += new WeakINPCEventHandler(ConnectorViewModel_PropertyChanged).Handler;
Vertices.Add(vertice);
UpdatePathGeneratorResult();
AddVertex(position, false);
if (!((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control))
{
@@ -726,6 +723,18 @@ namespace AIStudio.Wpf.DiagramDesigner
}
}
public void AddVertex(PointBase pointBase, bool absolute = true)
{
if (absolute)
{
pointBase = new PointBase(pointBase.X - Area.Left, pointBase.Y - Area.Top);
}
var vertice = new ConnectorVertexModel(this, pointBase);
vertice.PropertyChanged += new WeakINPCEventHandler(ConnectorViewModel_PropertyChanged).Handler;
Vertices.Add(vertice);
UpdatePathGeneratorResult();
}
protected override void ExecuteEditCommand(object param)
{
AddLabel();

View File

@@ -364,33 +364,7 @@ namespace AIStudio.Wpf.DiagramDesigner
{
SetProperty(ref _cellVerticalAlignment, value);
}
}
private bool _enableSnapping;
public bool EnableSnapping
{
get
{
return _enableSnapping;
}
set
{
SetProperty(ref _enableSnapping, value);
}
}
private double _snappingRadius = 50;
public double SnappingRadius
{
get
{
return _snappingRadius;
}
set
{
SetProperty(ref _snappingRadius, value);
}
}
}
private bool _isEditName;
[Browsable(false)]
@@ -786,7 +760,7 @@ namespace AIStudio.Wpf.DiagramDesigner
ClearSelectedItems();
Add(ite);
}
else if (parameter is List<SelectableDesignerItemViewModelBase> items)
else if (parameter is IEnumerable<SelectableDesignerItemViewModelBase> items)
{
if (items.Select(p => AddVerify(p)).Any() != true) return;
@@ -1714,9 +1688,15 @@ namespace AIStudio.Wpf.DiagramDesigner
#region
private void ExecuteGroupCommand(object parameter)
{
var items = from item in SelectedItems.OfType<DesignerItemViewModelBase>()
where item.ParentId == Guid.Empty
select item;
List<DesignerItemViewModelBase> items;
if (parameter is IEnumerable<DesignerItemViewModelBase> para)
{
items = para.ToList();
}
else
{
items = SelectedItems.OfType<DesignerItemViewModelBase>().Where(p => p.ParentId == Guid.Empty).ToList();
}
RectangleBase rect = GetBoundingRectangle(items);

View File

@@ -11,10 +11,21 @@ namespace AIStudio.Wpf.DiagramDesigner
{
public GroupDesignerItemViewModel() : base()
{
this.ClearConnectors();
}
protected override void Init()
{
base.Init();
this.IsHitTestVisible = false;
}
protected override void InitConnector()
{
}
protected override void ExecuteEditCommand(object param)
{
}