From c135a7f1448d2fdb73118ee426178960f0fcf998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=89=BE=E7=AB=B9?= <akwkevin@126.com>
Date: Wed, 3 May 2023 16:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83=E7=9A=84?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AAitem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controls/DragThumb.cs                     |  5 -
 .../DesignerItemsControlItemStyleSelector.cs  | 10 --
 .../UserControls/DiagramControl.xaml          | 92 -------------------
 .../LinkPointDesignerItemViewModel.cs         | 41 ---------
 .../PointDesignerItemViewModel.cs             | 53 -----------
 5 files changed, 201 deletions(-)
 delete mode 100644 AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LinkPointDesignerItemViewModel.cs
 delete mode 100644 AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/PointDesignerItemViewModel.cs

diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs b/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
index 4addae6..2e9fcf5 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
@@ -58,11 +58,6 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
                     }
                 }
 
-                if (designerItem is PointDesignerItemViewModel)
-                {
-                    designerItems = new List<SelectableDesignerItemViewModelBase> { designerItem };
-                }
-
                 designerItems = designerItems.Distinct().ToList();
 
                 Interlocked.Increment(ref DiagramViewModel.DoCommandManager.BeginDo);
diff --git a/AIStudio.Wpf.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs b/AIStudio.Wpf.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs
index e922031..b6f8eed 100644
--- a/AIStudio.Wpf.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs
+++ b/AIStudio.Wpf.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs
@@ -32,16 +32,6 @@ namespace AIStudio.Wpf.DiagramDesigner
                 return (Style)itemsControl.FindResource("gifimageItemStyle");
             }
 
