diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs index 6f4fbaf..ea0c975 100644 --- a/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs +++ b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs @@ -63,7 +63,7 @@ namespace AIStudio.Wpf.DiagramDesigner Point point = sourceDataItem.MiddlePosition; - partialConnection = new ConnectionViewModel(_viewModel, sourceDataItem, new PartCreatedConnectorInfo(point.X, point.Y), DrawMode, RouterMode); + partialConnection = new ConnectionViewModel(_viewModel, sourceDataItem, new PartCreatedConnectorInfo(point.X, point.Y), LineDrawMode, RouterMode); _viewModel.Add(partialConnection); partialConnection.ZIndex = -1; @@ -106,6 +106,22 @@ namespace AIStudio.Wpf.DiagramDesigner } } } + + private DrawMode LineDrawMode + { + get + { + if (_viewModel.DrawModeViewModel != null) + { + return _viewModel.DrawModeViewModel.LineDrawMode; + } + else + { + return _service.DrawModeViewModel.LineDrawMode; + } + } + } + private RouterMode RouterMode { get @@ -496,7 +512,7 @@ namespace AIStudio.Wpf.DiagramDesigner ConnectorInfoBase sinkDataItem = SinkConnector.Info; _viewModel.Remove(partialConnection); - _viewModel.AddItemCommand.Execute(new ConnectionViewModel(_viewModel, sourceDataItem, sinkDataItem, DrawMode, RouterMode)); + _viewModel.AddItemCommand.Execute(new ConnectionViewModel(_viewModel, sourceDataItem, sinkDataItem, LineDrawMode, RouterMode)); } else if (partialConnection.IsFullConnection)//自动连接模式 { @@ -508,7 +524,7 @@ namespace AIStudio.Wpf.DiagramDesigner ConnectorInfoBase sinkDataItem = new PartCreatedConnectorInfo(currentPoint.X, currentPoint.Y); _viewModel.Remove(partialConnection); - _viewModel.AddItemCommand.Execute(new ConnectionViewModel(_viewModel, sourceDataItem, sinkDataItem, DrawMode, RouterMode)); + _viewModel.AddItemCommand.Execute(new ConnectionViewModel(_viewModel, sourceDataItem, sinkDataItem, LineDrawMode, RouterMode)); } else { diff --git a/Images/66.gif b/Images/66.gif new file mode 100644 index 0000000..a58953a Binary files /dev/null and b/Images/66.gif differ diff --git a/Images/drawing.png b/Images/drawing.png new file mode 100644 index 0000000..86b7068 Binary files /dev/null and b/Images/drawing.png differ diff --git a/README.md b/README.md index 6f058ff..e801b6e 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,19 @@ 友情提示 很多朋友老问为什么编译不过去,您需要安装对应的net版本,或者修改工程的net版本,如下图。 ![输入图片说明](Images/help.png) +## 2023年5月17日更新内容(做一个画笔画笔) +![输入图片说明](Images/drawing.png) +[1] 画笔实现 +[2] 封闭画笔实现 +[3] 钢笔实现 +[4] 文字画笔 +[5] 直线,矩形,椭圆 +[6] Path形状 +[7] 取色器 +[8] 三种画笔可选 + +![输入图片说明](Images/66.gif) + ## 2023年5月1号更新内容(做一个可编程画板): ![输入图片说明](Images/55.gif)