项目结构调整

AIStudio.Wpf.Diagram.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Flowchart", "AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj", "{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Flowchart", "Extensions\AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj", "{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Logical", "AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj", "{CC68D39D-7935-4079-9CEB-FC2FD498D511}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Logical", "Extensions\AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj", "{CC68D39D-7935-4079-9CEB-FC2FD498D511}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{4959F170-02FB-4B7F-8F53-93DAF22713F9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.SFC", "AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj", "{2AB69067-277E-4EE0-9949-8326A145EEE4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.SFC", "Extensions\AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj", "{2AB69067-277E-4EE0-9949-8326A145EEE4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramApp", "AIStudio.Wpf.DiagramApp\AIStudio.Wpf.DiagramApp.csproj", "{4408F718-9C14-4404-A63B-9B785F9D4F35}"
 EndProject
@@ -27,9 +27,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramDesigner.Additionals", "AIStudio.Wpf.DiagramDesigner.Additionals\AIStudio.Wpf.DiagramDesigner.Additionals.csproj", "{186F34AC-4BC5-40E1-911B-DD3E96AECE6E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Mind", "AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj", "{85C437B9-16D2-4076-ABCD-52029AC232FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Mind", "Extensions\AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj", "{85C437B9-16D2-4076-ABCD-52029AC232FC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramModels", "AIStudio.Wpf.DiagramModels\AIStudio.Wpf.DiagramModels.csproj", "{439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramDesigner.Serializable", "AIStudio.Wpf.DiagramDesigner.Serializable\AIStudio.Wpf.DiagramDesigner.Serializable.csproj", "{439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.RoslynScript", "Extensions\AIStudio.Wpf.RoslynScript\AIStudio.Wpf.RoslynScript.csproj", "{E986D954-C2C5-47B9-9653-62943AE9AD85}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -73,6 +75,10 @@ Global
 		{439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{439D0631-D9C2-4D36-BFCE-80DFCCABE9E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E986D954-C2C5-47B9-9653-62943AE9AD85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E986D954-C2C5-47B9-9653-62943AE9AD85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E986D954-C2C5-47B9-9653-62943AE9AD85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E986D954-C2C5-47B9-9653-62943AE9AD85}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -82,7 +88,7 @@ Global
 		{CC68D39D-7935-4079-9CEB-FC2FD498D511} = {4959F170-02FB-4B7F-8F53-93DAF22713F9}
 		{2AB69067-277E-4EE0-9949-8326A145EEE4} = {4959F170-02FB-4B7F-8F53-93DAF22713F9}
 		{85C437B9-16D2-4076-ABCD-52029AC232FC} = {4959F170-02FB-4B7F-8F53-93DAF22713F9}
-		{439D0631-D9C2-4D36-BFCE-80DFCCABE9E7} = {4959F170-02FB-4B7F-8F53-93DAF22713F9}
+		{E986D954-C2C5-47B9-9653-62943AE9AD85} = {4959F170-02FB-4B7F-8F53-93DAF22713F9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D30FC641-F06C-4E35-AEA5-48A9B6E59CE0}

AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj

@@ -126,11 +126,13 @@
 
   <ItemGroup>
     <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner.Additionals\AIStudio.Wpf.DiagramDesigner.Additionals.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner.Serializable\AIStudio.Wpf.DiagramDesigner.Serializable.csproj" />
     <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.RoslynScript\AIStudio.Wpf.RoslynScript.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj" />
   </ItemGroup>
 
   <ItemGroup>

AIStudio.Wpf.DiagramDesigner.Demo/AIStudio.Wpf.DiagramDesigner.Demo.csproj

@@ -12,8 +12,8 @@
   <ItemGroup>
     <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner.Additionals\AIStudio.Wpf.DiagramDesigner.Additionals.csproj" />
     <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj" />
+    <ProjectReference Include="..\Extensions\AIStudio.Wpf.Mind\AIStudio.Wpf.Mind.csproj" />
   </ItemGroup>
 
   <ItemGroup>

AIStudio.Wpf.DiagramDesigner.Serializable/DiagramData.cs

@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using AIStudio.Wpf.DiagramDesigner;
-using AIStudio.Wpf.DiagramModels.ViewModels;
+using System.Collections.Generic;
+using AIStudio.Wpf.DiagramDesigner.Serializable.ViewModels;
 
-namespace AIStudio.Wpf.DiagramModels
+namespace AIStudio.Wpf.DiagramDesigner.Serializable
 {
     /// <summary>
     /// 

AIStudio.Wpf.DiagramDesigner.Serializable/DiagramDataConverter.cs

@@ -1,12 +1,9 @@
 using System;
-using System.Linq;
-using System.Windows.Media;
-using AIStudio.Wpf.DiagramDesigner;
 using AIStudio.Wpf.DiagramDesigner.Helpers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace AIStudio.Wpf.DiagramModels
+namespace AIStudio.Wpf.DiagramDesigner.Serializable
 {
     public class DiagramNodeConverter : DATACreationConverter<DiagramNode>
     {

AIStudio.Wpf.DiagramDesigner.Serializable/DiagramDataExtention.cs

@@ -2,12 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media;
-using AIStudio.Wpf.DiagramDesigner;
-using AIStudio.Wpf.DiagramModels.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.Serializable.ViewModels;
 using Newtonsoft.Json;
 
 
-namespace AIStudio.Wpf.DiagramModels
+namespace AIStudio.Wpf.DiagramDesigner.Serializable
 {
     public static class DiagramDataExtention
     {

AIStudio.Wpf.DiagramDesigner.Serializable/ViewModels/DiagramItemViewModel.cs

@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AIStudio.Wpf.DiagramDesigner;
-using AIStudio.Wpf.DiagramDesigner.Models;
+using AIStudio.Wpf.DiagramDesigner.Models;
 
-namespace AIStudio.Wpf.DiagramModels.ViewModels
+namespace AIStudio.Wpf.DiagramDesigner.Serializable.ViewModels
 {
     public class DiagramItemViewModel : DesignerItemViewModelBase
     {

AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs

@@ -314,13 +314,74 @@ namespace AIStudio.Wpf.DiagramDesigner
         }
         public virtual void GetInput()
         {
-        
+            foreach (var input in Input)
+            {
+                var connector = GetSourceItem(input.Value);
+                if (connector == null)
+                {
+                    continue;
+                }
+
+                if (connector.SourceConnectorInfo.DataItem is LogicalGateItemViewModelBase)
+                {
+                    input.Value.ConnectorValue = (connector.SourceConnectorInfo as LogicalConnectorInfo).ConnectorValue;
+
+                    input.Value.ColorViewModel.FillColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color;
+                    connector.ColorViewModel.LineColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color;
+                    connector.ColorViewModel.FillColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color;
+
+                    if (LogicalType == LogicalType.Output)
+                    {
+                        input.Value.ValueTypePoint = (connector.SourceConnectorInfo as LogicalConnectorInfo).ValueTypePoint;
+                    }
+                    else if (LogicalType == LogicalType.NOT)
+                    {
+                        input.Value.ValueTypePoint = ((connector.SourceConnectorInfo as LogicalConnectorInfo).ValueTypePoint == ValueTypePoint.Bool) ? ValueTypePoint.Bool : ValueTypePoint.Int;
+                    }
+                }
+            }
         }
 
         public virtual void CalculateOutput()
         {
-        }      
+            foreach (var output in Output)
+            {
+                if (output.Value.ValueTypePoint == ValueTypePoint.Bool)
+                {
+                    if (output.Value.ConnectorValue == 0)
+                    {
+                        output.Value.ColorViewModel.FillColor.Color = Colors.Red;
+                        if (LogicalType == LogicalType.Output)
+                        {
+                            ColorViewModel.FillColor.Color = Colors.Red;
+                        }
+                    }
+                    else
+                    {
+                        output.Value.ColorViewModel.FillColor.Color = Colors.Green;
+                        if (LogicalType == LogicalType.Output)
+                        {
+                            ColorViewModel.FillColor.Color = Colors.Green;
+                        }
+                    }
+                }
+                else
+                {
+                    output.Value.ColorViewModel.FillColor.Color = Colors.Green;
+                }
+            }
+        }
+
+        protected ConnectionViewModel GetSourceItem(FullyCreatedConnectorInfo sinkConnector)
+        {
+            foreach (var connector in Root?.Items.OfType<ConnectionViewModel>())
+            {
+                if (connector.SinkConnectorInfo == sinkConnector)
+                {
+                    return connector;
+                }
+            }
+            return null;
+        }
     }
-
-
 }

Extensions/AIStudio.Wpf.Flowchart/AIStudio - Backup.Wpf.Flowchart.csproj

@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+    <Company>AIStudio.Wpf.Controls</Company>
+    <Authors>akwkevin</Authors>
+    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
+    <PackageIcon>A.png</PackageIcon>
+    <PackageIconUrl />
+    <NeutralLanguage />
+    <Version>1.0.7</Version>
+    <Description>一个Wpf的流程图控件</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Models\DiagramData.cs" />
+    <Compile Remove="Models\DiagramDataConverter.cs" />
+    <Compile Remove="Models\DiagramDataExtention.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="A.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner.Serializable\AIStudio.Wpf.DiagramDesigner.Serializable.csproj" />
+  </ItemGroup>
+
+</Project>

Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj

@@ -26,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
-    <ProjectReference Include="..\AIStudio.Wpf.DiagramModels\AIStudio.Wpf.DiagramModels.csproj" />
+    <ProjectReference Include="..\..\AIStudio.Wpf.DiagramDesigner.Serializable\AIStudio.Wpf.DiagramDesigner.Serializable.csproj" />
+    <ProjectReference Include="..\..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
   </ItemGroup>
 
 </Project>

Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs

@@ -9,7 +9,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using AIStudio.Wpf.DiagramDesigner;
 using AIStudio.Wpf.DiagramDesigner.Geometrys;
-using AIStudio.Wpf.DiagramModels;
+using AIStudio.Wpf.DiagramDesigner.Serializable;
 using AIStudio.Wpf.Flowchart.Models;
 
 namespace AIStudio.Wpf.Flowchart.Controls

Extensions/AIStudio.Wpf.Flowchart/Models/FlowchartNode.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using AIStudio.Wpf.DiagramDesigner;
-using AIStudio.Wpf.DiagramModels;
-using AIStudio.Wpf.DiagramModels.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.Serializable;
+using AIStudio.Wpf.DiagramDesigner.Serializable.ViewModels;
 using AIStudio.Wpf.Flowchart.ViewModels;
 
 namespace AIStudio.Wpf.Flowchart.Models

Extensions/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs

@@ -4,8 +4,8 @@ using System.ComponentModel;
 using AIStudio.Wpf.DiagramDesigner;
 using AIStudio.Wpf.DiagramDesigner.Models;
 using AIStudio.Wpf.DiagramDesigner.Services;
-using AIStudio.Wpf.DiagramModels;
-using AIStudio.Wpf.DiagramModels.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.Serializable;
+using AIStudio.Wpf.DiagramDesigner.Serializable.ViewModels;
 using AIStudio.Wpf.Flowchart.Models;
 
 namespace AIStudio.Wpf.Flowchart.ViewModels

Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+    <ProjectReference Include="..\..\AIStudio.Wpf.DiagramModels\AIStudio.Wpf.DiagramDesigner.Serializable.csproj" />
   </ItemGroup>
 
 </Project>

Extensions/AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml

@@ -2,9 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:AIStudio.Wpf.Logical" 
                     xmlns:viewmodel="clr-namespace:AIStudio.Wpf.Logical.ViewModels" 
-                    xmlns:gif="http://wpfanimatedgif.codeplex.com" 
-                    xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram"
-                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
+                    xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram">
 
     <dd:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
     <dd:DoubleToThickness x:Key="DoubleToThickness"/>

Extensions/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs

@@ -58,66 +58,6 @@ namespace AIStudio.Wpf.Logical.ViewModels
             }
         }
 
-        public override void GetInput()
-        {
-            foreach (var input in Input)
-            {
-                var connector = GetSourceItem(input.Value);
-                if (connector == null)
-                {
-                    continue;
-                }
-
-                if (connector.SourceConnectorInfo.DataItem is LogicalGateItemViewModelBase)
-                {
-                    input.Value.ConnectorValue = (connector.SourceConnectorInfo as LogicalConnectorInfo).ConnectorValue;
-
-                    input.Value.ColorViewModel.FillColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color;
-                    connector.ColorViewModel.LineColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color;
-                    connector.ColorViewModel.FillColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color;
-
-                    if (LogicalType == LogicalType.Output)
-                    {
-                        input.Value.ValueTypePoint = (connector.SourceConnectorInfo as LogicalConnectorInfo).ValueTypePoint;
-                    }
-                    else if (LogicalType == LogicalType.NOT)
-                    {
-                        input.Value.ValueTypePoint = ((connector.SourceConnectorInfo as LogicalConnectorInfo).ValueTypePoint == ValueTypePoint.Bool) ? ValueTypePoint.Bool : ValueTypePoint.Int;
-                    }
-                }
-            }
-        }
-
-        public override void CalculateOutput()
-        {
-            foreach (var output in Output)
-            {
-                if (output.Value.ValueTypePoint == ValueTypePoint.Bool)
-                {
-                    if (output.Value.ConnectorValue == 0)
-                    {
-                        output.Value.ColorViewModel.FillColor.Color = Colors.Red;
-                        if (LogicalType == LogicalType.Output)
-                        {
-                            ColorViewModel.FillColor.Color = Colors.Red;
-                        }
-                    }
-                    else
-                    {
-                        output.Value.ColorViewModel.FillColor.Color = Colors.Green;
-                        if (LogicalType == LogicalType.Output)
-                        {
-                            ColorViewModel.FillColor.Color = Colors.Green;
-                        }
-                    }
-                }
-                else
-                {
-                    output.Value.ColorViewModel.FillColor.Color = Colors.Green;
-                }
-            }
-        }
-
         protected override void ExecuteEditCommand(object parameter)
         {
             if (LogicalType == LogicalType.Constant)
@@ -137,18 +77,6 @@ namespace AIStudio.Wpf.Logical.ViewModels
                 }
             }
         }
-
-        protected ConnectionViewModel GetSourceItem(FullyCreatedConnectorInfo sinkConnector)
-        {
-            foreach (var connector in Root?.Items.OfType<ConnectionViewModel>())
-            {
-                if (connector.SinkConnectorInfo == sinkConnector)
-                {
-                    return connector;
-                }
-            }
-            return null;
-        }
     }
 
     public class AddGateItemViewModel : LogicalGateItemViewModel

Extensions/AIStudio.Wpf.Mind/AIStudio - Backup.Wpf.Mind.csproj

@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AIStudio.Wpf.DiagramModels\AIStudio.Wpf.DiagramModels.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner.Serializable\AIStudio.Wpf.DiagramDesigner.Serializable.csproj" />
   </ItemGroup>
 
 </Project>

Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+    <Company>AIStudio.Wpf.Controls</Company>
+    <Authors>akwkevin</Authors>
+    <PackageProjectUrl>https://gitee.com/akwkevin</PackageProjectUrl>
+    <PackageIcon>A.png</PackageIcon>
+    <PackageIconUrl />
+    <NeutralLanguage />
+    <Version>1.0.6</Version>
+    <Description>一个Wpf的思维导图控件</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="A.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\AIStudio.Wpf.DiagramDesigner.Serializable\AIStudio.Wpf.DiagramDesigner.Serializable.csproj" />
+    <ProjectReference Include="..\..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+  </ItemGroup>
+
+</Project>

Extensions/AIStudio.Wpf.Mind/Controls/MindEditor.xaml.cs

@@ -11,7 +11,7 @@ using System.Xml.Linq;
 using AIStudio.Wpf.DiagramDesigner;
 using AIStudio.Wpf.DiagramDesigner.Geometrys;
 using AIStudio.Wpf.Mind.ViewModels;
-using AIStudio.Wpf.DiagramModels;
+using AIStudio.Wpf.DiagramDesigner.Serializable;
 
 namespace AIStudio.Wpf.Mind.Controls
 {

Extensions/AIStudio.Wpf.Mind/Models/MindNodeModel.cs

@@ -4,8 +4,8 @@ using System.ComponentModel.Design;
 using System.Windows;
 using System.Xml.Serialization;
 using AIStudio.Wpf.DiagramDesigner;
-using AIStudio.Wpf.DiagramModels;
-using AIStudio.Wpf.DiagramModels.ViewModels;
+using AIStudio.Wpf.DiagramDesigner.Serializable;
+using AIStudio.Wpf.DiagramDesigner.Serializable.ViewModels;
 using AIStudio.Wpf.Mind;
 using AIStudio.Wpf.Mind.ViewModels;