-            if (item is LinkPointDesignerItemViewModel)
-            {
-                return (Style)itemsControl.FindResource("linkpointItemStyle");
-            }
-
-            if (item is PointDesignerItemViewModel)
-            {
-                return (Style)itemsControl.FindResource("pointItemStyle");
-            }
-
             if (item is LogicalGateItemViewModelBase)
             {
                 return (Style)itemsControl.FindResource("logicalItemStyle");
diff --git a/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
index 7405f9e..0166608 100644
--- a/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
@@ -766,98 +766,6 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-
-            <Style x:Key="pointItemStyle"
-                                TargetType="{x:Type ContentPresenter}">
-                <Setter Property="Canvas.Top"
-                                    Value="{Binding Top}" />
-                <Setter Property="Canvas.Left"
-                                    Value="{Binding Left}" />
-                <Setter Property="Canvas.ZIndex"
-                                    Value="{Binding ZIndex}" />
-                <Setter Property="dd:SelectionProps.EnabledForSelection"
-                                    Value="{Binding EnabledForSelection}" />
-                <Setter Property="Visibility"
-                                    Value="{Binding Visible,Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                <Setter Property="Width"
-                                    Value="{Binding ItemWidth}" />
-                <Setter Property="Height"
-                                    Value="{Binding ItemHeight}" />
-                <Setter Property="SnapsToDevicePixels"
-                                    Value="True" />
-                <Setter Property="ContentTemplate">
-                    <Setter.Value>
-                        <DataTemplate>
-                            <Grid x:Name="selectedGrid" Visibility="{Binding Path=ShowConnectors, Converter={x:Static dd:BoolToVisibilityConverter.Instance}}">
-                                <!-- PART_ConnectorDecorator -->
-                                <Grid Margin="-5"
-                                                    x:Name="PART_ConnectorDecorator">
-                                    <dd:PointConnector DataContext="{Binding TopConnector}" Style="{StaticResource PointConnectorStyle}"/>
-                                </Grid>
-                                <!-- PART_DragThumb -->
-                                <c:DragThumb x:Name="PART_DragThumb"
-                                                            Cursor="SizeAll" />
-                            </Grid>
-                            <DataTemplate.Triggers>
-                                <Trigger Property="IsMouseOver"
-                                                        Value="true">
-                                    <Setter TargetName="PART_ConnectorDecorator" Property="Visibility" Value="Visible"/>
-                                </Trigger>
-                            </DataTemplate.Triggers>
-                        </DataTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
-            <Style x:Key="linkpointItemStyle"
-                                TargetType="{x:Type ContentPresenter}">
-                <Setter Property="Canvas.Top"
-                                    Value="{Binding Top}" />
-                <Setter Property="Canvas.Left"
-                                    Value="{Binding Left}" />
-                <Setter Property="Canvas.ZIndex"
-                                    Value="{Binding ZIndex}" />
-                <Setter Property="dd:SelectionProps.EnabledForSelection"
-                                    Value="{Binding EnabledForSelection}" />
-                <Setter Property="dd:ItemConnectProps.EnabledForConnection"
-                                    Value="{Binding EnabledForConnection}" />
-                <Setter Property="Visibility"
-                                    Value="{Binding Visible,Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                <Setter Property="Width"
-                                    Value="{Binding ItemWidth}" />
-                <Setter Property="Height"
-                                    Value="{Binding ItemHeight}" />
-                <Setter Property="SnapsToDevicePixels"
-                                    Value="True" />
-                <Setter Property="ContentTemplate">
-                    <Setter.Value>
-                        <DataTemplate>
-                            <Grid x:Name="selectedGrid">
-
-                                <!-- PART_ConnectorDecorator -->
-                                <Grid Margin="-5"
-                                                    x:Name="PART_ConnectorDecorator">
-                                    <dd:Connector Content="{Binding Connectors[0]}"                                                                 
-                                                                SnapsToDevicePixels="True"
-                                                                VerticalAlignment="Center"
-                                                                HorizontalAlignment="Center"
-                                                                Visibility="{Binding Path=ShowConnectors, Converter={x:Static dd:BoolToVisibilityConverter.Instance}}" />
-                                </Grid>
-                                <!-- PART_DragThumb -->
-                                <c:DragThumb x:Name="PART_DragThumb"
-                                                            Cursor="SizeAll" />
-                            </Grid>
-                            <DataTemplate.Triggers>
-                                <Trigger Property="IsMouseOver"
-                                                        Value="true">
-                                    <Setter TargetName="PART_ConnectorDecorator" Property="Visibility" Value="Visible"/>
-                                </Trigger>
-                            </DataTemplate.Triggers>
-                        </DataTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LinkPointDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LinkPointDesignerItemViewModel.cs
deleted file mode 100644
index 61ea26f..0000000
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LinkPointDesignerItemViewModel.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Windows;
-
-namespace AIStudio.Wpf.DiagramDesigner
-{
-    public class LinkPointDesignerItemViewModel : DesignerItemViewModelBase
-    {
-        public LinkPointDesignerItemViewModel(Point location) : this(null, location)
-        {
-
-        }
-
-        public LinkPointDesignerItemViewModel(IDiagramViewModel root, Point location) : base(root)
-        {
-            Left = Math.Max(0, location.X - ItemWidth / 2);
-            Top = Math.Max(0, location.Y - ItemHeight / 2);
-        }
-
-        protected override void Init(IDiagramViewModel root, bool initNew)
-        {
-            base.Init(root, initNew);      
-        }
-
-        protected override void InitNew()
-        {
-            this.ClearConnectors();
-            this.AddConnector(new FullyCreatedConnectorInfo(this, ConnectorOrientation.None, true));
-
-            ItemWidth = 5;
-            ItemHeight = 5;
-        }
-
-        public Point CurrentLocation
-        {
-            get
-            {
-                return new Point() { X = Left + ItemWidth / 2, Y = Top + ItemHeight / 2 };
-            }
-        }
-    }
-}
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/PointDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/PointDesignerItemViewModel.cs
deleted file mode 100644
index 5bd90b2..0000000
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/PointDesignerItemViewModel.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Windows;
-
-namespace AIStudio.Wpf.DiagramDesigner
-{
-    public class PointDesignerItemViewModel : DesignerItemViewModelBase
-    {
-        public PointDesignerItemViewModel(Point location) : this(null, location)
-        {
-
-        }
-
-        public PointDesignerItemViewModel(IDiagramViewModel root, Point location) : base(root)
-        {
-            Left = Math.Max(0, location.X - ItemWidth / 2);
-            Top = Math.Max(0, location.Y - ItemHeight / 2);
-        }
-
-        protected override void Init(IDiagramViewModel root, bool initNew)
-        {
-            base.Init(root, initNew);       
-        }
-
-        protected override void InitNew()
-        {
-            ItemWidth = 5;
-            ItemHeight = 5;
-            this.ClearConnectors();
-            this.AddConnector(new FullyCreatedConnectorInfo(this, ConnectorOrientation.None, true));
-        }
-
-        private bool _showConnectors = false;
-        public new bool ShowConnectors
-        {
-            get
-            {
-                return _showConnectors;
-            }
-            set
-            {
-                SetProperty(ref _showConnectors, value);
-            }
-        }
-
-        public Point CurrentLocation
-        {
-            get
-            {
-                return new Point() { X = Left + ItemWidth / 2, Y = Top + ItemHeight / 2 };
-            }
-        }
-    }
-}