From 6de36f2473e1a758287b45f53701916e43020b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=89=BE=E7=AB=B9?= <akwkevin@126.com>
Date: Tue, 2 May 2023 17:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E7=BA=BF=E4=BC=98=E5=8C=961=EF=BC=9A?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=92=8C=E7=BB=93=E6=9D=9F=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controls/DesignerCanvas.cs                |  1 +
 .../Routers/Routers.Normal.cs                 |  2 +-
 .../UserControls/DiagramControl.xaml          | 46 ++++++++++++++++++-
 .../UserControls/LineControl.xaml             |  4 +-
 .../BaseViewModel/ConnectionViewModel.cs      | 35 +++++++++++++-
 .../Connector/ConnectorPointModel.cs          |  2 +-
 .../Connector/ConnectorVertexModel.cs         | 18 ++++++++
 7 files changed, 100 insertions(+), 8 deletions(-)

diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
index 2273d7e..e2f2fd4 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
@@ -62,6 +62,7 @@ namespace AIStudio.Wpf.DiagramDesigner
                     partialConnection = new ConnectionViewModel(_viewModel, sourceDataItem, new PartCreatedConnectorInfo(point.X, point.Y), DrawMode, RouterMode);
 
                     _viewModel.Add(partialConnection);
+                    partialConnection.ZIndex = -1;
                 }
             }
         }
diff --git a/AIStudio.Wpf.DiagramDesigner/Routers/Routers.Normal.cs b/AIStudio.Wpf.DiagramDesigner/Routers/Routers.Normal.cs
index 70b6291..1178974 100644
--- a/AIStudio.Wpf.DiagramDesigner/Routers/Routers.Normal.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Routers/Routers.Normal.cs
@@ -7,7 +7,7 @@ namespace AIStudio.Wpf.DiagramDesigner
     {
         public static PointBase[] Normal(IDiagramViewModel _, ConnectionViewModel link)
         {
-            return link.Vertices.Select(v => v.MiddlePosition).ToArray();
+            return link.Vertices.Where(p => p.ConnectorVertexType == ConnectorVertexType.None).Select(v => v.MiddlePosition).ToArray();
         }
     }
 }
diff --git a/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
index 37201b4..1e4eff3 100644
--- a/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
@@ -157,12 +157,54 @@
                         <ControlTemplate TargetType="{x:Type dd:PointConnector}">
                             <Grid Width="{Binding ConnectorWidth}" Height="{Binding ConnectorHeight}">
                                 <!-- transparent extra space makes connector easier to hit -->
-                                <Ellipse Fill="Transparent" Margin="-2" />
-                                <Ellipse Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"  StrokeThickness="1" Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" />
+                                <Ellipse Fill="Transparent" Margin="-3" />
+                                <Ellipse Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"  
+                                         StrokeThickness="1" 
+                                         Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}" />
                             </Grid>
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding ConnectorVertexType}" Value="Start">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type dd:PointConnector}">
+                                    <Grid Width="{Binding ConnectorWidth}" 
+                                          Height="{Binding ConnectorHeight}"
+                                          UseLayoutRounding="True"
+                                          SnapsToDevicePixels="True">
+                                        <Ellipse Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
+                                              StrokeThickness="1"
+                                              Margin="-2.5"/>
+                                        <Rectangle 
+                                              Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
+                                              Margin="1"/>
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding ConnectorVertexType}" Value="End">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type dd:PointConnector}">
+                                    <Grid Width="{Binding ConnectorWidth}" 
+                                          Height="{Binding ConnectorHeight}"
+                                          UseLayoutRounding="True"
+                                          SnapsToDevicePixels="True">
+                                        <Ellipse Stroke="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
+                                              StrokeThickness="1"
+                                              Margin="-2.5"/>
+                                        <Ellipse 
+                                              Fill="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
+                                              Margin="1"/>
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </DataTrigger>
+                </Style.Triggers>
             </Style>
 
             <Style x:Key="GifImageConnectorContainer" TargetType="{x:Type dd:ConnectorContainer}">
diff --git a/AIStudio.Wpf.DiagramDesigner/UserControls/LineControl.xaml b/AIStudio.Wpf.DiagramDesigner/UserControls/LineControl.xaml
index 620548c..35d66b4 100644
--- a/AIStudio.Wpf.DiagramDesigner/UserControls/LineControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/LineControl.xaml
@@ -71,7 +71,7 @@
                 </Path>
             </Grid>
 
-            <Grid Canvas.Left="{Binding StartPoint.X}" 
+            <!--<Grid Canvas.Left="{Binding StartPoint.X}" 
                   Canvas.Top="{Binding StartPoint.Y}"                 
                   Width="{Binding SourceConnectorInfo.ConnectorWidth}"
                   Height="{Binding SourceConnectorInfo.ConnectorHeight}"
@@ -99,7 +99,7 @@
                 <Ellipse 
                           Fill="DarkRed"
                           Margin="1"/>
