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

修改暂存一下

Browse Source
This commit is contained in:
艾竹
2023-01-12 23:02:53 +08:00
parent 5d7717cc2b
commit 6a4c31106a
58 changed files with 776 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
AIStudio.Wpf.DiagramApp/ViewModels/DiagramsViewModel.cs
View File

@@ -274,7 +274,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
FullyCreatedConnectorInfo sinkConnectorInfo = GetFullConnectorInfo(connection.Id, sinkItem, sinkConnectorOrientation, connection.SinkXRatio, connection.SinkYRatio, connection.SinkInnerPoint); FullyCreatedConnectorInfo sinkConnectorInfo = GetFullConnectorInfo(connection.Id, sinkItem, sinkConnectorOrientation, connection.SinkXRatio, connection.SinkYRatio, connection.SinkInnerPoint);
ConnectorViewModel connectionVM = new ConnectorViewModel(viewModel, sourceConnectorInfo, sinkConnectorInfo, connection, connection.VectorLineDrawMode); ConnectorViewModel connectionVM = new ConnectorViewModel(viewModel, sourceConnectorInfo, sinkConnectorInfo, connection);
DesignerItemViewModelBase textItem = viewModel.Items.OfType<DesignerItemViewModelBase>().FirstOrDefault(x => x.ParentId == connection.Id); DesignerItemViewModelBase textItem = viewModel.Items.OfType<DesignerItemViewModelBase>().FirstOrDefault(x => x.ParentId == connection.Id);
if (textItem != null) if (textItem != null)
{ {
@@ -334,24 +334,10 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
foreach (var connectionVM in DiagramViewModel.Items.OfType<ConnectorViewModel>()) foreach (var connectionVM in DiagramViewModel.Items.OfType<ConnectorViewModel>())
{ {
if (!connectionVM.IsFullConnection)
continue;
FullyCreatedConnectorInfo sinkConnector = connectionVM.SinkConnectorInfoFully; ConnectionItem connection = new ConnectionItem(connectionVM);
ConnectionItem connection = new ConnectionItem(
connectionVM.SourceConnectorInfo.DataItem.Id,
connectionVM.SourceConnectorInfo.Orientation,
connectionVM.SourceConnectorInfo.DataItem.GetType(),
connectionVM.GetXRatioFromConnector(connectionVM.SourceConnectorInfo),
connectionVM.GetYRatioFromConnector(connectionVM.SourceConnectorInfo),
connectionVM.SourceConnectorInfo.IsInnerPoint,
sinkConnector.DataItem.Id,
sinkConnector.Orientation,
sinkConnector.DataItem.GetType(),
connectionVM.GetXRatioFromConnector(sinkConnector),
connectionVM.GetYRatioFromConnector(sinkConnector),
sinkConnector.IsInnerPoint,
connectionVM);
diagramItem.ConnectionIds.Add(connectionVM.Id); diagramItem.ConnectionIds.Add(connectionVM.Id);
diagramItem.Connections.Add(connection); diagramItem.Connections.Add(connection);
} }
@@ -527,20 +513,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
FullyCreatedConnectorInfo sinkConnector = connectionVM.SinkConnectorInfoFully; FullyCreatedConnectorInfo sinkConnector = connectionVM.SinkConnectorInfoFully;
ConnectionItem connection = new ConnectionItem( ConnectionItem connection = new ConnectionItem(connectionVM);
connectionVM.SourceConnectorInfo.DataItem.Id,
connectionVM.SourceConnectorInfo.Orientation,
connectionVM.SourceConnectorInfo.DataItem.GetType(),
connectionVM.GetXRatioFromConnector(connectionVM.SourceConnectorInfo),
connectionVM.GetYRatioFromConnector(connectionVM.SourceConnectorInfo),
connectionVM.SourceConnectorInfo.IsInnerPoint,
sinkConnector.DataItem.Id,
sinkConnector.Orientation,
sinkConnector.DataItem.GetType(),
connectionVM.GetXRatioFromConnector(sinkConnector),
connectionVM.GetYRatioFromConnector(sinkConnector),
sinkConnector.IsInnerPoint,
connectionVM);
diagramItem.ConnectionIds.Add(connectionVM.Id); diagramItem.ConnectionIds.Add(connectionVM.Id);
diagramItem.Connections.Add(connection); diagramItem.Connections.Add(connection);
@@ -579,7 +552,7 @@ namespace AIStudio.Wpf.DiagramApp.ViewModels
ConnectorOrientation sinkConnectorOrientation = connection.SinkOrientation; ConnectorOrientation sinkConnectorOrientation = connection.SinkOrientation;
FullyCreatedConnectorInfo sinkConnectorInfo = GetFullConnectorInfo(connection.Id, sinkItem, sinkConnectorOrientation, connection.SinkXRatio, connection.SinkYRatio, connection.SinkInnerPoint); FullyCreatedConnectorInfo sinkConnectorInfo = GetFullConnectorInfo(connection.Id, sinkItem, sinkConnectorOrientation, connection.SinkXRatio, connection.SinkYRatio, connection.SinkInnerPoint);
ConnectorViewModel connectionVM = new ConnectorViewModel(viewModel, sourceConnectorInfo, sinkConnectorInfo, connection, connection.VectorLineDrawMode); ConnectorViewModel connectionVM = new ConnectorViewModel(viewModel, sourceConnectorInfo, sinkConnectorInfo, connection);
viewModel.Items.Add(connectionVM); viewModel.Items.Add(connectionVM);
} }

24
AIStudio.Wpf.DiagramApp/ViewModels/FlowchartViewModel.cs
View File

