整理序列化

AIStudio.Wpf.DiagramDesigner/Models/Serializables/ConnectionItem.cs

@@ -11,9 +11,12 @@ using System.Xml.Serialization;
 
 namespace AIStudio.Wpf.DiagramDesigner
 {
+    /// <summary>
+    /// 连接线
+    /// </summary>
     [Serializable]
     [XmlInclude(typeof(ConnectionItem))]
-    public class ConnectionItem : SelectableDesignerItemBase
+    public class ConnectionItem : SelectableItemBase
     {
         public ConnectionItem()
         {
@@ -39,7 +42,8 @@ namespace AIStudio.Wpf.DiagramDesigner
             this.SinkInnerPoint = viewmodel.SinkConnectorInfoFully.IsInnerPoint;
             this.RouterMode = viewmodel.RouterMode;
             this.PathMode = viewmodel.PathMode;
-            this.Vertices = viewmodel.Vertices.Select(p => (Point)p.MiddlePosition).ToList();
+            this.Vertices = viewmodel.Vertices.Select(p => new ConnectorVertexItem(p)).ToList();
+            this.Labels = viewmodel.Labels.Select(p => new ConnectorLabelItem(p)).ToList();
         }
 
 
@@ -97,28 +101,14 @@ namespace AIStudio.Wpf.DiagramDesigner
             get; set;
         }
 
-        [XmlIgnore]
-        public List<Point> Vertices
+        [XmlArray]
+        public List<ConnectorVertexItem> Vertices
         {
             get; set;
-        }      
-
-        [JsonIgnore]
-        [XmlAttribute("Vertices")]
-        public string XmlVertices
-        {
-            get
-            {
-                return SerializeHelper.SerializePointList(Vertices);
-            }
-            set
-            {
-                Vertices = SerializeHelper.DeserializePointList(value);
-            }
         }
 
         [XmlArray]
-        public List<ConnectorLabelItem> Connectors
+        public List<ConnectorLabelItem> Labels
         {
             get; set;
         }