-            </Grid>
+            </Grid>-->
 
             <Path x:Name="ball"
                       Stretch="Fill"
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectionViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectionViewModel.cs
index 56ec027..b71e62b 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectionViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectionViewModel.cs
@@ -72,6 +72,7 @@ namespace AIStudio.Wpf.DiagramDesigner
 
             this.SourceConnectorInfo = sourceConnectorInfo;
             this.SinkConnectorInfo = sinkConnectorInfo;
+            
 
             DeleteConnectionCommand = new SimpleCommand(Command_Enable, DeleteConnection);
             AddVertexCommand = new SimpleCommand(Command_Enable, AddVertex);
@@ -612,8 +613,37 @@ namespace AIStudio.Wpf.DiagramDesigner
 
             StartAngle = PathGeneratorResult.SourceMarkerAngle;
             EndAngle = PathGeneratorResult.TargetMarkerAngle;
-            StartPoint = new PointBase(source.Value.X - Area.Left - SourceConnectorInfo.ConnectorWidth / 2, source.Value.Y - Area.Top - SourceConnectorInfo.ConnectorHeight / 2) ;
-            EndPoint = new PointBase(target.Value.X - Area.Left - SinkConnectorInfo.ConnectorWidth / 2 , target.Value.Y - Area.Top - SinkConnectorInfo.ConnectorHeight / 2 );
+            //StartPoint = new PointBase(source.Value.X - Area.Left - SourceConnectorInfo.ConnectorWidth / 2, source.Value.Y - Area.Top - SourceConnectorInfo.ConnectorHeight / 2) ;
+            //EndPoint = new PointBase(target.Value.X - Area.Left - SinkConnectorInfo.ConnectorWidth / 2 , target.Value.Y - Area.Top - SinkConnectorInfo.ConnectorHeight / 2 );
+
+            StartPoint = new PointBase(source.Value.X - Area.Left , source.Value.Y - Area.Top );
+            EndPoint = new PointBase(target.Value.X - Area.Left , target.Value.Y - Area.Top);
+
+            var startVertice = Vertices.FirstOrDefault(p => p.ConnectorVertexType == ConnectorVertexType.Start);
+            if (startVertice == null)
+            {
+                startVertice = new ConnectorVertexModel(this, StartPoint) { ConnectorVertexType = ConnectorVertexType.Start };
+                startVertice.ColorViewModel.FillColor.Color = Colors.DarkRed;
+                startVertice.ColorViewModel.LineColor.Color = Colors.DarkRed;
+                Vertices.Add(startVertice);
+            }
+            else
+            {
+                startVertice.SetPosition(StartPoint);
+            }
+
+            var endVertice = Vertices.FirstOrDefault(p => p.ConnectorVertexType == ConnectorVertexType.End);
+            if (endVertice == null)
+            {
+                endVertice = new ConnectorVertexModel(this, EndPoint) { ConnectorVertexType = ConnectorVertexType.End };
+                endVertice.ColorViewModel.FillColor.Color = Colors.DarkRed;
+                endVertice.ColorViewModel.LineColor.Color = Colors.DarkRed;
+                Vertices.Add(endVertice);
+            }
+            else
+            {
+                endVertice.SetPosition(EndPoint);
+            }
 
             var paths = Labels.Count > 0 ? PathGeneratorResult.Paths.Select(p => new SvgPath(p)).ToArray() : Array.Empty<SvgPath>();
             foreach (var label in Labels)
@@ -821,6 +851,7 @@ namespace AIStudio.Wpf.DiagramDesigner
                 pointBase = new PointBase(pointBase.X - Area.Left, pointBase.Y - Area.Top);
             }
             var vertice = new ConnectorVertexModel(this, pointBase);
+            vertice.ColorViewModel.LineColor.Color = Colors.Blue;
             vertice.PropertyChanged += new WeakINPCEventHandler(Item_PropertyChanged).Handler;
             Vertices.Add(vertice);
             UpdatePathGeneratorResult();
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorPointModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorPointModel.cs
index 9457f6c..088b693 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorPointModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorPointModel.cs
@@ -73,7 +73,7 @@ namespace AIStudio.Wpf.DiagramDesigner
                 ConnectorWidth = designer.ConnectorWidth;
                 ConnectorHeight = designer.ConnectorHeight;
             }
-        }
+        }      
 
         /// <summary>
         /// 中间X
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorVertexModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorVertexModel.cs
index cfe1403..0e0f810 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorVertexModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/ConnectorVertexModel.cs
@@ -51,6 +51,11 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         }
 
+        public ConnectorVertexType ConnectorVertexType
+        {
+            get; set;
+        }
+
         public ConnectionViewModel Connector
         {
             get
@@ -82,5 +87,18 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
+        public void SetPosition(PointBase position)
+        {
+            X = position.X;
+            Y = position.Y;
+        }
+
+    }
+
+    public enum ConnectorVertexType
+    {
+        None,
+        Start,
+        End,
     }
 }