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-05-14 15:06:30 +08:00
parent 9ade5a0fda
commit 58359c36d4
22 changed files with 1013 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
AIStudio.Wpf.DiagramDesigner/Adorners/DrawingRubberbandAdorner.cs
View File

@@ -7,6 +7,7 @@ using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Resources;
using System.Windows.Shapes;
using AIStudio.Wpf.DiagramDesigner.ViewModels;
using AIStudio.Wpf.DiagramDesigner.ViewModels.BaseViewModel;
@@ -57,21 +58,21 @@ namespace AIStudio.Wpf.DiagramDesigner
this._designerCanvas = designerCanvas;
this._designerCanvas.Focus();
if (DrawMode == DrawMode.Eraser)
if (DrawMode >= DrawMode.Eraser && DrawMode <= DrawMode.EraserPreview)
{
_drawingDesignerItem = new EraserDrawingDesignerItemViewModel(_viewModel, dragStartPoint);
if (DrawMode == DrawMode.Eraser)
{
_drawingDesignerItem = new EraserDrawingDesignerItemViewModel(_viewModel, dragStartPoint);
}
if (DrawMode == DrawMode.EraserPreview)
{
_drawingDesignerItem = new EraserPreviewDrawingDesignerItemViewModel(_viewModel, dragStartPoint);
}
_rubberbandBrush = null;
_rubberbandPen = new Pen(new SolidColorBrush(Colors.Red) { Opacity = 0.5 }, _drawingDesignerItem.ColorViewModel.LineWidth);
}
else if (DrawMode == DrawMode.EraserPreview)
{
_drawingDesignerItem = new EraserPreviewDrawingDesignerItemViewModel(_viewModel, dragStartPoint);
_rubberbandBrush = null;
_rubberbandPen = new Pen(new SolidColorBrush(Colors.Red) { Opacity = 0.5 }, _drawingDesignerItem.ColorViewModel.LineWidth);
}
else if (DrawMode >= DrawMode.ColorPicker && DrawMode <= DrawMode.ErasableDirectLine)
else if (DrawMode >= DrawMode.ColorPicker && DrawMode <= DrawMode.ErasableHeart)
{
if (DrawMode == DrawMode.ErasableLine)
{
@@ -102,8 +103,14 @@ namespace AIStudio.Wpf.DiagramDesigner
_drawingDesignerItem = new TextDrawingDesignerItemViewModel(_viewModel, dragStartPoint, true);
}
else if (DrawMode == DrawMode.ColorPicker)
{
{
_drawingDesignerItem = new ColorPickerDrawingDesignerItemViewModel(_viewModel, dragStartPoint, true);
StreamResourceInfo sri = Application.GetResourceStream(new Uri("pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Images/color-picker.cur", UriKind.RelativeOrAbsolute));
this.Cursor = new Cursor(sri.Stream);
}
else
{
_drawingDesignerItem = new SharpDrawingDesignerItemViewModel(_viewModel, DrawMode, dragStartPoint, true);
}
_rubberbandBrush = null;//ColorObject.ToBrush(_drawingDesignerItem.ColorViewModel.FillColor);