@@ -25,7 +25,7 @@ namespace AIStudio.Wpf.Flowchart
{ {
FlowchartService.InitData(DiagramViewModel.Items.OfType<FlowNode>().ToList(), DiagramViewModel.Items.OfType<ConnectorViewModel>().ToList(), DiagramViewModel); FlowchartService.InitData(DiagramViewModel.Items.OfType<FlowNode>().ToList(), DiagramViewModel.Items.OfType<ConnectorViewModel>().ToList(), DiagramViewModel);
} }
_service.DrawModeViewModel.VectorLineDrawMode = DrawMode.BoundaryConnectingLine; _service.DrawModeViewModel.LineDrawMode = DrawMode.BoundaryConnectingLine;
} }
protected override void InitDiagramViewModel() protected override void InitDiagramViewModel()
@@ -36,7 +36,7 @@ namespace AIStudio.Wpf.Flowchart
DiagramViewModel.GridCellSize = new Size(100, 100); DiagramViewModel.GridCellSize = new Size(100, 100);
DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Center; DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Center;
DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center; DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center;
_service.DrawModeViewModel.VectorLineDrawMode = DrawMode.BoundaryConnectingLine; _service.DrawModeViewModel.LineDrawMode = DrawMode.BoundaryConnectingLine;
} }
protected override void Init() protected override void Init()
@@ -70,36 +70,36 @@ namespace AIStudio.Wpf.Flowchart
DesignerItemViewModelBase end = new EndFlowNode() { Left = 100, Top = 700, ItemWidth = 80, ItemHeight = 40, Color = Colors.Yellow.ToString() }; DesignerItemViewModelBase end = new EndFlowNode() { Left = 100, Top = 700, ItemWidth = 80, ItemHeight = 40, Color = Colors.Yellow.ToString() };
DiagramViewModel.DirectAddItemCommand.Execute(end); DiagramViewModel.DirectAddItemCommand.Execute(end);
ConnectorViewModel connector1 = new ConnectorViewModel(start.BottomConnector, middle1.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector1 = new ConnectorViewModel(start.BottomConnector, middle1.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector1); DiagramViewModel.DirectAddItemCommand.Execute(connector1);
ConnectorViewModel connector2 = new ConnectorViewModel(middle1.BottomConnector, decide.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector2 = new ConnectorViewModel(middle1.BottomConnector, decide.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector2); DiagramViewModel.DirectAddItemCommand.Execute(connector2);
ConnectorViewModel connector3 = new ConnectorViewModel(decide.RightConnector, middle2.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector3 = new ConnectorViewModel(decide.RightConnector, middle2.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector3); DiagramViewModel.DirectAddItemCommand.Execute(connector3);
connector3.AddText(">=3"); connector3.AddText(">=3");
ConnectorViewModel connector4 = new ConnectorViewModel(middle2.BottomConnector, cobegin.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector4 = new ConnectorViewModel(middle2.BottomConnector, cobegin.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector4); DiagramViewModel.DirectAddItemCommand.Execute(connector4);
ConnectorViewModel connector5 = new ConnectorViewModel(decide.BottomConnector, cobegin.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector5 = new ConnectorViewModel(decide.BottomConnector, cobegin.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector5); DiagramViewModel.DirectAddItemCommand.Execute(connector5);
connector5.AddText("<3"); connector5.AddText("<3");
ConnectorViewModel connector6 = new ConnectorViewModel(cobegin.BottomConnector, middle3.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector6 = new ConnectorViewModel(cobegin.BottomConnector, middle3.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector6); DiagramViewModel.DirectAddItemCommand.Execute(connector6);
ConnectorViewModel connector7 = new ConnectorViewModel(cobegin.BottomConnector, middle4.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector7 = new ConnectorViewModel(cobegin.BottomConnector, middle4.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector7); DiagramViewModel.DirectAddItemCommand.Execute(connector7);
ConnectorViewModel connector8 = new ConnectorViewModel(middle3.BottomConnector, coend.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector8 = new ConnectorViewModel(middle3.BottomConnector, coend.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector8); DiagramViewModel.DirectAddItemCommand.Execute(connector8);
ConnectorViewModel connector9 = new ConnectorViewModel(middle4.BottomConnector, coend.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector9 = new ConnectorViewModel(middle4.BottomConnector, coend.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector9); DiagramViewModel.DirectAddItemCommand.Execute(connector9);
ConnectorViewModel connector10 = new ConnectorViewModel(coend.BottomConnector, end.TopConnector, _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector10 = new ConnectorViewModel(coend.BottomConnector, end.TopConnector, _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector10); DiagramViewModel.DirectAddItemCommand.Execute(connector10);
DiagramViewModel.ClearSelectedItems(); DiagramViewModel.ClearSelectedItems();

20
AIStudio.Wpf.DiagramApp/ViewModels/LogicalViewModel.cs
View File

@@ -17,7 +17,7 @@ namespace AIStudio.Wpf.Logical
} }
public LogicalViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument) public LogicalViewModel(string filename, DiagramDocument diagramDocument) : base(filename, diagramDocument)
{ {
_service.DrawModeViewModel.VectorLineDrawMode = DrawMode.CornerConnectingLine; _service.DrawModeViewModel.LineDrawMode = DrawMode.CornerConnectingLine;
} }
protected override void InitDiagramViewModel() protected override void InitDiagramViewModel()
@@ -31,7 +31,7 @@ namespace AIStudio.Wpf.Logical
DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.None; DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.None;
DiagramViewModel.Items.CollectionChanged += Items_CollectionChanged; DiagramViewModel.Items.CollectionChanged += Items_CollectionChanged;
_service.DrawModeViewModel.VectorLineDrawMode = DrawMode.CornerConnectingLine; _service.DrawModeViewModel.LineDrawMode = DrawMode.CornerConnectingLine;
} }
protected override void Init() protected override void Init()
@@ -74,28 +74,28 @@ namespace AIStudio.Wpf.Logical
out1.LinkPoint = LogicalService.LinkPoint[4]; out1.LinkPoint = LogicalService.LinkPoint[4];
DiagramViewModel.DirectAddItemCommand.Execute(out1); DiagramViewModel.DirectAddItemCommand.Execute(out1);
ConnectorViewModel connector1 = new ConnectorViewModel(in1.Output[0], item1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector1 = new ConnectorViewModel(in1.Output[0], item1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector1); DiagramViewModel.DirectAddItemCommand.Execute(connector1);
ConnectorViewModel connector2 = new ConnectorViewModel(in2.Output[0], item1.Input[1], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector2 = new ConnectorViewModel(in2.Output[0], item1.Input[1], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector2); DiagramViewModel.DirectAddItemCommand.Execute(connector2);
ConnectorViewModel connector3 = new ConnectorViewModel(item1.Output[0], gTGate.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector3 = new ConnectorViewModel(item1.Output[0], gTGate.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector3); DiagramViewModel.DirectAddItemCommand.Execute(connector3);
ConnectorViewModel connector4 = new ConnectorViewModel(constant.Output[0], gTGate.Input[1], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector4 = new ConnectorViewModel(constant.Output[0], gTGate.Input[1], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector4); DiagramViewModel.DirectAddItemCommand.Execute(connector4);
ConnectorViewModel connector5 = new ConnectorViewModel(gTGate.Output[0], sELGate.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector5 = new ConnectorViewModel(gTGate.Output[0], sELGate.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector5); DiagramViewModel.DirectAddItemCommand.Execute(connector5);
ConnectorViewModel connector6 = new ConnectorViewModel(in3.Output[0], sELGate.Input[1], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector6 = new ConnectorViewModel(in3.Output[0], sELGate.Input[1], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector6); DiagramViewModel.DirectAddItemCommand.Execute(connector6);
ConnectorViewModel connector7 = new ConnectorViewModel(in4.Output[0], sELGate.Input[2], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector7 = new ConnectorViewModel(in4.Output[0], sELGate.Input[2], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector7); DiagramViewModel.DirectAddItemCommand.Execute(connector7);
ConnectorViewModel connector8 = new ConnectorViewModel(sELGate.Output[0], out1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector8 = new ConnectorViewModel(sELGate.Output[0], out1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector8); DiagramViewModel.DirectAddItemCommand.Execute(connector8);
} }

70
AIStudio.Wpf.DiagramApp/ViewModels/SFCViewModel.cs
View File

@@ -32,7 +32,7 @@ namespace AIStudio.Wpf.Flowchart
readDataTimer.Interval = 1000; readDataTimer.Interval = 1000;
readDataTimer.AutoReset = false; readDataTimer.AutoReset = false;
readDataTimer.Start(); readDataTimer.Start();
_service.DrawModeViewModel.VectorLineDrawMode = DrawMode.BoundaryConnectingLine; _service.DrawModeViewModel.LineDrawMode = DrawMode.BoundaryConnectingLine;
} }
protected override void InitDiagramViewModel() protected override void InitDiagramViewModel()
@@ -43,7 +43,7 @@ namespace AIStudio.Wpf.Flowchart
DiagramViewModel.GridCellSize = new Size(100, 60); DiagramViewModel.GridCellSize = new Size(100, 60);
DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Center; DiagramViewModel.CellHorizontalAlignment = CellHorizontalAlignment.Center;
DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center; DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center;
_service.DrawModeViewModel.VectorLineDrawMode = DrawMode.BoundaryConnectingLine; _service.DrawModeViewModel.LineDrawMode = DrawMode.BoundaryConnectingLine;
} }
private System.Timers.Timer readDataTimer = new System.Timers.Timer(); private System.Timers.Timer readDataTimer = new System.Timers.Timer();
@@ -120,79 +120,79 @@ namespace AIStudio.Wpf.Flowchart
SFCCOEndNode coend = new SFCCOEndNode() { Left = 38, Top = 720, Text = "" }; SFCCOEndNode coend = new SFCCOEndNode() { Left = 38, Top = 720, Text = "" };
DiagramViewModel.DirectAddItemCommand.Execute(coend); DiagramViewModel.DirectAddItemCommand.Execute(coend);
ConnectorViewModel connector1_1 = new ConnectorViewModel(start.Output[0], condition1_1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector1_1 = new ConnectorViewModel(start.Output[0], condition1_1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector1_1); DiagramViewModel.DirectAddItemCommand.Execute(connector1_1);
ConnectorViewModel connector2_1 = new ConnectorViewModel(condition1_1.Output[0], step1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector2_1 = new ConnectorViewModel(condition1_1.Output[0], step1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector2_1); DiagramViewModel.DirectAddItemCommand.Execute(connector2_1);
ConnectorViewModel connector1_2 = new ConnectorViewModel(start.Output[0], condition1_2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector1_2 = new ConnectorViewModel(start.Output[0], condition1_2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector1_2); DiagramViewModel.DirectAddItemCommand.Execute(connector1_2);
ConnectorViewModel connector2_2 = new ConnectorViewModel(condition1_2.Output[0], step1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector2_2 = new ConnectorViewModel(condition1_2.Output[0], step1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector2_2); DiagramViewModel.DirectAddItemCommand.Execute(connector2_2);
ConnectorViewModel connector31 = new ConnectorViewModel(step1.Action[0], action11.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector31 = new ConnectorViewModel(step1.Action[0], action11.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector31); DiagramViewModel.DirectAddItemCommand.Execute(connector31);
ConnectorViewModel connector32 = new ConnectorViewModel(step1.Action[0], action12.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector32 = new ConnectorViewModel(step1.Action[0], action12.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector32); DiagramViewModel.DirectAddItemCommand.Execute(connector32);
ConnectorViewModel connector33 = new ConnectorViewModel(step1.Action[0], action13.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector33 = new ConnectorViewModel(step1.Action[0], action13.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector33); DiagramViewModel.DirectAddItemCommand.Execute(connector33);
ConnectorViewModel connector34 = new ConnectorViewModel(step1.Action[0], action14.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector34 = new ConnectorViewModel(step1.Action[0], action14.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector34); DiagramViewModel.DirectAddItemCommand.Execute(connector34);
ConnectorViewModel connector4 = new ConnectorViewModel(step1.Output[0], condition2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector4 = new ConnectorViewModel(step1.Output[0], condition2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector4); DiagramViewModel.DirectAddItemCommand.Execute(connector4);
ConnectorViewModel connector5 = new ConnectorViewModel(condition2.Output[0], step2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector5 = new ConnectorViewModel(condition2.Output[0], step2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector5); DiagramViewModel.DirectAddItemCommand.Execute(connector5);
ConnectorViewModel connector6 = new ConnectorViewModel(step2.Action[0], action2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector6 = new ConnectorViewModel(step2.Action[0], action2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector6); DiagramViewModel.DirectAddItemCommand.Execute(connector6);
ConnectorViewModel connector7 = new ConnectorViewModel(step2.Output[0], condition3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector7 = new ConnectorViewModel(step2.Output[0], condition3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector7); DiagramViewModel.DirectAddItemCommand.Execute(connector7);
ConnectorViewModel connector8 = new ConnectorViewModel(condition3.Output[0], step3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector8 = new ConnectorViewModel(condition3.Output[0], step3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector8); DiagramViewModel.DirectAddItemCommand.Execute(connector8);
ConnectorViewModel connector9 = new ConnectorViewModel(step3.Action[0], action3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector9 = new ConnectorViewModel(step3.Action[0], action3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector9); DiagramViewModel.DirectAddItemCommand.Execute(connector9);
ConnectorViewModel connector10 = new ConnectorViewModel(step3.Output[0], condition4.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector10 = new ConnectorViewModel(step3.Output[0], condition4.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector10); DiagramViewModel.DirectAddItemCommand.Execute(connector10);
ConnectorViewModel connector11 = new ConnectorViewModel(condition4.Output[0], cobegin.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector11 = new ConnectorViewModel(condition4.Output[0], cobegin.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector11); DiagramViewModel.DirectAddItemCommand.Execute(connector11);
ConnectorViewModel connector12 = new ConnectorViewModel(cobegin.Output[0], step4.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector12 = new ConnectorViewModel(cobegin.Output[0], step4.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector12); DiagramViewModel.DirectAddItemCommand.Execute(connector12);
ConnectorViewModel connector13 = new ConnectorViewModel(step4.Action[0], action4.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector13 = new ConnectorViewModel(step4.Action[0], action4.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector13); DiagramViewModel.DirectAddItemCommand.Execute(connector13);
ConnectorViewModel connector14 = new ConnectorViewModel(step4.Output[0], condition5.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector14 = new ConnectorViewModel(step4.Output[0], condition5.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector14); DiagramViewModel.DirectAddItemCommand.Execute(connector14);
ConnectorViewModel connector15 = new ConnectorViewModel(cobegin.Output[1], step5.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector15 = new ConnectorViewModel(cobegin.Output[1], step5.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector15); DiagramViewModel.DirectAddItemCommand.Execute(connector15);
ConnectorViewModel connector16 = new ConnectorViewModel(step5.Action[0], action5.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector16 = new ConnectorViewModel(step5.Action[0], action5.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector16); DiagramViewModel.DirectAddItemCommand.Execute(connector16);
ConnectorViewModel connector17 = new ConnectorViewModel(step5.Output[0], condition6.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector17 = new ConnectorViewModel(step5.Output[0], condition6.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector17); DiagramViewModel.DirectAddItemCommand.Execute(connector17);
ConnectorViewModel connector18 = new ConnectorViewModel(condition5.Output[0], coend.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector18 = new ConnectorViewModel(condition5.Output[0], coend.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector18); DiagramViewModel.DirectAddItemCommand.Execute(connector18);
ConnectorViewModel connector19 = new ConnectorViewModel(condition6.Output[0], coend.Input[1], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector19 = new ConnectorViewModel(condition6.Output[0], coend.Input[1], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector19); DiagramViewModel.DirectAddItemCommand.Execute(connector19);
ConnectorViewModel connector20 = new ConnectorViewModel(coend.Output[0], start.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel connector20 = new ConnectorViewModel(coend.Output[0], start.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(connector20); DiagramViewModel.DirectAddItemCommand.Execute(connector20);
#region 模拟部分 #region 模拟部分
@@ -245,28 +245,28 @@ namespace AIStudio.Wpf.Flowchart
Simulate_TankViewModel tank3 = new Simulate_TankViewModel() { Left = 500, Top = 103, ItemWidth = 48, ItemHeight = 60, Text = "T3", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T3") }; Simulate_TankViewModel tank3 = new Simulate_TankViewModel() { Left = 500, Top = 103, ItemWidth = 48, ItemHeight = 60, Text = "T3", LinkPoint = SFCService.LinkPoint.FirstOrDefault(p => p.Name == "T3") };
DiagramViewModel.DirectAddItemCommand.Execute(tank3); DiagramViewModel.DirectAddItemCommand.Execute(tank3);
ConnectorViewModel conn1 = new ConnectorViewModel(tank1.Output[0], k1.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel conn1 = new ConnectorViewModel(tank1.Output[0], k1.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(conn1); DiagramViewModel.DirectAddItemCommand.Execute(conn1);
ConnectorViewModel conn2 = new ConnectorViewModel(tank1.Output[0], k2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel conn2 = new ConnectorViewModel(tank1.Output[0], k2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(conn2); DiagramViewModel.DirectAddItemCommand.Execute(conn2);
ConnectorViewModel conn3 = new ConnectorViewModel(tank1.Output[0], k3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel conn3 = new ConnectorViewModel(tank1.Output[0], k3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(conn3); DiagramViewModel.DirectAddItemCommand.Execute(conn3);
ConnectorViewModel conn4 = new ConnectorViewModel(k1.Output[0], tank2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel conn4 = new ConnectorViewModel(k1.Output[0], tank2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(conn4); DiagramViewModel.DirectAddItemCommand.Execute(conn4);
ConnectorViewModel conn5 = new ConnectorViewModel(k2.Output[0], tank2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel conn5 = new ConnectorViewModel(k2.Output[0], tank2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(conn5); DiagramViewModel.DirectAddItemCommand.Execute(conn5);
ConnectorViewModel conn6 = new ConnectorViewModel(k3.Output[0], tank2.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel conn6 = new ConnectorViewModel(k3.Output[0], tank2.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(conn6); DiagramViewModel.DirectAddItemCommand.Execute(conn6);
ConnectorViewModel conn7 = new ConnectorViewModel(tank2.Output[1], k4.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel conn7 = new ConnectorViewModel(tank2.Output[1], k4.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(conn7); DiagramViewModel.DirectAddItemCommand.Execute(conn7);
ConnectorViewModel conn8 = new ConnectorViewModel(k4.Output[0], tank3.Input[0], _service.DrawModeViewModel.VectorLineDrawMode); ConnectorViewModel conn8 = new ConnectorViewModel(k4.Output[0], tank3.Input[0], _service.DrawModeViewModel.LineDrawMode, _service.DrawModeViewModel.LineRouterMode);
DiagramViewModel.DirectAddItemCommand.Execute(conn8); DiagramViewModel.DirectAddItemCommand.Execute(conn8);
#endregion #endregion

65
AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml
View File

@@ -801,11 +801,11 @@
</Fluent:ToggleButton.ToolTip> </Fluent:ToggleButton.ToolTip>
</Fluent:ToggleButton> </Fluent:ToggleButton>
<Fluent:SplitButton Header="连接线" GroupName="DrawMode" IsCheckable="True" IsChecked="{Binding VectorLineDrawModeSelected}" Icon="{iconPacks:Material Kind=VectorPolyline}" Width="50" VerticalAlignment="Top"> <Fluent:SplitButton Header="连接线" GroupName="DrawMode" IsCheckable="True" IsChecked="{Binding LineDrawModeSelected}" Icon="{iconPacks:Material Kind=VectorPolyline}" Width="50" VerticalAlignment="Top">
<Fluent:MenuItem Header="直线连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding VectorLineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='ConnectingLine'}, ConverterParameter='ConnectingLine'}" Icon="{iconPacks:Material Kind=VectorLine}"/> <Fluent:MenuItem Header="曲线连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding LineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='SmoothConnectingLine'}, ConverterParameter='SmoothConnectingLine'}" Icon="{iconPacks:Material Kind=VectorRadius}"/>
<Fluent:MenuItem Header="折角连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding VectorLineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='CornerConnectingLine'}, ConverterParameter='CornerConnectingLine'}" Icon="{iconPacks:Material Kind=VectorPolyline}"/> <Fluent:MenuItem Header="直线连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding LineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='StraightConnectingLine'}, ConverterParameter='StraightConnectingLine'}" Icon="{iconPacks:Material Kind=VectorLine}"/>
<Fluent:MenuItem Header="边界连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding VectorLineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='BoundaryConnectingLine'}, ConverterParameter='BoundaryConnectingLine'}" Icon="{iconPacks:Material Kind=VectorPolylineEdit}"/> <Fluent:MenuItem Header="折线连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding LineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='CornerConnectingLine'}, ConverterParameter='CornerConnectingLine'}" Icon="{iconPacks:Material Kind=VectorPolyline}"/>
<Fluent:MenuItem Header="曲线连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding VectorLineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='RadiusConnectingLine'}, ConverterParameter='RadiusConnectingLine'}" Icon="{iconPacks:Material Kind=VectorRadius}"/> <Fluent:MenuItem Header="边界连接线" Size="Middle" IsCheckable="True" IsChecked="{Binding LineDrawMode,Converter={dd:ConverterValueMapToBool Parameter='BoundaryConnectingLine'}, ConverterParameter='BoundaryConnectingLine'}" Icon="{iconPacks:Material Kind=VectorPolylineEdit}"/>
<Fluent:SplitButton.Style> <Fluent:SplitButton.Style>
<Style TargetType="{x:Type Fluent:SplitButton}" BasedOn="{StaticResource RibbonSplitButtonStyle}"> <Style TargetType="{x:Type Fluent:SplitButton}" BasedOn="{StaticResource RibbonSplitButtonStyle}">
<Setter Property="LargeIcon"> <Setter Property="LargeIcon">
@@ -814,34 +814,34 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding VectorLineDrawMode}" Value="ConnectingLine"> <DataTrigger Binding="{Binding LineDrawMode}" Value="SmoothConnectingLine">
<Setter Property="LargeIcon">
<Setter.Value>
<iconPacks:PackIconMaterial Kind="VectorRadius" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Setter.Value>
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding LineDrawMode}" Value="StraightConnectingLine">
<Setter Property="LargeIcon"> <Setter Property="LargeIcon">
<Setter.Value> <Setter.Value>
<iconPacks:PackIconMaterial Kind="VectorLine" VerticalAlignment="Center" HorizontalAlignment="Center"/> <iconPacks:PackIconMaterial Kind="VectorLine" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding VectorLineDrawMode}" Value="CornerConnectingLine"> <DataTrigger Binding="{Binding LineDrawMode}" Value="CornerConnectingLine">
<Setter Property="LargeIcon"> <Setter Property="LargeIcon">
<Setter.Value> <Setter.Value>
<iconPacks:PackIconMaterial Kind="VectorPolyline" VerticalAlignment="Center" HorizontalAlignment="Center"/> <iconPacks:PackIconMaterial Kind="VectorPolyline" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding VectorLineDrawMode}" Value="BoundaryConnectingLine"> <DataTrigger Binding="{Binding LineDrawMode}" Value="BoundaryConnectingLine">
<Setter Property="LargeIcon"> <Setter Property="LargeIcon">
<Setter.Value> <Setter.Value>
<iconPacks:PackIconMaterial Kind="VectorPolylineEdit" VerticalAlignment="Center" HorizontalAlignment="Center"/> <iconPacks:PackIconMaterial Kind="VectorPolylineEdit" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding VectorLineDrawMode}" Value="RadiusConnectingLine">
<Setter Property="LargeIcon">
<Setter.Value>
<iconPacks:PackIconMaterial Kind="VectorRadius" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Setter.Value>
</Setter>
</DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Fluent:SplitButton.Style> </Fluent:SplitButton.Style>
@@ -852,6 +852,41 @@
</Fluent:SplitButton.ToolTip> </Fluent:SplitButton.ToolTip>
</Fluent:SplitButton> </Fluent:SplitButton>
<Fluent:SplitButton Header="连接方式" GroupName="RouterMode" IsCheckable="False" IsChecked="{Binding LineRouterModeSelected}" Icon="{iconPacks:FontAwesome Kind=WindowMinimizeRegular}" Width="50" VerticalAlignment="Top">
<Fluent:MenuItem Header="普通" Size="Middle" IsCheckable="True" IsChecked="{Binding LineRouterMode,Converter={dd:ConverterValueMapToBool Parameter='Normal'}, ConverterParameter='Normal'}" Icon="{iconPacks:FontAwesome Kind=WindowMinimizeRegular}"/>
<Fluent:MenuItem Header="正交" Size="Middle" IsCheckable="True" IsChecked="{Binding LineRouterMode,Converter={dd:ConverterValueMapToBool Parameter='Orthogonal'}, ConverterParameter='Orthogonal'}" Icon="{iconPacks:FontAwesome Kind=BorderStyleSolid}"/>
<Fluent:SplitButton.Style>
<Style TargetType="{x:Type Fluent:SplitButton}" BasedOn="{StaticResource RibbonSplitButtonStyle}">
<Setter Property="LargeIcon">
<Setter.Value>
<iconPacks:PackIconMaterial Kind="VectorPolyline" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Setter.Value>
</Setter>
<Style.Triggers>
<DataTrigger Binding="{Binding LineRouterMode}" Value="Normal">
<Setter Property="LargeIcon">
<Setter.Value>
<iconPacks:PackIconFontAwesome Kind="WindowMinimizeRegular" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Setter.Value>
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding LineRouterMode}" Value="Orthogonal">
<Setter Property="LargeIcon">
<Setter.Value>
<iconPacks:PackIconFontAwesome Kind="BorderStyleSolid" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Setter.Value>
</Setter>
</DataTrigger>
</Style.Triggers>
</Style>
</Fluent:SplitButton.Style>
<Fluent:SplitButton.ToolTip>
<Fluent:ScreenTip Title="Line"
Text="连接线的连接方式"
Width="190" />
</Fluent:SplitButton.ToolTip>
</Fluent:SplitButton>
<Fluent:SplitButton Header="形状" GroupName="DrawMode" IsCheckable="True" IsChecked="{Binding ShapeDrawModeSelected}" Width="50" VerticalAlignment="Top"> <Fluent:SplitButton Header="形状" GroupName="DrawMode" IsCheckable="True" IsChecked="{Binding ShapeDrawModeSelected}" Width="50" VerticalAlignment="Top">
<Fluent:MenuItem Header="矩形工具" Size="Middle" IsCheckable="True" IsChecked="{Binding ShapeDrawMode,Converter={dd:ConverterValueMapToBool Parameter='Rectangle'}, ConverterParameter='Rectangle'}" Icon="{iconPacks:Material Kind=RectangleOutline}" /> <Fluent:MenuItem Header="矩形工具" Size="Middle" IsCheckable="True" IsChecked="{Binding ShapeDrawMode,Converter={dd:ConverterValueMapToBool Parameter='Rectangle'}, ConverterParameter='Rectangle'}" Icon="{iconPacks:Material Kind=RectangleOutline}" />
<Fluent:MenuItem Header="椭圆工具" Size="Middle" IsCheckable="True" IsChecked="{Binding ShapeDrawMode,Converter={dd:ConverterValueMapToBool Parameter='Ellipse'}, ConverterParameter='Ellipse'}" Icon="{iconPacks:Material Kind=EllipseOutline}" /> <Fluent:MenuItem Header="椭圆工具" Size="Middle" IsCheckable="True" IsChecked="{Binding ShapeDrawMode,Converter={dd:ConverterValueMapToBool Parameter='Ellipse'}, ConverterParameter='Ellipse'}" Icon="{iconPacks:Material Kind=EllipseOutline}" />

2
AIStudio.Wpf.DiagramDesigner.Test/ViewModels/TabItem1ViewModel.cs
View File

@@ -75,7 +75,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Test.ViewModels
DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center; DiagramViewModel.CellVerticalAlignment = CellVerticalAlignment.Center;
DiagramViewModel.PageSizeType = PageSizeType.Custom; DiagramViewModel.PageSizeType = PageSizeType.Custom;
DiagramViewModel.PageSize = new Size(double.NaN, double.NaN); DiagramViewModel.PageSize = new Size(double.NaN, double.NaN);
DiagramViewModel.DrawModeViewModel = new DrawModeViewModel() { VectorLineDrawMode = DrawMode.BoundaryConnectingLine }; DiagramViewModel.DrawModeViewModel = new DrawModeViewModel() { LineDrawMode = DrawMode.BoundaryConnectingLine };
DiagramViewModel.PropertyChanged += DiagramViewModel_PropertyChanged; DiagramViewModel.PropertyChanged += DiagramViewModel_PropertyChanged;
} }

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

@@ -25,17 +25,31 @@ namespace AIStudio.Wpf.DiagramDesigner
private Point? rubberbandSelectionStartPoint = null; private Point? rubberbandSelectionStartPoint = null;
private DrawMode VectorLineDrawMode private DrawMode DrawMode
{ {
get get
{ {
if (_viewModel.DrawModeViewModel?.VectorLineDrawMode != null) if (_viewModel.DrawModeViewModel?.LineDrawMode != null)
{ {
return _viewModel.DrawModeViewModel.VectorLineDrawMode; return _viewModel.DrawModeViewModel.LineDrawMode;
} }
else else
{ {
return _service.DrawModeViewModel.VectorLineDrawMode; return _service.DrawModeViewModel.LineDrawMode;
}
}
}
private RouterMode RouterMode
{
get
{
if (_viewModel.DrawModeViewModel?.LineRouterMode != null)
{
return _viewModel.DrawModeViewModel.LineRouterMode;
}
else
{
return _service.DrawModeViewModel.LineRouterMode;
} }
} }
} }
@@ -203,7 +217,7 @@ namespace AIStudio.Wpf.DiagramDesigner
Rect rectangleBounds = sourceConnector.TransformToVisual(this).TransformBounds(new Rect(sourceConnector.RenderSize)); Rect rectangleBounds = sourceConnector.TransformToVisual(this).TransformBounds(new Rect(sourceConnector.RenderSize));
Point point = new Point(rectangleBounds.Left + (rectangleBounds.Width / 2), Point point = new Point(rectangleBounds.Left + (rectangleBounds.Width / 2),
rectangleBounds.Bottom + (rectangleBounds.Height / 2)); rectangleBounds.Bottom + (rectangleBounds.Height / 2));
partialConnection = new ConnectorViewModel(_viewModel, sourceDataItem, new PartCreatedConnectionInfo(point.X, point.Y), VectorLineDrawMode); partialConnection = new ConnectorViewModel(_viewModel, sourceDataItem, new PartCreatedConnectionInfo(point.X, point.Y), DrawMode, RouterMode);
_viewModel.DirectAddItemCommand.Execute(partialConnection); _viewModel.DirectAddItemCommand.Execute(partialConnection);
} }
@@ -225,7 +239,7 @@ namespace AIStudio.Wpf.DiagramDesigner
Rect rectangleBounds = new Rect(sourceConnectorInfo.DataItem.Left, sourceConnectorInfo.DataItem.Top, 3, 3); Rect rectangleBounds = new Rect(sourceConnectorInfo.DataItem.Left, sourceConnectorInfo.DataItem.Top, 3, 3);
Point point = new Point(rectangleBounds.Left + (rectangleBounds.Width / 2), Point point = new Point(rectangleBounds.Left + (rectangleBounds.Width / 2),
rectangleBounds.Bottom + (rectangleBounds.Height / 2)); rectangleBounds.Bottom + (rectangleBounds.Height / 2));
partialConnection = new ConnectorViewModel(_viewModel, sourceConnectorInfo, new PartCreatedConnectionInfo(point.X, point.Y), VectorLineDrawMode); partialConnection = new ConnectorViewModel(_viewModel, sourceConnectorInfo, new PartCreatedConnectionInfo(point.X, point.Y), DrawMode, RouterMode);
_viewModel.DirectAddItemCommand.Execute(partialConnection); _viewModel.DirectAddItemCommand.Execute(partialConnection);
} }
} }
@@ -270,7 +284,7 @@ namespace AIStudio.Wpf.DiagramDesigner
} }
e.Handled = true; e.Handled = true;
if (_service.DrawModeViewModel.GetDrawMode() == DrawMode.ConnectingLine) if (_service.DrawModeViewModel.GetDrawMode() == DrawMode.SmoothConnectingLine)
{ {
if (connectorsHit.Count == 0) if (connectorsHit.Count == 0)
{ {
@@ -362,9 +376,9 @@ namespace AIStudio.Wpf.DiagramDesigner
int indexOfLastTempConnection = sinkDataItem.DataItem.Parent.Items.Count - 1; int indexOfLastTempConnection = sinkDataItem.DataItem.Parent.Items.Count - 1;
sinkDataItem.DataItem.Parent.DirectRemoveItemCommand.Execute( sinkDataItem.DataItem.Parent.DirectRemoveItemCommand.Execute(
sinkDataItem.DataItem.Parent.Items[indexOfLastTempConnection]); sinkDataItem.DataItem.Parent.Items[indexOfLastTempConnection]);
sinkDataItem.DataItem.Parent.AddItemCommand.Execute(new ConnectorViewModel(_viewModel, sourceDataItem, sinkDataItem, VectorLineDrawMode)); sinkDataItem.DataItem.Parent.AddItemCommand.Execute(new ConnectorViewModel(_viewModel, sourceDataItem, sinkDataItem, DrawMode, RouterMode));
} }
else if (_service.DrawModeViewModel.GetDrawMode() == DrawMode.ConnectingLine && connectorsHit.Count() == 1) else if (_service.DrawModeViewModel.GetDrawMode() == DrawMode.SmoothConnectingLine && connectorsHit.Count() == 1)
{ {
LinkPointDesignerItemViewModel pointItemView = new LinkPointDesignerItemViewModel(e.GetPosition(this)); LinkPointDesignerItemViewModel pointItemView = new LinkPointDesignerItemViewModel(e.GetPosition(this));
FullyCreatedConnectorInfo sinkDataItem = pointItemView.TopConnector; FullyCreatedConnectorInfo sinkDataItem = pointItemView.TopConnector;
@@ -373,7 +387,7 @@ namespace AIStudio.Wpf.DiagramDesigner
_viewModel.DirectRemoveItemCommand.Execute(_viewModel.Items[indexOfLastTempConnection]); _viewModel.DirectRemoveItemCommand.Execute(_viewModel.Items[indexOfLastTempConnection]);
_viewModel.DirectAddItemCommand.Execute(pointItemView); _viewModel.DirectAddItemCommand.Execute(pointItemView);
var connector = new ConnectorViewModel(_viewModel, sourceDataItem, sinkDataItem, VectorLineDrawMode); var connector = new ConnectorViewModel(_viewModel, sourceDataItem, sinkDataItem, DrawMode, RouterMode);
_viewModel.AddItemCommand.Execute(connector); _viewModel.AddItemCommand.Execute(connector);
sourceDataItem.DataItem.ZIndex++; sourceDataItem.DataItem.ZIndex++;

59
AIStudio.Wpf.DiagramDesigner/Converters/ConnectionDataConverter.cs
View File

@@ -7,6 +7,7 @@ using System.Windows;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
@@ -26,53 +27,19 @@ namespace AIStudio.Wpf.DiagramDesigner
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{ {
PathGeometry pathGeometry = new PathGeometry(); PathGeometry pathGeometry = new PathGeometry();
//if (values[0] != null) if (values[0] != null)
//{ {
// List<ConnectorPoint> points = (List<ConnectorPoint>)values[0]; List<ConnectorPoint> points = (List<ConnectorPoint>)values[0];
// PathFigure figure = new PathFigure(); PathFigure figure = new PathFigure();
// figure.StartPoint = points[0]; figure.StartPoint = (PointBase)points[0];
// if (values[1]?.ToString() == DrawMode.RadiusConnectingLine.ToString()) for (int i = 0; i < points.Count; i++)
// { {
// for (var i = 0; i < points.Count - 1; i++) LineSegment arc = new LineSegment((PointBase)points[i], true);
// { figure.Segments.Add(arc);
// int current = i, last = i - 1, next = i + 1, next2 = i + 2; }
// if (last == -1) pathGeometry.Figures.Add(figure);
// { }
// last = 0;
// }
// if (next == points.Count)
// {
// next = points.Count - 1;
// }
// if (next2 == points.Count)
// {
// next2 = points.Count - 1;
// }
// var bzs = SegmentHelper.GetBezierSegment(points[current], points[last], points[next], points[next2]);
// figure.Segments.Add(bzs);
// }
// //贝塞尔曲线的简单连接
// //var start = points[0];
// //var end = points.Last();
// //var width = end.X - start.X;
// //var height = end.Y - start.Y;
// //var ctrlPos = 0.382 * width + 0.309 * height;
// //figure.Segments.Add(new BezierSegment(new Point(ctrlPos - 1, 1), new Point(width - ctrlPos + 1, height - 1), new Point(width - 1, height - 1), true));
// }
// else
// {
// for (int i = 0; i < points.Count; i++)
// {
// LineSegment arc = new LineSegment(points[i], true);
// figure.Segments.Add(arc);
// }
// }
// pathGeometry.Figures.Add(figure);
//}
return pathGeometry; return pathGeometry;
} }

22
AIStudio.Wpf.DiagramDesigner/Converters/ConnectionPathConverter.cs
View File

@@ -1,16 +1,17 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
[ValueConversion(typeof(List<Point>), typeof(PathSegmentCollection))] public class ConnectionPathConverter : IMultiValueConverter
public class ConnectionPathConverter : IValueConverter
{ {
static ConnectionPathConverter() static ConnectionPathConverter()
{ {
@@ -23,21 +24,22 @@ namespace AIStudio.Wpf.DiagramDesigner
private set; private set;
} }
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{ {
List<ConnectorPoint> points = (List<ConnectorPoint>)value; GeometryGroup geometryGroup = new GeometryGroup();
PointCollection pointCollection = new PointCollection(); if (values[0] is PathGeneratorResult result)
if (points != null)
{ {
foreach (var point in points) foreach (var path in result.Paths)
{ {
pointCollection.Add(new Point(point.X, point.Y)); PathGeometry pathGeometry = PathGeometry.CreateFromGeometry(Geometry.Parse(path));
geometryGroup.Children.Add(pathGeometry);
} }
} }
return pointCollection;
return geometryGroup;
} }
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }

45
AIStudio.Wpf.DiagramDesigner/Converters/ConnectionPointConverter.cs Normal file
View File

@@ -0,0 +1,45 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Data;
using System.Windows.Media;
using System.Windows.Media.Imaging;
namespace AIStudio.Wpf.DiagramDesigner
{
[ValueConversion(typeof(List<Point>), typeof(PointCollection))]
public class ConnectionPointConverter : IValueConverter
{
static ConnectionPointConverter()
{
Instance = new ConnectionPointConverter();
}
public static ConnectionPointConverter Instance
{
get;
private set;
}
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
List<Point> points = (List<Point>)value;
PointCollection pointCollection = new PointCollection();
if (points != null)
{
foreach (var point in points)
{
pointCollection.Add(new Point(point.X, point.Y));
}
}
return pointCollection;
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

8
AIStudio.Wpf.DiagramDesigner/Enums/DrawMode.cs
View File

@@ -13,10 +13,10 @@ namespace AIStudio.Wpf.DiagramDesigner
Polyline = 4, Polyline = 4,
Polygon = 5, Polygon = 5,
DirectLine = 6, DirectLine = 6,
ConnectingLine = 10, SmoothConnectingLine = 10,
CornerConnectingLine = 11, StraightConnectingLine = 11,
BoundaryConnectingLine = 12, CornerConnectingLine = 12,
RadiusConnectingLine = 13, BoundaryConnectingLine = 13,
Text = 20, Text = 20,
} }
} }

12
AIStudio.Wpf.DiagramDesigner/Enums/RouterMode.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace AIStudio.Wpf.DiagramDesigner
{
public enum RouterMode
{
Normal,
Orthogonal
}
}

2
AIStudio.Wpf.DiagramDesigner/Geometry/BezierSpline.cs → AIStudio.Wpf.DiagramDesigner/Geometrys/BezierSpline.cs
View File

@@ -1,6 +1,6 @@
using System; using System;
namespace AIStudio.Wpf.DiagramDesigner.Geometry namespace AIStudio.Wpf.DiagramDesigner.Geometrys
{ {
/// <summary> /// <summary>
/// Bezier Spline methods /// Bezier Spline methods

2
AIStudio.Wpf.DiagramDesigner/Geometry/EllipseBase.cs → AIStudio.Wpf.DiagramDesigner/Geometrys/EllipseBase.cs
View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace AIStudio.Wpf.DiagramDesigner.Geometry namespace AIStudio.Wpf.DiagramDesigner.Geometrys
{ {
public class EllipseBase : IShape public class EllipseBase : IShape
{ {

2
AIStudio.Wpf.DiagramDesigner/Geometry/IShape.cs → AIStudio.Wpf.DiagramDesigner/Geometrys/IShape.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace AIStudio.Wpf.DiagramDesigner.Geometry namespace AIStudio.Wpf.DiagramDesigner.Geometrys
{ {
public interface IShape public interface IShape
{ {

10
AIStudio.Wpf.DiagramDesigner/Geometry/LineBase.cs → AIStudio.Wpf.DiagramDesigner/Geometrys/LineBase.cs
View File

@@ -1,4 +1,4 @@
namespace AIStudio.Wpf.DiagramDesigner.Geometry namespace AIStudio.Wpf.DiagramDesigner.Geometrys
{ {
public struct LineBase public struct LineBase
{ {
@@ -11,7 +11,7 @@
public PointBase Start { get; } public PointBase Start { get; }
public PointBase End { get; } public PointBase End { get; }
public PointBase GetIntersection(LineBase line) public PointBase? GetIntersection(LineBase line)
{ {
var pt1Dir = new PointBase(End.X - Start.X, End.Y - Start.Y); var pt1Dir = new PointBase(End.X - Start.X, End.Y - Start.Y);
var pt2Dir = new PointBase(line.End.X - line.Start.X, line.End.Y - line.Start.Y); var pt2Dir = new PointBase(line.End.X - line.Start.X, line.End.Y - line.Start.Y);
@@ -21,18 +21,18 @@
var beta = (deltaPt.X * pt1Dir.Y) - (deltaPt.Y * pt1Dir.X); var beta = (deltaPt.X * pt1Dir.Y) - (deltaPt.Y * pt1Dir.X);
if (det == 0 || alpha * det < 0 || beta * det < 0) if (det == 0 || alpha * det < 0 || beta * det < 0)
return PointBase.Empty; return null;
if (det > 0) if (det > 0)
{ {
if (alpha > det || beta > det) if (alpha > det || beta > det)
return PointBase.Empty; return null;
} }
else else
{ {
if (alpha < det || beta < det) if (alpha < det || beta < det)
return PointBase.Empty; return null;
} }
return new PointBase(Start.X + (alpha * pt1Dir.X / det), Start.Y + (alpha * pt1Dir.Y / det)); return new PointBase(Start.X + (alpha * pt1Dir.X / det), Start.Y + (alpha * pt1Dir.Y / det));

2
AIStudio.Wpf.DiagramDesigner/Geometry/PointBase.cs → AIStudio.Wpf.DiagramDesigner/Geometrys/PointBase.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
namespace AIStudio.Wpf.DiagramDesigner.Geometry namespace AIStudio.Wpf.DiagramDesigner.Geometrys
{ {
[Serializable] [Serializable]
public struct PointBase : IFormattable public struct PointBase : IFormattable

10
AIStudio.Wpf.DiagramDesigner/Geometry/RectangleBase.cs → AIStudio.Wpf.DiagramDesigner/Geometrys/RectangleBase.cs
View File

@@ -1,12 +1,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace AIStudio.Wpf.DiagramDesigner.Geometry namespace AIStudio.Wpf.DiagramDesigner.Geometrys
{ {
[Serializable] [Serializable]
public struct RectangleBase : IShape, IFormattable public struct RectangleBase : IShape, IFormattable
{ {
public static RectangleBase Zero { get; } = new RectangleBase(0, 0, 0, 0); public static RectangleBase Zero { get; } = new RectangleBase(0, 0, 0, 0, true);
public RectangleBase(double left, double top, double right, double bottom, bool lefttoprightbottom) public RectangleBase(double left, double top, double right, double bottom, bool lefttoprightbottom)
{ {
@@ -85,7 +85,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Geometry
} }
public RectangleBase InflateRectangle(double horizontal, double vertical) public RectangleBase InflateRectangle(double horizontal, double vertical)
=> new RectangleBase(Left - horizontal, Top - vertical, Right + horizontal, Bottom + vertical); => new RectangleBase(Left - horizontal, Top - vertical, Right + horizontal, Bottom + vertical, true);
public RectangleBase UnionRectangle(RectangleBase r) public RectangleBase UnionRectangle(RectangleBase r)
{ {
@@ -93,7 +93,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Geometry
var x2 = Math.Max(Left + Width, r.Left + r.Width); var x2 = Math.Max(Left + Width, r.Left + r.Width);
var y1 = Math.Min(Top, r.Top); var y1 = Math.Min(Top, r.Top);
var y2 = Math.Max(Top + Height, r.Top + r.Height); var y2 = Math.Max(Top + Height, r.Top + r.Height);
return new RectangleBase(x1, y1, x2, y2); return new RectangleBase(x1, y1, x2, y2, true);
} }
public bool ContainsPoint(PointBase point) => ContainsPoint(point.X, point.Y); public bool ContainsPoint(PointBase point) => ContainsPoint(point.X, point.Y);
@@ -114,7 +114,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Geometry
{ {
var intersectionPt = borders[i].GetIntersection(line); var intersectionPt = borders[i].GetIntersection(line);
if (intersectionPt != null) if (intersectionPt != null)
yield return intersectionPt; yield return intersectionPt.Value;
} }
} }

2
AIStudio.Wpf.DiagramDesigner/Geometry/Shapes.cs → AIStudio.Wpf.DiagramDesigner/Geometrys/Shapes.cs
View File

@@ -1,6 +1,6 @@
using AIStudio.Wpf.DiagramDesigner.Models; using AIStudio.Wpf.DiagramDesigner.Models;
namespace AIStudio.Wpf.DiagramDesigner.Geometry namespace AIStudio.Wpf.DiagramDesigner.Geometrys
{ {
public delegate IShape ShapeDefiner(DesignerItemViewModelBase node); public delegate IShape ShapeDefiner(DesignerItemViewModelBase node);

2
AIStudio.Wpf.DiagramDesigner/Geometry/SizeBase.cs → AIStudio.Wpf.DiagramDesigner/Geometrys/SizeBase.cs
View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Windows; using System.Windows;
namespace AIStudio.Wpf.DiagramDesigner.Geometry namespace AIStudio.Wpf.DiagramDesigner.Geometrys
{ {
[Serializable] [Serializable]
public struct SizeBase : IFormattable public struct SizeBase : IFormattable

2
AIStudio.Wpf.DiagramDesigner/Geometry/VectorBase.cs → AIStudio.Wpf.DiagramDesigner/Geometrys/VectorBase.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace AIStudio.Wpf.DiagramDesigner.Geometry namespace AIStudio.Wpf.DiagramDesigner.Geometrys
{ {
[Serializable] [Serializable]
public struct VectorBase : IFormattable public struct VectorBase : IFormattable

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

@@ -1,4 +1,4 @@
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {

14
AIStudio.Wpf.DiagramDesigner/Models/ConnectorInfo.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
@@ -13,5 +13,17 @@ namespace AIStudio.Wpf.DiagramDesigner
public SizeBase DesignerItemSize { get; set; } public SizeBase DesignerItemSize { get; set; }
public PointBase Position { get; set; } public PointBase Position { get; set; }
public ConnectorOrientation Orientation { get; set; } public ConnectorOrientation Orientation { get; set; }
public static ConnectorInfo GetConnectorInfo(ConnectorOrientation orientation, double left, double top, double width, double height, PointBase position)
{
return new ConnectorInfo()
{
Orientation = orientation,
DesignerItemSize = new SizeBase(width, height),
DesignerItemLeft = left,
DesignerItemTop = top,
Position = position
};
}
} }
} }

51
AIStudio.Wpf.DiagramDesigner/Models/GlobalType.cs Normal file
View File

@@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
namespace AIStudio.Wpf.DiagramDesigner
{
/// <summary>
///
/// </summary>
public static class GlobalType
{
static GlobalType()
{
string rootPath = System.AppDomain.CurrentDomain.BaseDirectory;
AllAssemblies = Directory.GetFiles(rootPath, "*.dll")
.Where(x => AssemblyPattern.Any(y => new FileInfo(x).Name.Contains(y)))
.Select(x => Assembly.LoadFrom(x))
.Where(x => !x.IsDynamic)
.ToList();
AllAssemblies.ForEach(aAssembly => {
try
{
AllTypes.AddRange(aAssembly.GetTypes());
}
catch
{
}
});
}
/// <summary>
/// 解决方案程序集匹配名
/// </summary>
public static readonly List<string> AssemblyPattern = new List<string> { "AIStudio" };
/// <summary>
/// 解决方案所有程序集
/// </summary>
public static readonly List<Assembly> AllAssemblies;
/// <summary>
/// 解决方案所有自定义类
/// </summary>
public static readonly List<Type> AllTypes = new List<Type>();
}
}

64
AIStudio.Wpf.DiagramDesigner/Models/Serializables/ConnectionItem.cs
View File

@@ -17,10 +17,33 @@ namespace AIStudio.Wpf.DiagramDesigner
{ {
} }
//public ConnectionItem(Guid id, Guid sourceId, ConnectorOrientation sourceOrientation, Type sourceType, double sourceXRatio, double sourceYRatio, bool sourceInnerPoint,
// Guid sinkId, ConnectorOrientation sinkOrientation, Type sinkType, double sinkXRatio, double sinkYRatio, bool sinkInnerPoint, public ConnectionItem(ConnectorViewModel viewmodel) : base(viewmodel)
// int zIndex, bool isGroup, Guid parentId, DrawMode vectorLineDrawMode, ColorViewModel colorViewModel, FontViewModel fontViewModel) : base(id, zIndex, isGroup, parentId, colorViewModel, fontViewModel) {
this.SourceId = viewmodel.SourceConnectorInfo.DataItem.Id;
this.SourceOrientation = viewmodel.SourceConnectorInfo.Orientation;
this.SourceType = viewmodel.SourceConnectorInfo.DataItem.GetType();
this.SourceTypeName = viewmodel.SourceConnectorInfo.DataItem.GetType().FullName;
this.SourceXRatio = viewmodel.SourceConnectorInfo.GetXRatioFromConnector();
this.SourceYRatio = viewmodel.SourceConnectorInfo.GetYRatioFromConnector();
this.SourceInnerPoint = viewmodel.SourceConnectorInfo.IsInnerPoint;
this.SinkId = viewmodel.SinkConnectorInfoFully.DataItem.Id;
this.SinkOrientation = viewmodel.SinkConnectorInfoFully.Orientation;
this.SinkType = viewmodel.SinkConnectorInfoFully.DataItem.GetType();
this.SinkTypeName = viewmodel.SinkConnectorInfoFully.DataItem.GetType().FullName;
this.SinkXRatio = viewmodel.SinkConnectorInfoFully.GetXRatioFromConnector();
this.SinkYRatio = viewmodel.SinkConnectorInfoFully.GetYRatioFromConnector();
this.SinkInnerPoint = viewmodel.SinkConnectorInfoFully.IsInnerPoint;
this.RouterMode = viewmodel.RouterMode;
this.PathMode = viewmodel.PathMode;
}
//public ConnectionItem(Guid sourceId, ConnectorOrientation sourceOrientation, Type sourceType, double sourceXRatio, double sourceYRatio, bool sourceInnerPoint,
// Guid sinkId, ConnectorOrientation sinkOrientation, Type sinkType, double sinkXRatio, double sinkYRatio, bool sinkInnerPoint, ConnectorViewModel viewmodel) : base(viewmodel)
//{ //{
// this.SourceId = sourceId; // this.SourceId = sourceId;
// this.SourceOrientation = sourceOrientation; // this.SourceOrientation = sourceOrientation;
// this.SourceType = sourceType; // this.SourceType = sourceType;
@@ -36,30 +59,10 @@ namespace AIStudio.Wpf.DiagramDesigner
// this.SinkXRatio = sinkXRatio; // this.SinkXRatio = sinkXRatio;
// this.SinkYRatio = sinkYRatio; // this.SinkYRatio = sinkYRatio;
// this.SinkInnerPoint = sinkInnerPoint; // this.SinkInnerPoint = sinkInnerPoint;
// this.VectorLineDrawMode = vectorLineDrawMode; // this.RouterMode = viewmodel.RouterMode;
// this.DrawMode = viewmodel.DrawMode;
//} //}
public ConnectionItem(Guid sourceId, ConnectorOrientation sourceOrientation, Type sourceType, double sourceXRatio, double sourceYRatio, bool sourceInnerPoint,
Guid sinkId, ConnectorOrientation sinkOrientation, Type sinkType, double sinkXRatio, double sinkYRatio, bool sinkInnerPoint, ConnectorViewModel viewmodel) : base(viewmodel)
{
this.SourceId = sourceId;
this.SourceOrientation = sourceOrientation;
this.SourceType = sourceType;
this.SourceTypeName = sourceType.FullName;
this.SourceXRatio = sourceXRatio;
this.SourceYRatio = sourceYRatio;
this.SourceInnerPoint = sourceInnerPoint;
this.SinkId = sinkId;
this.SinkOrientation = sinkOrientation;
this.SinkType = sinkType;
this.SinkTypeName = sinkType.FullName;
this.SinkXRatio = sinkXRatio;
this.SinkYRatio = sinkYRatio;
this.SinkInnerPoint = sinkInnerPoint;
this.VectorLineDrawMode = viewmodel.VectorLineDrawMode;
}
[XmlAttribute] [XmlAttribute]
public Guid SourceId { get; set; } public Guid SourceId { get; set; }
@@ -103,6 +106,15 @@ namespace AIStudio.Wpf.DiagramDesigner
public bool SinkInnerPoint { get; set; } public bool SinkInnerPoint { get; set; }
[XmlAttribute] [XmlAttribute]
public DrawMode VectorLineDrawMode { get; set; } public string RouterMode
{
get; set;
}
[XmlAttribute]
public string PathMode
{
get; set;
}
} }
} }

2
AIStudio.Wpf.DiagramDesigner/Models/ToolBoxData.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
namespace AIStudio.Wpf.DiagramDesigner.Helpers namespace AIStudio.Wpf.DiagramDesigner
{ {
public class ToolBoxData public class ToolBoxData
{ {

2
AIStudio.Wpf.DiagramDesigner/PathFinder/BoundaryPathFinder.cs
View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {

2
AIStudio.Wpf.DiagramDesigner/PathFinder/IPathFinder.cs
View File

@@ -1,6 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {

2
AIStudio.Wpf.DiagramDesigner/PathFinder/OrthogonalPathFinder.cs
View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows.Controls; using System.Windows.Controls;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {

2
AIStudio.Wpf.DiagramDesigner/PathFinder/StraightLinePathFinder.cs
View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {

12
AIStudio.Wpf.DiagramDesigner/PathGenerators/IPathGenerator.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner
{
public interface IPathGenerator
{
PathGeneratorResult Get(IDiagramViewModel _, ConnectorViewModel link, PointBase[] route, PointBase source, PointBase target);
}
}

2
AIStudio.Wpf.DiagramDesigner/PathGenerators/PathGeneratorResult.cs
View File

@@ -1,4 +1,4 @@
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {

9
AIStudio.Wpf.DiagramDesigner/PathGenerators/PathGenerators.Smooth.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using AIStudio.Wpf.DiagramDesigner.Geometry; using System.Linq;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
@@ -21,6 +22,8 @@ namespace AIStudio.Wpf.DiagramDesigner
sourceAngle = SourceMarkerAdjustement(route, (double)link.ColorViewModel.LeftArrowSizeStyle); sourceAngle = SourceMarkerAdjustement(route, (double)link.ColorViewModel.LeftArrowSizeStyle);
targetAngle = TargetMarkerAdjustement(route, (double)link.ColorViewModel.RightArrowPathStyle); targetAngle = TargetMarkerAdjustement(route, (double)link.ColorViewModel.RightArrowPathStyle);
DoShift(route, link);
var path = FormattableString.Invariant($"M {route[0].X} {route[0].Y} C {route[1].X} {route[1].Y}, {route[2].X} {route[2].Y}, {route[3].X} {route[3].Y}"); var path = FormattableString.Invariant($"M {route[0].X} {route[0].Y} C {route[1].X} {route[1].Y}, {route[2].X} {route[2].Y}, {route[3].X} {route[3].Y}");
return new PathGeneratorResult(new[] { path }, sourceAngle, route[0], targetAngle, route[route.Length - 1]); return new PathGeneratorResult(new[] { path }, sourceAngle, route[0], targetAngle, route[route.Length - 1]);
} }
@@ -33,7 +36,7 @@ namespace AIStudio.Wpf.DiagramDesigner
sourceAngle = SourceMarkerAdjustement(route, (double)link.ColorViewModel.LeftArrowSizeStyle); sourceAngle = SourceMarkerAdjustement(route, (double)link.ColorViewModel.LeftArrowSizeStyle);
targetAngle = TargetMarkerAdjustement(route, (double)link.ColorViewModel.RightArrowPathStyle); targetAngle = TargetMarkerAdjustement(route, (double)link.ColorViewModel.RightArrowPathStyle);
Geometry.BezierSpline.GetCurveControlPoints(route, out var firstControlPoints, out var secondControlPoints); BezierSpline.GetCurveControlPoints(route, out var firstControlPoints, out var secondControlPoints);
var paths = new string[firstControlPoints.Length]; var paths = new string[firstControlPoints.Length];
for (var i = 0; i < firstControlPoints.Length; i++) for (var i = 0; i < firstControlPoints.Length; i++)
@@ -88,5 +91,7 @@ namespace AIStudio.Wpf.DiagramDesigner
default: return new PointBase(cX, cY); default: return new PointBase(cX, cY);
}; };
} }
} }
} }

4
AIStudio.Wpf.DiagramDesigner/PathGenerators/PathGenerators.Straight.cs
View File

@@ -1,5 +1,5 @@
using System; using System;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
@@ -14,6 +14,8 @@ namespace AIStudio.Wpf.DiagramDesigner
sourceAngle = SourceMarkerAdjustement(route, (double)link.ColorViewModel.LeftArrowSizeStyle); sourceAngle = SourceMarkerAdjustement(route, (double)link.ColorViewModel.LeftArrowSizeStyle);
targetAngle = TargetMarkerAdjustement(route, (double)link.ColorViewModel.RightArrowPathStyle); targetAngle = TargetMarkerAdjustement(route, (double)link.ColorViewModel.RightArrowPathStyle);
DoShift(route, link);
var paths = new string[route.Length - 1]; var paths = new string[route.Length - 1];
for (var i = 0; i < route.Length - 1; i++) for (var i = 0; i < route.Length - 1; i++)
{ {

17
AIStudio.Wpf.DiagramDesigner/PathGenerators/PathGenerators.Utils.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using AIStudio.Wpf.DiagramDesigner.Geometry; using System.Linq;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
@@ -28,8 +29,20 @@ namespace AIStudio.Wpf.DiagramDesigner
var result = new PointBase[route.Length + 2]; var result = new PointBase[route.Length + 2];
result[0] = source; result[0] = source;
route.CopyTo(result, 1); route.CopyTo(result, 1);
result[route.Length - 1] = target; result[result.Length - 1] = target;
return result; return result;
} }
private static void DoShift(PointBase[] points, ConnectorViewModel link)
{
double left = link.Area.Left;
double top = link.Area.Top;
for (int i = 0; i < points.Length; i++)
{
points[i].X = points[i].X - left;
points[i].Y = points[i].Y - top;
}
}
} }
} }

15
AIStudio.Wpf.DiagramDesigner/PathGenerators/SmoothPathGenerator.cs Normal file
View File

@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner
{
public class SmoothPathGenerator : IPathGenerator
{
public PathGeneratorResult Get(IDiagramViewModel _, ConnectorViewModel link, PointBase[] route, PointBase source, PointBase target)
{
return PathGenerators.Smooth(_, link, route, source, target);
}
}
}

15
AIStudio.Wpf.DiagramDesigner/PathGenerators/StraightPathGenerator.cs Normal file
View File

@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner
{
public class StraightPathGenerator : IPathGenerator
{
public PathGeneratorResult Get(IDiagramViewModel _, ConnectorViewModel link, PointBase[] route, PointBase source, PointBase target)
{
return PathGenerators.Straight(_, link, route, source, target);
}
}
}

12
AIStudio.Wpf.DiagramDesigner/Routers/IRouter.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner
{
public interface IRouter
{
PointBase[] Get(IDiagramViewModel _, ConnectorViewModel link);
}
}

15
AIStudio.Wpf.DiagramDesigner/Routers/NormalRouter.cs Normal file
View File

@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner
{
public class NormalRouter : IRouter
{
public PointBase[] Get(IDiagramViewModel _, ConnectorViewModel link)
{
return Routers.Normal(_, link);
}
}
}

15
AIStudio.Wpf.DiagramDesigner/Routers/OrthogonalRouter.cs Normal file
View File

@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner
{
public class OrthogonalRouter : IRouter
{
public PointBase[] Get(IDiagramViewModel _, ConnectorViewModel link)
{
return Routers.Orthogonal(_, link);
}
}
}

2
AIStudio.Wpf.DiagramDesigner/Routers/Routers.Normal.cs
View File

@@ -1,5 +1,5 @@
using System.Linq; using System.Linq;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {

10
AIStudio.Wpf.DiagramDesigner/Routers/Routers.Orthogonal.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
// Implementation taken from the JS version: https://gist.github.com/menendezpoo/4a8894c152383b9d7a870c24a04447e4 // Implementation taken from the JS version: https://gist.github.com/menendezpoo/4a8894c152383b9d7a870c24a04447e4
// Todo: Make it more c#, Benchmark A* vs Dijkstra, Add more options // Todo: Make it more c#, Benchmark A* vs Dijkstra, Add more options
@@ -122,12 +122,12 @@ namespace AIStudio.Wpf.DiagramDesigner
{ {
foreach (var x in verticals) foreach (var x in verticals)
{ {
result.Set(row, column++, new RectangleBase(lastX, lastY, x, y)); result.Set(row, column++, new RectangleBase(lastX, lastY, x, y, true));
lastX = x; lastX = x;
} }
// Last cell of the row // Last cell of the row
result.Set(row, column, new RectangleBase(lastX, lastY, bounds.Right, y)); result.Set(row, column, new RectangleBase(lastX, lastY, bounds.Right, y, true));
lastX = bounds.Left; lastX = bounds.Left;
lastY = y; lastY = y;
column = 0; column = 0;
@@ -139,12 +139,12 @@ namespace AIStudio.Wpf.DiagramDesigner
// Last fow of cells // Last fow of cells
foreach (var x in verticals) foreach (var x in verticals)
{ {
result.Set(row, column++, new RectangleBase(lastX, lastY, x, bounds.Bottom)); result.Set(row, column++, new RectangleBase(lastX, lastY, x, bounds.Bottom, true));
lastX = x; lastX = x;
} }
// Last cell of last row // Last cell of last row
result.Set(row, column, new RectangleBase(lastX, lastY, bounds.Right, bounds.Bottom)); result.Set(row, column, new RectangleBase(lastX, lastY, bounds.Right, bounds.Bottom, true));
return result; return result;
} }

4
AIStudio.Wpf.DiagramDesigner/Routers/Routers.Utils.cs
View File

@@ -1,4 +1,4 @@
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
using AIStudio.Wpf.DiagramDesigner.Models; using AIStudio.Wpf.DiagramDesigner.Models;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
@@ -7,7 +7,7 @@ namespace AIStudio.Wpf.DiagramDesigner
{ {
public static PointBase GetPortPositionBasedOnAlignment(ConnectorInfoBase port) public static PointBase GetPortPositionBasedOnAlignment(ConnectorInfoBase port)
{ {
var pt = port.Position; var pt = port.Location.Position;
switch (port.Orientation) switch (port.Orientation)
{ {
case ConnectorOrientation.Top: case ConnectorOrientation.Top:

6
AIStudio.Wpf.DiagramDesigner/Themes/DesignerItem.xaml
View File

@@ -78,7 +78,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<Polyline <Polyline
Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}" Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPointConverter.Instance}}"
Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
StrokeThickness="{Binding ColorViewModel.LineWidth}" StrokeThickness="{Binding ColorViewModel.LineWidth}"
Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}" Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
@@ -93,7 +93,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<Polygon <Polygon
Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}" Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPointConverter.Instance}}"
Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
StrokeThickness="{Binding ColorViewModel.LineWidth}" StrokeThickness="{Binding ColorViewModel.LineWidth}"
Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}" Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
@@ -108,7 +108,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<Polyline <Polyline
Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}" Points="{Binding ConnectionPoints, Converter={x:Static s:ConnectionPointConverter.Instance}}"
Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
StrokeThickness="{Binding ColorViewModel.LineWidth}" StrokeThickness="{Binding ColorViewModel.LineWidth}"
Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}" Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"

15
AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
View File

@@ -540,21 +540,20 @@
<Canvas.InputBindings> <Canvas.InputBindings>
<MouseBinding MouseAction="LeftDoubleClick" Command="{Binding EditCommand}" CommandParameter="{Binding }" /> <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding EditCommand}" CommandParameter="{Binding }" />
</Canvas.InputBindings> </Canvas.InputBindings>
<Polyline x:Name="poly" <!--<Polyline x:Name="poly"
Points="{Binding Path=ConnectionPoints, Converter={x:Static s:ConnectionPathConverter.Instance}}" Points="{Binding Path=ConnectionPoints, Converter={x:Static s:ConnectionPointConverter.Instance}}"
Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
StrokeThickness="{Binding ColorViewModel.LineWidth}" StrokeThickness="{Binding ColorViewModel.LineWidth}"
StrokeDashArray="{Binding ColorViewModel.LineDashStyle,Converter={StaticResource LineDashConverter}}" /> StrokeDashArray="{Binding ColorViewModel.LineDashStyle,Converter={StaticResource LineDashConverter}}" />-->
<!--<Path x:Name="poly" Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" <Path x:Name="poly" Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
StrokeThickness="{Binding ColorViewModel.LineWidth}" StrokeThickness="{Binding ColorViewModel.LineWidth}"
StrokeDashArray="{Binding ColorViewModel.LineDashStyle,Converter={StaticResource LineDashConverter}}"> StrokeDashArray="{Binding ColorViewModel.LineDashStyle,Converter={StaticResource LineDashConverter}}">
<Path.Data> <Path.Data>
<MultiBinding Converter="{x:Static s:ConnectionDataConverter.Instance}"> <MultiBinding Converter="{x:Static s:ConnectionPathConverter.Instance}">
<Binding Path="ConnectionPoints"/> <Binding Path="PathGeneratorResult"/>
<Binding Path="VectorLineDrawMode"/>
</MultiBinding> </MultiBinding>
</Path.Data> </Path.Data>
</Path>--> </Path>
<Path x:Name="rightarrow" <Path x:Name="rightarrow"
Data="{Binding ColorViewModel.RightArrowPathStyle,Converter={StaticResource ArrowPathConverter}}" Data="{Binding ColorViewModel.RightArrowPathStyle,Converter={StaticResource ArrowPathConverter}}"
Visibility="{Binding Path=IsFullConnection, Converter={x:Static s:BoolToVisibilityConverter.Instance}}" Visibility="{Binding Path=IsFullConnection, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"

48
AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/DrawModeViewModel.cs
View File

@@ -12,9 +12,9 @@ namespace AIStudio.Wpf.DiagramDesigner
{ {
return CursorDrawMode; return CursorDrawMode;
} }
else if (VectorLineDrawModeSelected) else if (LineDrawModeSelected)
{ {
return VectorLineDrawMode; return LineDrawMode;
} }
else if (ShapeDrawModeSelected) else if (ShapeDrawModeSelected)
{ {
@@ -52,16 +52,29 @@ namespace AIStudio.Wpf.DiagramDesigner
} }
} }
private bool _vectorLineDrawModeSelected; private bool _lineDrawModeSelected;
public bool VectorLineDrawModeSelected public bool LineDrawModeSelected
{ {
get get
{ {
return _vectorLineDrawModeSelected; return _lineDrawModeSelected;
} }
set set
{ {
SetProperty(ref _vectorLineDrawModeSelected, value); SetProperty(ref _lineDrawModeSelected, value);
}
}
private bool _vectorRouterModeSelected;
public bool LineRouterModeSelected
{
get
{
return _vectorRouterModeSelected;
}
set
{
SetProperty(ref _vectorRouterModeSelected, value);
} }
} }
@@ -105,17 +118,30 @@ namespace AIStudio.Wpf.DiagramDesigner
} }
} }
private DrawMode _vectorLineDrawMode = DrawMode.CornerConnectingLine; private DrawMode _lineDrawMode = DrawMode.CornerConnectingLine;
public DrawMode VectorLineDrawMode public DrawMode LineDrawMode
{ {
get get
{ {
return _vectorLineDrawMode; return _lineDrawMode;
} }
set set
{ {
SetProperty(ref _vectorLineDrawMode, value); SetProperty(ref _lineDrawMode, value);
VectorLineDrawModeSelected = true; LineDrawModeSelected = true;
}
}
private RouterMode _lineRouterMode = RouterMode.Normal;
public RouterMode LineRouterMode
{
get
{
return _lineRouterMode;
}
set
{
SetProperty(ref _lineRouterMode, value);
} }
} }

16
AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IDrawModeViewModel.cs
View File

@@ -11,7 +11,19 @@ namespace AIStudio.Wpf.DiagramDesigner
void ResetDrawMode(); void ResetDrawMode();
CursorMode CursorMode { get; set; } CursorMode CursorMode
DrawMode VectorLineDrawMode { get; set; } {
get; set;
}
DrawMode LineDrawMode
{
get; set;
}
RouterMode LineRouterMode
{
get; set;
}
} }
} }

4
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectorInfoBase.cs
View File

@@ -4,13 +4,13 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
public abstract class ConnectorInfoBase : BindableBase public abstract class ConnectorInfoBase : BindableBase
{ {
public virtual PointBase Position public virtual ConnectorPoint Location
{ {
get; get;
} }

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectorPoint.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {

313
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectorViewModel.cs
View File

@@ -4,51 +4,62 @@ using System.ComponentModel;
using System.Linq; using System.Linq;
//using System.Windows; //using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
using AIStudio.Wpf.DiagramDesigner.Helpers; using AIStudio.Wpf.DiagramDesigner.Helpers;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
public class ConnectorViewModel : SelectableDesignerItemViewModelBase public class ConnectorViewModel : SelectableDesignerItemViewModelBase
{ {
public ConnectorViewModel(IDiagramViewModel parent, FullyCreatedConnectorInfo sourceConnectorInfo, FullyCreatedConnectorInfo sinkConnectorInfo, public ConnectorViewModel(IDiagramViewModel parent, FullyCreatedConnectorInfo sourceConnectorInfo, ConnectorInfoBase sinkConnectorInfo, DrawMode drawMode, RouterMode routerMode)
SelectableDesignerItemBase designer, DrawMode vectorLineDrawMode) : base(parent, designer)
{
VectorLineDrawMode = vectorLineDrawMode;
Init(sourceConnectorInfo, sinkConnectorInfo);
}
public ConnectorViewModel(IDiagramViewModel parent, FullyCreatedConnectorInfo sourceConnectorInfo, ConnectorInfoBase sinkConnectorInfo, DrawMode vectorLineDrawMode)
{ {
Parent = parent; Parent = parent;
VectorLineDrawMode = vectorLineDrawMode; PathMode = drawMode.ToString().Replace("ConnectingLine","");
RouterMode = routerMode.ToString();
Init(sourceConnectorInfo, sinkConnectorInfo); Init(sourceConnectorInfo, sinkConnectorInfo);
} }
public ConnectorViewModel( FullyCreatedConnectorInfo sourceConnectorInfo, ConnectorInfoBase sinkConnectorInfo, DrawMode vectorLineDrawMode):this(null, sourceConnectorInfo, sinkConnectorInfo, vectorLineDrawMode) public ConnectorViewModel(IDiagramViewModel parent, FullyCreatedConnectorInfo sourceConnectorInfo, FullyCreatedConnectorInfo sinkConnectorInfo, ConnectionItem designer) : base(parent, designer)
{
PathMode = designer.PathMode;
RouterMode = designer.RouterMode;
Init(sourceConnectorInfo, sinkConnectorInfo);
}
public ConnectorViewModel(FullyCreatedConnectorInfo sourceConnectorInfo, ConnectorInfoBase sinkConnectorInfo, DrawMode drawMode, RouterMode routerMode) :this(null, sourceConnectorInfo, sinkConnectorInfo, drawMode, routerMode)
{ {
} }
private void Init(FullyCreatedConnectorInfo sourceConnectorInfo, ConnectorInfoBase sinkConnectorInfo)
{
this.Parent = sourceConnectorInfo.DataItem.Parent;
var routetype = GlobalType.AllTypes.Where(p => typeof(IRouter).IsAssignableFrom(p)).FirstOrDefault(p => p.Name == RouterMode);
Router = routetype != null ? (System.Activator.CreateInstance(routetype) as IRouter) : new NormalRouter();
var pathGeneratortype = GlobalType.AllTypes.Where(p => typeof(IPathGenerator).IsAssignableFrom(p)).FirstOrDefault(p => p.Name == PathMode);
PathGenerator = pathGeneratortype != null ? (System.Activator.CreateInstance(pathGeneratortype) as IPathGenerator) : new SmoothPathGenerator();
this.SourceConnectorInfo = sourceConnectorInfo;
this.SinkConnectorInfo = sinkConnectorInfo;
DeleteConnectionCommand = new SimpleCommand(DeleteConnection);
if (Parent != null && Parent.ColorViewModel != null)
{
this.ColorViewModel = CopyHelper.Mapper(Parent.ColorViewModel);
}
if (sinkConnectorInfo is FullyCreatedConnectorInfo sink && sink.DataItem.ShowArrow == false)
{
this.ColorViewModel.RightArrowPathStyle = ArrowPathStyle.None;
}
}
public override SelectableDesignerItemBase ToXmlObject() public override SelectableDesignerItemBase ToXmlObject()
{ {
if (IsFullConnection) if (IsFullConnection)
{ {
ConnectionItem connection = new ConnectionItem( ConnectionItem connection = new ConnectionItem(this);
SourceConnectorInfo.DataItem.Id,
SourceConnectorInfo.Orientation,
SourceConnectorInfo.DataItem.GetType(),
GetXRatioFromConnector(SourceConnectorInfo),
GetYRatioFromConnector(SourceConnectorInfo),
SourceConnectorInfo.IsInnerPoint,
SinkConnectorInfoFully.DataItem.Id,
SinkConnectorInfoFully.Orientation,
SinkConnectorInfoFully.DataItem.GetType(),
GetXRatioFromConnector(SinkConnectorInfoFully),
GetYRatioFromConnector(SinkConnectorInfoFully),
SinkConnectorInfoFully.IsInnerPoint,
this);
return connection; return connection;
} }
@@ -63,11 +74,6 @@ namespace AIStudio.Wpf.DiagramDesigner
return typeof(ConnectionItem); return typeof(ConnectionItem);
} }
public IPathFinder PathFinder
{
get; set;
}
private PointBase _sourceA; private PointBase _sourceA;
public PointBase SourceA public PointBase SourceA
{ {
@@ -165,11 +171,39 @@ namespace AIStudio.Wpf.DiagramDesigner
} }
} }
public DrawMode VectorLineDrawMode public string PathMode
{ {
get; set; get; set;
} }
public string RouterMode
{
get; set;
}
public IRouter Router
{
get; set;
}
public IPathGenerator PathGenerator
{
get; set;
}
private PathGeneratorResult _pathGeneratorResult;
public PathGeneratorResult PathGeneratorResult
{
get
{
return _pathGeneratorResult;
}
private set
{
SetProperty(ref _pathGeneratorResult, value);
}
}
//待完善这两处 //待完善这两处
public List<LinkVertexModel> Vertices { get; } = new List<LinkVertexModel>(); public List<LinkVertexModel> Vertices { get; } = new List<LinkVertexModel>();
public List<LinkLabelModel> Labels { get; set; } = new List<LinkLabelModel>(); public List<LinkLabelModel> Labels { get; set; } = new List<LinkLabelModel>();
@@ -185,20 +219,6 @@ namespace AIStudio.Wpf.DiagramDesigner
} }
} }
public ConnectorInfo ConnectorInfo(ConnectorOrientation orientation, double left, double top, double width, double height, PointBase position)
{
return new ConnectorInfo()
{
Orientation = orientation,
DesignerItemSize = new SizeBase(width, height),
DesignerItemLeft = left,
DesignerItemTop = top,
Position = position
};
}
private FullyCreatedConnectorInfo _sourceConnectorInfo; private FullyCreatedConnectorInfo _sourceConnectorInfo;
public FullyCreatedConnectorInfo SourceConnectorInfo public FullyCreatedConnectorInfo SourceConnectorInfo
{ {
@@ -227,15 +247,11 @@ namespace AIStudio.Wpf.DiagramDesigner
{ {
if (SetProperty(ref _sinkConnectorInfo, value)) if (SetProperty(ref _sinkConnectorInfo, value))
{ {
SourceB = _sinkConnectorInfo.Location;
if (_sinkConnectorInfo is FullyCreatedConnectorInfo) if (_sinkConnectorInfo is FullyCreatedConnectorInfo)
{ {
SourceB = PointHelper.GetPointForConnector((FullyCreatedConnectorInfo)_sinkConnectorInfo);
(((FullyCreatedConnectorInfo)_sinkConnectorInfo).DataItem as INotifyPropertyChanged).PropertyChanged += new WeakINPCEventHandler(ConnectorViewModel_PropertyChanged).Handler; (((FullyCreatedConnectorInfo)_sinkConnectorInfo).DataItem as INotifyPropertyChanged).PropertyChanged += new WeakINPCEventHandler(ConnectorViewModel_PropertyChanged).Handler;
} }
else
{
SourceB = SinkConnectorInfoPart.Position;
}
} }
} }
} }
@@ -256,11 +272,11 @@ namespace AIStudio.Wpf.DiagramDesigner
} }
} }
public ConnectorPoint OnGoingPosition public PointBase OnGoingPosition
{ {
get get
{ {
return SinkConnectorInfoPart?.Position; return SinkConnectorInfoPart?.Location?.MiddlePosition ?? PointBase.Zero;
} }
} }
@@ -274,52 +290,6 @@ namespace AIStudio.Wpf.DiagramDesigner
public bool IsPortless => SourceConnectorInfo?.DataItem?.Connectors?.Count() == 0; public bool IsPortless => SourceConnectorInfo?.DataItem?.Connectors?.Count() == 0;
public double GetXRatioFromConnector(FullyCreatedConnectorInfo info)
{
if (info.IsInnerPoint)
{
return info.XRatio;
}
else
{
switch (info.Orientation)
{
case ConnectorOrientation.Top:
return 0.5;
case ConnectorOrientation.Left:
return 0;
case ConnectorOrientation.Bottom:
return 0.5;
case ConnectorOrientation.Right:
return 1;
default: return info.XRatio;
}
}
}
public double GetYRatioFromConnector(FullyCreatedConnectorInfo info)
{
if (info.IsInnerPoint)
{
return info.YRatio;
}
else
{
switch (info.Orientation)
{
case ConnectorOrientation.Top:
return 0;
case ConnectorOrientation.Left:
return 0.5;
case ConnectorOrientation.Bottom:
return 1;
case ConnectorOrientation.Right:
return 0.5;
default: return info.YRatio;
}
}
}
private void UpdateArea() private void UpdateArea()
{ {
Area = new RectangleBase(SourceA, SourceB); Area = new RectangleBase(SourceA, SourceB);
@@ -327,13 +297,17 @@ namespace AIStudio.Wpf.DiagramDesigner
private void UpdateConnectionPoints() private void UpdateConnectionPoints()
{ {
ConnectionPoints = PathFinder.UpdateConnectionPoints(Parent, SourceA, SourceB, SourceConnectorInfo, SinkConnectorInfo); //ConnectionPoints = PathFinder.UpdateConnectionPoints(Parent, SourceA, SourceB, SourceConnectorInfo, SinkConnectorInfo);
StartPoint = ConnectionPoints.First(); //StartPoint = ConnectionPoints.First();
EndPoint = ConnectionPoints.Last(); //EndPoint = ConnectionPoints.Last();
//var router = Routers.Normal(Parent, this); var route = Router.Get(Parent, this);
//var pathGenerator = PathGenerators.Smooth(Parent, this, router, SourceA, SourceB);
(var source, var target) = FindConnectionPoints(route);
if (source == null || target == null)
return;
PathGeneratorResult = PathGenerator.Get(Parent, this, route, source.Value, target.Value);
} }
private void ConnectorViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e) private void ConnectorViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -366,35 +340,6 @@ namespace AIStudio.Wpf.DiagramDesigner
} }
} }
private void Init(FullyCreatedConnectorInfo sourceConnectorInfo, ConnectorInfoBase sinkConnectorInfo)
{
this.Parent = sourceConnectorInfo.DataItem.Parent;
if (VectorLineDrawMode == DrawMode.ConnectingLine)
{
PathFinder = new StraightLinePathFinder();
}
else if (VectorLineDrawMode == DrawMode.BoundaryConnectingLine)
{
PathFinder = new BoundaryPathFinder();
}
else
{
PathFinder = new OrthogonalPathFinder();
}
this.SourceConnectorInfo = sourceConnectorInfo;
this.SinkConnectorInfo = sinkConnectorInfo;
DeleteConnectionCommand = new SimpleCommand(DeleteConnection);
if (Parent != null && Parent.ColorViewModel != null)
{
this.ColorViewModel = CopyHelper.Mapper(Parent.ColorViewModel);
}
if (sinkConnectorInfo is FullyCreatedConnectorInfo sink && sink.DataItem.ShowArrow == false)
{
this.ColorViewModel.RightArrowPathStyle = ArrowPathStyle.None;
}
}
public SimpleCommand DeleteConnectionCommand public SimpleCommand DeleteConnectionCommand
{ {
get; set; get; set;
@@ -461,34 +406,82 @@ namespace AIStudio.Wpf.DiagramDesigner
} }
} }
//private (PointInfoBase source, PointInfoBase target) FindConnectionPoints(PointInfoBase[] route) private (PointBase? source, PointBase? target) FindConnectionPoints(PointBase[] route)
//{ {
// if (IsPortless) // Portless if (IsPortless) // Portless
// { {
// if (SourceConnectorInfo.DataItem == null || (IsFullConnection && SinkConnectorInfoFully.DataItem == null)) if (SourceConnectorInfo.DataItem == null || (IsFullConnection && SinkConnectorInfoFully.DataItem == null))
// return (null, null); return (null, null);
var sourceCenter = SourceConnectorInfo.DataItem.GetBounds().Center;
var targetCenter = SinkConnectorInfoFully?.DataItem?.GetBounds().Center ?? OnGoingPosition;
var firstPt = route.Length > 0 ? route[0] : targetCenter;
var secondPt = route.Length > 0 ? route[0] : sourceCenter;
var sourceLine = new LineBase(firstPt, sourceCenter);
var targetLine = new LineBase(secondPt, targetCenter);
var sourceIntersections = SourceConnectorInfo.DataItem.GetShape().GetIntersectionsWithLine(sourceLine);
var targetIntersections = SinkConnectorInfoFully.DataItem.GetShape()?.GetIntersectionsWithLine(targetLine) ?? new PointBase[] { OnGoingPosition };
var sourceIntersection = GetClosestPointTo(sourceIntersections, firstPt);
var targetIntersection = GetClosestPointTo(targetIntersections, secondPt);
return (sourceIntersection ?? sourceCenter, targetIntersection ?? targetCenter);
}
else
{
var source = GetPortPositionBasedOnAlignment(SourceConnectorInfo, ColorViewModel.LeftArrowSizeStyle);
var target = GetPortPositionBasedOnAlignment(SinkConnectorInfoFully, ColorViewModel.RightArrowSizeStyle);
return (source, target ?? OnGoingPosition);
}
}
private PointBase? GetPortPositionBasedOnAlignment(ConnectorInfoBase port, ArrowSizeStyle marker)
{
if (port == null)
return null;
if (marker == null)
return port.Location.MiddlePosition;
var pt = port.Location.Position;
switch (port.Orientation)
{
case ConnectorOrientation.Top:
return new PointBase(pt.X + port.ConnectorWidth / 2, pt.Y);
case ConnectorOrientation.TopRight:
return new PointBase(pt.X + port.ConnectorWidth, pt.Y);
case ConnectorOrientation.Right:
return new PointBase(pt.X + port.ConnectorWidth, pt.Y + port.ConnectorHeight / 2);
case ConnectorOrientation.BottomRight:
return new PointBase(pt.X + port.ConnectorWidth, pt.Y + port.ConnectorHeight);
case ConnectorOrientation.Bottom:
return new PointBase(pt.X + port.ConnectorWidth / 2, pt.Y + port.ConnectorHeight);
case ConnectorOrientation.BottomLeft:
return new PointBase(pt.X, pt.Y + port.ConnectorHeight);
case ConnectorOrientation.Left:
return new PointBase(pt.X, pt.Y + port.ConnectorHeight / 2);
default:
return pt;
}
}
private PointBase? GetClosestPointTo(IEnumerable<PointBase> points, PointBase point)
{
var minDist = double.MaxValue;
PointBase? minPoint = null;
foreach (var pt in points)
{
var dist = pt.DistanceTo(point);
if (dist < minDist)
{
minDist = dist;
minPoint = pt;
}
}
return minPoint;
}
// var sourceCenter = SourceConnectorInfo.DataItem.GetBounds().Center;
// var targetCenter = SinkConnectorInfoFully?.DataItem?.GetBounds().Center ?? SinkConnectorInfoFully.Position;
// var firstPt = route.Length > 0 ? route[0] : targetCenter;
// var secondPt = route.Length > 0 ? route[0] : sourceCenter;
// var sourceLine = new Line(firstPt, sourceCenter);
// var targetLine = new Line(secondPt, targetCenter);
// var sourceIntersections = Link.SourceNode.GetShape().GetIntersectionsWithLine(sourceLine);
// var targetIntersections = Link.TargetNode.GetShape().GetIntersectionsWithLine(targetLine);
// var sourceIntersection = GetClosestPointTo(sourceIntersections, firstPt);
// var targetIntersection = GetClosestPointTo(targetIntersections, secondPt);
// return (sourceIntersection ?? sourceCenter, targetIntersection ?? targetCenter);
// }
// else
// {
// if (!Link.SourcePort.Initialized || Link.TargetPort?.Initialized == false)
// return (null, null);
// var source = GetPortPositionBasedOnAlignment(Link.SourcePort, Link.SourceMarker);
// var target = GetPortPositionBasedOnAlignment(Link.TargetPort, Link.TargetMarker);
// return (source, target ?? Link.OnGoingPosition);
// }
//}
} }
} }

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

@@ -7,7 +7,7 @@ using System.Windows;
using System.Linq; using System.Linq;
using System.Reactive.Linq; using System.Reactive.Linq;
using AIStudio.Wpf.DiagramDesigner.Models; using AIStudio.Wpf.DiagramDesigner.Models;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
@@ -15,14 +15,17 @@ namespace AIStudio.Wpf.DiagramDesigner
{ {
public DesignerItemViewModelBase() : base() public DesignerItemViewModelBase() : base()
{ {
ShapeDefiner = Shapes.Rectangle;
} }
public DesignerItemViewModelBase(IDiagramViewModel parent, DesignerItemBase designer) : base(parent, designer) public DesignerItemViewModelBase(IDiagramViewModel parent, DesignerItemBase designer) : base(parent, designer)
{ {
ShapeDefiner = Shapes.Rectangle;
} }
public DesignerItemViewModelBase(IDiagramViewModel parent, string json) : base(parent, json) public DesignerItemViewModelBase(IDiagramViewModel parent, string json) : base(parent, json)
{ {
ShapeDefiner = Shapes.Rectangle;
} }
protected override void Init() protected override void Init()
@@ -415,21 +418,23 @@ namespace AIStudio.Wpf.DiagramDesigner
public RectangleBase GetBounds(bool includePorts = false) public RectangleBase GetBounds(bool includePorts = false)
{ {
if (!includePorts) if (!includePorts)
return new RectangleBase(Left, Top, ItemWidth, ItemHeight); return new RectangleBase(Position, Size);
var leftPort = LeftConnector; var leftPort = LeftConnector;
var topPort = TopConnector; var topPort = TopConnector;
var rightPort = RightConnector; var rightPort = RightConnector;
var bottomPort = BottomConnector; var bottomPort = BottomConnector;
var left = leftPort == null ? Left: Math.Min(Left, leftPort.Position.X); var left = leftPort == null ? Position.X: Math.Min(Position.X, leftPort.Location.Position.X);
var top = topPort == null ? Top : Math.Min(Left, topPort.Position.Y); var top = topPort == null ? Position.Y : Math.Min(Position.Y, topPort.Location.Position.Y);
var right = rightPort == null ? Left + ItemWidth : var right = rightPort == null ? Position.X + ItemWidth :
Math.Max(rightPort.Position.X + rightPort.ConnectorWidth, Left + ItemWidth); Math.Max(rightPort.Location.Position.X + rightPort.ConnectorWidth, Position.X + ItemWidth);
var bottom = bottomPort == null ? Top + ItemHeight : var bottom = bottomPort == null ? Position.Y + ItemHeight :
Math.Max(bottomPort.Position.Y + bottomPort.ConnectorHeight, Top + ItemHeight); Math.Max(bottomPort.Location.Position.Y + bottomPort.ConnectorHeight, Position.Y + ItemHeight);
return new RectangleBase(left, top, right, bottom); return new RectangleBase(left, top, right, bottom, true);
} }
public IShape GetShape() => ShapeDefiner(this);
} }
} }

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

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
using System.Windows; using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
using AIStudio.Wpf.DiagramDesigner.Helpers; using AIStudio.Wpf.DiagramDesigner.Helpers;
using AIStudio.Wpf.DiagramDesigner.Models; using AIStudio.Wpf.DiagramDesigner.Models;
using Newtonsoft.Json; using Newtonsoft.Json;
@@ -1489,7 +1489,7 @@ namespace AIStudio.Wpf.DiagramDesigner
ConnectorOrientation sinkConnectorOrientation = connectionItem.SinkOrientation; ConnectorOrientation sinkConnectorOrientation = connectionItem.SinkOrientation;
FullyCreatedConnectorInfo sinkConnectorInfo = GetFullConnectorInfo(connectionItem.Id, sinkItem, sinkConnectorOrientation, connectionItem.SinkXRatio, connectionItem.SinkYRatio, connectionItem.SinkInnerPoint); FullyCreatedConnectorInfo sinkConnectorInfo = GetFullConnectorInfo(connectionItem.Id, sinkItem, sinkConnectorOrientation, connectionItem.SinkXRatio, connectionItem.SinkYRatio, connectionItem.SinkInnerPoint);
ConnectorViewModel connectionVM = new ConnectorViewModel(this, sourceConnectorInfo, sinkConnectorInfo, connectionItem, connectionItem.VectorLineDrawMode); ConnectorViewModel connectionVM = new ConnectorViewModel(this, sourceConnectorInfo, sinkConnectorInfo, connectionItem);
connectors.Add(connectionVM); connectors.Add(connectionVM);
DesignerItemViewModelBase textItem = items.OfType<DesignerItemViewModelBase>().FirstOrDefault(x => x.ParentId == connectionItem.Id); DesignerItemViewModelBase textItem = items.OfType<DesignerItemViewModelBase>().FirstOrDefault(x => x.ParentId == connectionItem.Id);

50
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/FullyCreatedConnectorInfo.cs
View File

@@ -3,13 +3,13 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
public class FullyCreatedConnectorInfo : ConnectorInfoBase public class FullyCreatedConnectorInfo : ConnectorInfoBase
{ {
public override PointBase Position public override ConnectorPoint Location
{ {
get get
{ {
@@ -152,6 +152,52 @@ namespace AIStudio.Wpf.DiagramDesigner
return menuOptions; return menuOptions;
} }
} }
public double GetXRatioFromConnector()
{
if (IsInnerPoint)
{
return XRatio;
}
else
{
switch (Orientation)
{
case ConnectorOrientation.Top:
return 0.5;
case ConnectorOrientation.Left:
return 0;
case ConnectorOrientation.Bottom:
return 0.5;
case ConnectorOrientation.Right:
return 1;
default: return XRatio;
}
}
}
public double GetYRatioFromConnector()
{
if (IsInnerPoint)
{
return YRatio;
}
else
{
switch (Orientation)
{
case ConnectorOrientation.Top:
return 0;
case ConnectorOrientation.Left:
return 0.5;
case ConnectorOrientation.Bottom:
return 1;
case ConnectorOrientation.Right:
return 0.5;
default: return YRatio;
}
}
}
} }

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/LinkVertexModel.cs
View File

@@ -1,4 +1,4 @@
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {

10
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/PartCreatedConnectionInfo.cs
View File

@@ -3,24 +3,24 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner namespace AIStudio.Wpf.DiagramDesigner
{ {
public class PartCreatedConnectionInfo : ConnectorInfoBase public class PartCreatedConnectionInfo : ConnectorInfoBase
{ {
private PointBase position; private ConnectorPoint location;
public override PointBase Position public override ConnectorPoint Location
{ {
get get
{ {
return position; return location;
} }
} }
public PartCreatedConnectionInfo(double X, double Y) : base(ConnectorOrientation.None) public PartCreatedConnectionInfo(double X, double Y) : base(ConnectorOrientation.None)
{ {
this.position = new PointBase(X, Y); this.location = new ConnectorPoint(X, Y);
} }
} }
} }

4
AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs
View File

@@ -8,7 +8,7 @@ using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using AIStudio.Wpf.DiagramDesigner; using AIStudio.Wpf.DiagramDesigner;
using AIStudio.Wpf.DiagramDesigner.Geometry; using AIStudio.Wpf.DiagramDesigner.Geometrys;
using AIStudio.Wpf.Flowchart.Models; using AIStudio.Wpf.Flowchart.Models;
namespace AIStudio.Wpf.Flowchart.Controls namespace AIStudio.Wpf.Flowchart.Controls
@@ -41,7 +41,7 @@ namespace AIStudio.Wpf.Flowchart.Controls
_diagramViewModel.PageSizeType = PageSizeType.Custom; _diagramViewModel.PageSizeType = PageSizeType.Custom;
_diagramViewModel.PageSize = new SizeBase(double.NaN, double.NaN); _diagramViewModel.PageSize = new SizeBase(double.NaN, double.NaN);
_diagramViewModel.ColorViewModel = new ColorViewModel() { LineWidth = 2 }; _diagramViewModel.ColorViewModel = new ColorViewModel() { LineWidth = 2 };
//_diagramViewModel.DrawModeViewModel = new DrawModeViewModel() { VectorLineDrawMode = DrawMode.BoundaryConnectingLine }; //_diagramViewModel.DrawModeViewModel = new DrawModeViewModel() { LineDrawMode = DrawMode.BoundaryConnectingLine };
_diagramViewModel.PropertyChanged += DiagramViewModel_PropertyChanged; _diagramViewModel.PropertyChanged += DiagramViewModel_PropertyChanged;
} }

2
AIStudio.Wpf.Flowchart/Models/DiagramDataExtention.cs
View File

@@ -225,7 +225,7 @@ namespace AIStudio.Wpf.Flowchart.Models
{ {
FullyCreatedConnectorInfo sourceConnectorInfo = sourceNode.Connectors.FirstOrDefault(p => p.Orientation.ToString() == diagramLink.SourcePortAlignment); FullyCreatedConnectorInfo sourceConnectorInfo = sourceNode.Connectors.FirstOrDefault(p => p.Orientation.ToString() == diagramLink.SourcePortAlignment);
FullyCreatedConnectorInfo sinkConnectorInfo = targetNode.Connectors.FirstOrDefault(p => p.Orientation.ToString() == diagramLink.TargetPortAlignment); FullyCreatedConnectorInfo sinkConnectorInfo = targetNode.Connectors.FirstOrDefault(p => p.Orientation.ToString() == diagramLink.TargetPortAlignment);
ConnectorViewModel linkModel = new ConnectorViewModel(diagram, sourceConnectorInfo, sinkConnectorInfo, diagram.DrawModeViewModel?.VectorLineDrawMode ?? DrawMode.BoundaryConnectingLine); ConnectorViewModel linkModel = new ConnectorViewModel(diagram, sourceConnectorInfo, sinkConnectorInfo, diagram.DrawModeViewModel?.LineDrawMode ?? DrawMode.SmoothConnectingLine, diagram.DrawModeViewModel?.LineRouterMode ?? RouterMode.Normal);
linkModel.Id = new Guid(diagramLink.Id); linkModel.Id = new Guid(diagramLink.Id);
linkModel.ColorViewModel.LineColor.Color = SerializeHelper.DeserializeColor(diagramLink.Color); linkModel.ColorViewModel.LineColor.Color = SerializeHelper.DeserializeColor(diagramLink.Color);
linkModel.ColorViewModel.LineWidth = diagramLink.Width; linkModel.ColorViewModel.LineWidth = diagramLink.Width;

2
AIStudio.Wpf.SFC/Models/SFCToolBoxData.cs
View File

@@ -1,6 +1,6 @@
using System; using System;
using System.Windows.Media; using System.Windows.Media;
using AIStudio.Wpf.DiagramDesigner.Helpers; using AIStudio.Wpf.DiagramDesigner;
namespace AIStudio.Wpf.SFC.Models namespace AIStudio.Wpf.SFC.Models
{ {