diff --git a/AIStudio.Wpf.Diagram.sln b/AIStudio.Wpf.Diagram.sln index 6b8fd22..d875a17 100644 --- a/AIStudio.Wpf.Diagram.sln +++ b/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} diff --git a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj index f92da9e..9009917 100644 --- a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj +++ b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj @@ -126,11 +126,13 @@ + - - - - + + + + + diff --git a/AIStudio.Wpf.DiagramDesigner.Demo/AIStudio.Wpf.DiagramDesigner.Demo.csproj b/AIStudio.Wpf.DiagramDesigner.Demo/AIStudio.Wpf.DiagramDesigner.Demo.csproj index 30b6576..db42ab2 100644 --- a/AIStudio.Wpf.DiagramDesigner.Demo/AIStudio.Wpf.DiagramDesigner.Demo.csproj +++ b/AIStudio.Wpf.DiagramDesigner.Demo/AIStudio.Wpf.DiagramDesigner.Demo.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/AIStudio.Wpf.DiagramModels/AIStudio.Wpf.DiagramModels.csproj b/AIStudio.Wpf.DiagramDesigner.Serializable/AIStudio.Wpf.DiagramDesigner.Serializable.csproj similarity index 100% rename from AIStudio.Wpf.DiagramModels/AIStudio.Wpf.DiagramModels.csproj rename to AIStudio.Wpf.DiagramDesigner.Serializable/AIStudio.Wpf.DiagramDesigner.Serializable.csproj diff --git a/AIStudio.Wpf.DiagramModels/DiagramData.cs b/AIStudio.Wpf.DiagramDesigner.Serializable/DiagramData.cs similarity index 98% rename from AIStudio.Wpf.DiagramModels/DiagramData.cs rename to AIStudio.Wpf.DiagramDesigner.Serializable/DiagramData.cs index e7ebf62..3427aac 100644 --- a/AIStudio.Wpf.DiagramModels/DiagramData.cs +++ b/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 { /// /// diff --git a/AIStudio.Wpf.DiagramModels/DiagramDataConverter.cs b/AIStudio.Wpf.DiagramDesigner.Serializable/DiagramDataConverter.cs similarity index 96% rename from AIStudio.Wpf.DiagramModels/DiagramDataConverter.cs rename to AIStudio.Wpf.DiagramDesigner.Serializable/DiagramDataConverter.cs index 7cbe782..bd95007 100644 --- a/AIStudio.Wpf.DiagramModels/DiagramDataConverter.cs +++ b/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 { diff --git a/AIStudio.Wpf.DiagramModels/DiagramDataExtention.cs b/AIStudio.Wpf.DiagramDesigner.Serializable/DiagramDataExtention.cs similarity index 98% rename from AIStudio.Wpf.DiagramModels/DiagramDataExtention.cs rename to AIStudio.Wpf.DiagramDesigner.Serializable/DiagramDataExtention.cs index 6d1b3d7..debb9bf 100644 --- a/AIStudio.Wpf.DiagramModels/DiagramDataExtention.cs +++ b/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 { diff --git a/AIStudio.Wpf.DiagramModels/ViewModels/DiagramItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner.Serializable/ViewModels/DiagramItemViewModel.cs similarity index 73% rename from AIStudio.Wpf.DiagramModels/ViewModels/DiagramItemViewModel.cs rename to AIStudio.Wpf.DiagramDesigner.Serializable/ViewModels/DiagramItemViewModel.cs index cd5d5dc..6c38f96 100644 --- a/AIStudio.Wpf.DiagramModels/ViewModels/DiagramItemViewModel.cs +++ b/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 { diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs index 863a354..7a945e3 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs +++ b/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()) + { + if (connector.SinkConnectorInfo == sinkConnector) + { + return connector; + } + } + return null; + } } - - } diff --git a/AIStudio.Wpf.Flowchart/A.png b/Extensions/AIStudio.Wpf.Flowchart/A.png similarity index 100% rename from AIStudio.Wpf.Flowchart/A.png rename to Extensions/AIStudio.Wpf.Flowchart/A.png diff --git a/Extensions/AIStudio.Wpf.Flowchart/AIStudio - Backup.Wpf.Flowchart.csproj b/Extensions/AIStudio.Wpf.Flowchart/AIStudio - Backup.Wpf.Flowchart.csproj new file mode 100644 index 0000000..83075c5 --- /dev/null +++ b/Extensions/AIStudio.Wpf.Flowchart/AIStudio - Backup.Wpf.Flowchart.csproj @@ -0,0 +1,33 @@ + + + + true + AIStudio.Wpf.Controls + akwkevin + https://gitee.com/akwkevin + A.png + + + 1.0.7 + 一个Wpf的流程图控件 + + + + + + + + + + + True + + + + + + + + + + diff --git a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj b/Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj similarity index 76% rename from AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj rename to Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj index 6666035..7f6a15e 100644 --- a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj +++ b/Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_sf4layqv_wpftmp.csproj b/Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_sf4layqv_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_sf4layqv_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_sf4layqv_wpftmp.csproj diff --git a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_uvm3czly_wpftmp.csproj b/Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_uvm3czly_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_uvm3czly_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_uvm3czly_wpftmp.csproj diff --git a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_vqigpxdt_wpftmp.csproj b/Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_vqigpxdt_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_vqigpxdt_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart_vqigpxdt_wpftmp.csproj diff --git a/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml b/Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml similarity index 100% rename from AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml rename to Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml diff --git a/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs b/Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs similarity index 99% rename from AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs rename to Extensions/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs index f72c686..e011eaf 100644 --- a/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs +++ b/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 diff --git a/AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml b/Extensions/AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml similarity index 100% rename from AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml rename to Extensions/AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml diff --git a/AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml.cs b/Extensions/AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml.cs rename to Extensions/AIStudio.Wpf.Flowchart/Controls/ToolBoxControl.xaml.cs diff --git a/AIStudio.Wpf.Flowchart/FlowchartService.cs b/Extensions/AIStudio.Wpf.Flowchart/FlowchartService.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/FlowchartService.cs rename to Extensions/AIStudio.Wpf.Flowchart/FlowchartService.cs diff --git a/AIStudio.Wpf.Flowchart/Models/FlowNodeDesignerItem.cs b/Extensions/AIStudio.Wpf.Flowchart/Models/FlowNodeDesignerItem.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/Models/FlowNodeDesignerItem.cs rename to Extensions/AIStudio.Wpf.Flowchart/Models/FlowNodeDesignerItem.cs diff --git a/AIStudio.Wpf.Flowchart/Models/FlowchartNode.cs b/Extensions/AIStudio.Wpf.Flowchart/Models/FlowchartNode.cs similarity index 96% rename from AIStudio.Wpf.Flowchart/Models/FlowchartNode.cs rename to Extensions/AIStudio.Wpf.Flowchart/Models/FlowchartNode.cs index b9edae8..2f20ef8 100644 --- a/AIStudio.Wpf.Flowchart/Models/FlowchartNode.cs +++ b/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 diff --git a/AIStudio.Wpf.Flowchart/Models/FlowchartToolBoxData.cs b/Extensions/AIStudio.Wpf.Flowchart/Models/FlowchartToolBoxData.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/Models/FlowchartToolBoxData.cs rename to Extensions/AIStudio.Wpf.Flowchart/Models/FlowchartToolBoxData.cs diff --git a/AIStudio.Wpf.Flowchart/NodeKinds.cs b/Extensions/AIStudio.Wpf.Flowchart/NodeKinds.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/NodeKinds.cs rename to Extensions/AIStudio.Wpf.Flowchart/NodeKinds.cs diff --git a/AIStudio.Wpf.Flowchart/Properties/AssemblyInfo.cs b/Extensions/AIStudio.Wpf.Flowchart/Properties/AssemblyInfo.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/Properties/AssemblyInfo.cs rename to Extensions/AIStudio.Wpf.Flowchart/Properties/AssemblyInfo.cs diff --git a/AIStudio.Wpf.Flowchart/SelectOption.cs b/Extensions/AIStudio.Wpf.Flowchart/SelectOption.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/SelectOption.cs rename to Extensions/AIStudio.Wpf.Flowchart/SelectOption.cs diff --git a/AIStudio.Wpf.Flowchart/Themes/FlowNode.xaml b/Extensions/AIStudio.Wpf.Flowchart/Themes/FlowNode.xaml similarity index 100% rename from AIStudio.Wpf.Flowchart/Themes/FlowNode.xaml rename to Extensions/AIStudio.Wpf.Flowchart/Themes/FlowNode.xaml diff --git a/AIStudio.Wpf.Flowchart/Themes/Generic.xaml b/Extensions/AIStudio.Wpf.Flowchart/Themes/Generic.xaml similarity index 100% rename from AIStudio.Wpf.Flowchart/Themes/Generic.xaml rename to Extensions/AIStudio.Wpf.Flowchart/Themes/Generic.xaml diff --git a/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs b/Extensions/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs similarity index 98% rename from AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs rename to Extensions/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs index ff79aee..139ce3b 100644 --- a/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs +++ b/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 diff --git a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs b/Extensions/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs rename to Extensions/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs diff --git a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs b/Extensions/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs rename to Extensions/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs diff --git a/AIStudio.Wpf.Flowchart/ViewModels/ToolBoxViewModel.cs b/Extensions/AIStudio.Wpf.Flowchart/ViewModels/ToolBoxViewModel.cs similarity index 100% rename from AIStudio.Wpf.Flowchart/ViewModels/ToolBoxViewModel.cs rename to Extensions/AIStudio.Wpf.Flowchart/ViewModels/ToolBoxViewModel.cs diff --git a/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj b/Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj similarity index 57% rename from AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj rename to Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj index eb75742..bd351e7 100644 --- a/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj +++ b/Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj @@ -5,7 +5,7 @@ - + diff --git a/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_5wsjq13t_wpftmp.csproj b/Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_5wsjq13t_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_5wsjq13t_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_5wsjq13t_wpftmp.csproj diff --git a/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_ls0ruurq_wpftmp.csproj b/Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_ls0ruurq_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_ls0ruurq_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_ls0ruurq_wpftmp.csproj diff --git a/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_z513mvur_wpftmp.csproj b/Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_z513mvur_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_z513mvur_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical_z513mvur_wpftmp.csproj diff --git a/AIStudio.Wpf.Logical/LinkPoint.cs b/Extensions/AIStudio.Wpf.Logical/LinkPoint.cs similarity index 100% rename from AIStudio.Wpf.Logical/LinkPoint.cs rename to Extensions/AIStudio.Wpf.Logical/LinkPoint.cs diff --git a/AIStudio.Wpf.Logical/LogicalService.cs b/Extensions/AIStudio.Wpf.Logical/LogicalService.cs similarity index 100% rename from AIStudio.Wpf.Logical/LogicalService.cs rename to Extensions/AIStudio.Wpf.Logical/LogicalService.cs diff --git a/AIStudio.Wpf.Logical/Models/LogicalGateItem.cs b/Extensions/AIStudio.Wpf.Logical/Models/LogicalGateItem.cs similarity index 100% rename from AIStudio.Wpf.Logical/Models/LogicalGateItem.cs rename to Extensions/AIStudio.Wpf.Logical/Models/LogicalGateItem.cs diff --git a/AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml b/Extensions/AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml similarity index 97% rename from AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml rename to Extensions/AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml index 70cf0d7..b8b9fe7 100644 --- a/AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml +++ b/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"> diff --git a/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs b/Extensions/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs similarity index 100% rename from AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs rename to Extensions/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs diff --git a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs b/Extensions/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs similarity index 100% rename from AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs rename to Extensions/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs diff --git a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs b/Extensions/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs similarity index 93% rename from AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs rename to Extensions/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs index ccb08d8..c76c097 100644 --- a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs +++ b/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()) - { - if (connector.SinkConnectorInfo == sinkConnector) - { - return connector; - } - } - return null; - } } public class AddGateItemViewModel : LogicalGateItemViewModel diff --git a/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs b/Extensions/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs similarity index 100% rename from AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs rename to Extensions/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs diff --git a/AIStudio.Wpf.Mind/A.png b/Extensions/AIStudio.Wpf.Mind/A.png similarity index 100% rename from AIStudio.Wpf.Mind/A.png rename to Extensions/AIStudio.Wpf.Mind/A.png diff --git a/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind.csproj b/Extensions/AIStudio.Wpf.Mind/AIStudio - Backup.Wpf.Mind.csproj similarity index 82% rename from AIStudio.Wpf.Mind/AIStudio.Wpf.Mind.csproj rename to Extensions/AIStudio.Wpf.Mind/AIStudio - Backup.Wpf.Mind.csproj index a978cf4..b73e700 100644 --- a/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind.csproj +++ b/Extensions/AIStudio.Wpf.Mind/AIStudio - Backup.Wpf.Mind.csproj @@ -20,7 +20,7 @@ - + diff --git a/Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind.csproj b/Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind.csproj new file mode 100644 index 0000000..573fa2e --- /dev/null +++ b/Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind.csproj @@ -0,0 +1,27 @@ + + + + true + AIStudio.Wpf.Controls + akwkevin + https://gitee.com/akwkevin + A.png + + + 1.0.6 + 一个Wpf的思维导图控件 + + + + + True + + + + + + + + + + diff --git a/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_0bdyaape_wpftmp.csproj b/Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_0bdyaape_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_0bdyaape_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_0bdyaape_wpftmp.csproj diff --git a/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_5ymptayx_wpftmp.csproj b/Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_5ymptayx_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_5ymptayx_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_5ymptayx_wpftmp.csproj diff --git a/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_rllyqvfb_wpftmp.csproj b/Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_rllyqvfb_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_rllyqvfb_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_rllyqvfb_wpftmp.csproj diff --git a/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_ujws0dco_wpftmp.csproj b/Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_ujws0dco_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_ujws0dco_wpftmp.csproj rename to Extensions/AIStudio.Wpf.Mind/AIStudio.Wpf.Mind_ujws0dco_wpftmp.csproj diff --git a/AIStudio.Wpf.Mind/Controls/ColorCanvas.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/ColorCanvas.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ColorCanvas.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/ColorCanvas.xaml diff --git a/AIStudio.Wpf.Mind/Controls/ColorCanvas.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/ColorCanvas.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ColorCanvas.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/ColorCanvas.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/ColorItem.cs b/Extensions/AIStudio.Wpf.Mind/Controls/ColorItem.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ColorItem.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/ColorItem.cs diff --git a/AIStudio.Wpf.Mind/Controls/ColorPicker.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/ColorPicker.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ColorPicker.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/ColorPicker.xaml diff --git a/AIStudio.Wpf.Mind/Controls/ColorPicker.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/ColorPicker.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ColorPicker.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/ColorPicker.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/ColorPickerTabItem.cs b/Extensions/AIStudio.Wpf.Mind/Controls/ColorPickerTabItem.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ColorPickerTabItem.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/ColorPickerTabItem.cs diff --git a/AIStudio.Wpf.Mind/Controls/ColorSorter.cs b/Extensions/AIStudio.Wpf.Mind/Controls/ColorSorter.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ColorSorter.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/ColorSorter.cs diff --git a/AIStudio.Wpf.Mind/Controls/ColorSpectrumSlider.cs b/Extensions/AIStudio.Wpf.Mind/Controls/ColorSpectrumSlider.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ColorSpectrumSlider.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/ColorSpectrumSlider.cs diff --git a/AIStudio.Wpf.Mind/Controls/ColorUtilities.cs b/Extensions/AIStudio.Wpf.Mind/Controls/ColorUtilities.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ColorUtilities.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/ColorUtilities.cs diff --git a/AIStudio.Wpf.Mind/Controls/DropDownButton.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/DropDownButton.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/DropDownButton.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/DropDownButton.xaml diff --git a/AIStudio.Wpf.Mind/Controls/DropDownButton.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/DropDownButton.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/DropDownButton.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/DropDownButton.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/LinkControl.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/LinkControl.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/LinkControl.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/LinkControl.xaml diff --git a/AIStudio.Wpf.Mind/Controls/LinkControl.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/LinkControl.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/LinkControl.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/LinkControl.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/MindEditor.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/MindEditor.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/MindEditor.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/MindEditor.xaml diff --git a/AIStudio.Wpf.Mind/Controls/MindEditor.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/MindEditor.xaml.cs similarity index 99% rename from AIStudio.Wpf.Mind/Controls/MindEditor.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/MindEditor.xaml.cs index 0202159..ced7e30 100644 --- a/AIStudio.Wpf.Mind/Controls/MindEditor.xaml.cs +++ b/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 { diff --git a/AIStudio.Wpf.Mind/Controls/NodeDTSWindow.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/NodeDTSWindow.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/NodeDTSWindow.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/NodeDTSWindow.xaml diff --git a/AIStudio.Wpf.Mind/Controls/NodeDTSWindow.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/NodeDTSWindow.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/NodeDTSWindow.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/NodeDTSWindow.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/OpenFileTextBox.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/OpenFileTextBox.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/OpenFileTextBox.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/OpenFileTextBox.xaml diff --git a/AIStudio.Wpf.Mind/Controls/OpenFileTextBox.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/OpenFileTextBox.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/OpenFileTextBox.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/OpenFileTextBox.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/PriorityControl.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/PriorityControl.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/PriorityControl.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/PriorityControl.xaml diff --git a/AIStudio.Wpf.Mind/Controls/PriorityControl.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/PriorityControl.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/PriorityControl.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/PriorityControl.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/RateControl.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/RateControl.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/RateControl.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/RateControl.xaml diff --git a/AIStudio.Wpf.Mind/Controls/RateControl.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/RateControl.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/RateControl.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/RateControl.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/RemarkControl.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/RemarkControl.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/RemarkControl.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/RemarkControl.xaml diff --git a/AIStudio.Wpf.Mind/Controls/RemarkControl.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/RemarkControl.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/RemarkControl.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/RemarkControl.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/TagControl.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/TagControl.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/TagControl.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/TagControl.xaml diff --git a/AIStudio.Wpf.Mind/Controls/TagControl.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/TagControl.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/TagControl.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/TagControl.xaml.cs diff --git a/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml b/Extensions/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml rename to Extensions/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml diff --git a/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml.cs b/Extensions/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml.cs similarity index 100% rename from AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml.cs rename to Extensions/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml.cs diff --git a/AIStudio.Wpf.Mind/Converters/MindThemeFillBrushConverter.cs b/Extensions/AIStudio.Wpf.Mind/Converters/MindThemeFillBrushConverter.cs similarity index 100% rename from AIStudio.Wpf.Mind/Converters/MindThemeFillBrushConverter.cs rename to Extensions/AIStudio.Wpf.Mind/Converters/MindThemeFillBrushConverter.cs diff --git a/AIStudio.Wpf.Mind/Converters/MindThemeFontBrushConverter.cs b/Extensions/AIStudio.Wpf.Mind/Converters/MindThemeFontBrushConverter.cs similarity index 100% rename from AIStudio.Wpf.Mind/Converters/MindThemeFontBrushConverter.cs rename to Extensions/AIStudio.Wpf.Mind/Converters/MindThemeFontBrushConverter.cs diff --git a/AIStudio.Wpf.Mind/Helpers/DirectoryLayout.cs b/Extensions/AIStudio.Wpf.Mind/Helpers/DirectoryLayout.cs similarity index 100% rename from AIStudio.Wpf.Mind/Helpers/DirectoryLayout.cs rename to Extensions/AIStudio.Wpf.Mind/Helpers/DirectoryLayout.cs diff --git a/AIStudio.Wpf.Mind/Helpers/FishBoneLayout.cs b/Extensions/AIStudio.Wpf.Mind/Helpers/FishBoneLayout.cs similarity index 100% rename from AIStudio.Wpf.Mind/Helpers/FishBoneLayout.cs rename to Extensions/AIStudio.Wpf.Mind/Helpers/FishBoneLayout.cs diff --git a/AIStudio.Wpf.Mind/Helpers/IMindLayout.cs b/Extensions/AIStudio.Wpf.Mind/Helpers/IMindLayout.cs similarity index 100% rename from AIStudio.Wpf.Mind/Helpers/IMindLayout.cs rename to Extensions/AIStudio.Wpf.Mind/Helpers/IMindLayout.cs diff --git a/AIStudio.Wpf.Mind/Helpers/LogicalLayout.cs b/Extensions/AIStudio.Wpf.Mind/Helpers/LogicalLayout.cs similarity index 100% rename from AIStudio.Wpf.Mind/Helpers/LogicalLayout.cs rename to Extensions/AIStudio.Wpf.Mind/Helpers/LogicalLayout.cs diff --git a/AIStudio.Wpf.Mind/Helpers/MindLayout.cs b/Extensions/AIStudio.Wpf.Mind/Helpers/MindLayout.cs similarity index 100% rename from AIStudio.Wpf.Mind/Helpers/MindLayout.cs rename to Extensions/AIStudio.Wpf.Mind/Helpers/MindLayout.cs diff --git a/AIStudio.Wpf.Mind/Helpers/MindThemeHelper.cs b/Extensions/AIStudio.Wpf.Mind/Helpers/MindThemeHelper.cs similarity index 100% rename from AIStudio.Wpf.Mind/Helpers/MindThemeHelper.cs rename to Extensions/AIStudio.Wpf.Mind/Helpers/MindThemeHelper.cs diff --git a/AIStudio.Wpf.Mind/Helpers/OrganizationalLayout.cs b/Extensions/AIStudio.Wpf.Mind/Helpers/OrganizationalLayout.cs similarity index 100% rename from AIStudio.Wpf.Mind/Helpers/OrganizationalLayout.cs rename to Extensions/AIStudio.Wpf.Mind/Helpers/OrganizationalLayout.cs diff --git a/AIStudio.Wpf.Mind/Models/MindNodeDesignerItem.cs b/Extensions/AIStudio.Wpf.Mind/Models/MindNodeDesignerItem.cs similarity index 100% rename from AIStudio.Wpf.Mind/Models/MindNodeDesignerItem.cs rename to Extensions/AIStudio.Wpf.Mind/Models/MindNodeDesignerItem.cs diff --git a/AIStudio.Wpf.Mind/Models/MindNodeModel.cs b/Extensions/AIStudio.Wpf.Mind/Models/MindNodeModel.cs similarity index 96% rename from AIStudio.Wpf.Mind/Models/MindNodeModel.cs rename to Extensions/AIStudio.Wpf.Mind/Models/MindNodeModel.cs index 22d9007..ce99102 100644 --- a/AIStudio.Wpf.Mind/Models/MindNodeModel.cs +++ b/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; diff --git a/AIStudio.Wpf.Mind/Models/MindTheme.cs b/Extensions/AIStudio.Wpf.Mind/Models/MindTheme.cs similarity index 100% rename from AIStudio.Wpf.Mind/Models/MindTheme.cs rename to Extensions/AIStudio.Wpf.Mind/Models/MindTheme.cs diff --git a/AIStudio.Wpf.Mind/Models/MindType.cs b/Extensions/AIStudio.Wpf.Mind/Models/MindType.cs similarity index 100% rename from AIStudio.Wpf.Mind/Models/MindType.cs rename to Extensions/AIStudio.Wpf.Mind/Models/MindType.cs diff --git a/AIStudio.Wpf.Mind/Models/TreeNode.cs b/Extensions/AIStudio.Wpf.Mind/Models/TreeNode.cs similarity index 100% rename from AIStudio.Wpf.Mind/Models/TreeNode.cs rename to Extensions/AIStudio.Wpf.Mind/Models/TreeNode.cs diff --git a/AIStudio.Wpf.Mind/Properties/AssemblyInfo.cs b/Extensions/AIStudio.Wpf.Mind/Properties/AssemblyInfo.cs similarity index 100% rename from AIStudio.Wpf.Mind/Properties/AssemblyInfo.cs rename to Extensions/AIStudio.Wpf.Mind/Properties/AssemblyInfo.cs diff --git a/AIStudio.Wpf.Mind/Styles/Button.xaml b/Extensions/AIStudio.Wpf.Mind/Styles/Button.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Styles/Button.xaml rename to Extensions/AIStudio.Wpf.Mind/Styles/Button.xaml diff --git a/AIStudio.Wpf.Mind/Styles/ComboBox.xaml b/Extensions/AIStudio.Wpf.Mind/Styles/ComboBox.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Styles/ComboBox.xaml rename to Extensions/AIStudio.Wpf.Mind/Styles/ComboBox.xaml diff --git a/AIStudio.Wpf.Mind/Styles/ContextMenu.xaml b/Extensions/AIStudio.Wpf.Mind/Styles/ContextMenu.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Styles/ContextMenu.xaml rename to Extensions/AIStudio.Wpf.Mind/Styles/ContextMenu.xaml diff --git a/AIStudio.Wpf.Mind/Styles/ToggleButton.xaml b/Extensions/AIStudio.Wpf.Mind/Styles/ToggleButton.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Styles/ToggleButton.xaml rename to Extensions/AIStudio.Wpf.Mind/Styles/ToggleButton.xaml diff --git a/AIStudio.Wpf.Mind/Themes/Generic.xaml b/Extensions/AIStudio.Wpf.Mind/Themes/Generic.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Themes/Generic.xaml rename to Extensions/AIStudio.Wpf.Mind/Themes/Generic.xaml diff --git a/AIStudio.Wpf.Mind/Themes/MindNode.xaml b/Extensions/AIStudio.Wpf.Mind/Themes/MindNode.xaml similarity index 100% rename from AIStudio.Wpf.Mind/Themes/MindNode.xaml rename to Extensions/AIStudio.Wpf.Mind/Themes/MindNode.xaml diff --git a/AIStudio.Wpf.Mind/ViewModels/IMindDiagramViewModel.cs b/Extensions/AIStudio.Wpf.Mind/ViewModels/IMindDiagramViewModel.cs similarity index 100% rename from AIStudio.Wpf.Mind/ViewModels/IMindDiagramViewModel.cs rename to Extensions/AIStudio.Wpf.Mind/ViewModels/IMindDiagramViewModel.cs diff --git a/AIStudio.Wpf.Mind/ViewModels/MindDiagramViewModel.cs b/Extensions/AIStudio.Wpf.Mind/ViewModels/MindDiagramViewModel.cs similarity index 100% rename from AIStudio.Wpf.Mind/ViewModels/MindDiagramViewModel.cs rename to Extensions/AIStudio.Wpf.Mind/ViewModels/MindDiagramViewModel.cs diff --git a/AIStudio.Wpf.Mind/ViewModels/MindNode.cs b/Extensions/AIStudio.Wpf.Mind/ViewModels/MindNode.cs similarity index 99% rename from AIStudio.Wpf.Mind/ViewModels/MindNode.cs rename to Extensions/AIStudio.Wpf.Mind/ViewModels/MindNode.cs index af4a8ba..89e5493 100644 --- a/AIStudio.Wpf.Mind/ViewModels/MindNode.cs +++ b/Extensions/AIStudio.Wpf.Mind/ViewModels/MindNode.cs @@ -15,8 +15,8 @@ using AIStudio.Wpf.DiagramDesigner; using AIStudio.Wpf.DiagramDesigner.Geometrys; using AIStudio.Wpf.DiagramDesigner.Helpers; using AIStudio.Wpf.DiagramDesigner.Models; -using AIStudio.Wpf.DiagramModels; -using AIStudio.Wpf.DiagramModels.ViewModels; +using AIStudio.Wpf.DiagramDesigner.Serializable; +using AIStudio.Wpf.DiagramDesigner.Serializable.ViewModels; using AIStudio.Wpf.Mind.Controls; using AIStudio.Wpf.Mind.Helpers; using AIStudio.Wpf.Mind.Models; diff --git a/Extensions/AIStudio.Wpf.RoslynScript/AIStudio.Wpf.RoslynScript.csproj b/Extensions/AIStudio.Wpf.RoslynScript/AIStudio.Wpf.RoslynScript.csproj new file mode 100644 index 0000000..8697693 --- /dev/null +++ b/Extensions/AIStudio.Wpf.RoslynScript/AIStudio.Wpf.RoslynScript.csproj @@ -0,0 +1,15 @@ + + + + true + + + + + + + + + + + diff --git a/Extensions/AIStudio.Wpf.RoslynScript/Themes/RoslynScriptViewModel.xaml b/Extensions/AIStudio.Wpf.RoslynScript/Themes/RoslynScriptViewModel.xaml new file mode 100644 index 0000000..db7e876 --- /dev/null +++ b/Extensions/AIStudio.Wpf.RoslynScript/Themes/RoslynScriptViewModel.xaml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Extensions/AIStudio.Wpf.RoslynScript/ViewModels/RoslynScriptViewModel.cs b/Extensions/AIStudio.Wpf.RoslynScript/ViewModels/RoslynScriptViewModel.cs new file mode 100644 index 0000000..60cb522 --- /dev/null +++ b/Extensions/AIStudio.Wpf.RoslynScript/ViewModels/RoslynScriptViewModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AIStudio.Wpf.DiagramDesigner; + +namespace AIStudio.Wpf.CSharpScript.ViewModels +{ + public class CSharpScriptViewModel : LogicalGateItemViewModelBase + { + public CSharpScriptViewModel(LogicalType logicalType) : base(logicalType) + { + } + } +} diff --git a/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj b/Extensions/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj similarity index 71% rename from AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj rename to Extensions/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj index b8bf641..b50684c 100644 --- a/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj +++ b/Extensions/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj @@ -9,7 +9,7 @@ - + diff --git a/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_meklaeq5_wpftmp.csproj b/Extensions/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_meklaeq5_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_meklaeq5_wpftmp.csproj rename to Extensions/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_meklaeq5_wpftmp.csproj diff --git a/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_vyggm4o1_wpftmp.csproj b/Extensions/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_vyggm4o1_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_vyggm4o1_wpftmp.csproj rename to Extensions/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_vyggm4o1_wpftmp.csproj diff --git a/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_yp1baqtv_wpftmp.csproj b/Extensions/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_yp1baqtv_wpftmp.csproj similarity index 100% rename from AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_yp1baqtv_wpftmp.csproj rename to Extensions/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC_yp1baqtv_wpftmp.csproj diff --git a/AIStudio.Wpf.SFC/LinkPoint.cs b/Extensions/AIStudio.Wpf.SFC/LinkPoint.cs similarity index 100% rename from AIStudio.Wpf.SFC/LinkPoint.cs rename to Extensions/AIStudio.Wpf.SFC/LinkPoint.cs diff --git a/AIStudio.Wpf.SFC/Models/SFCNodeDesignerItem.cs b/Extensions/AIStudio.Wpf.SFC/Models/SFCNodeDesignerItem.cs similarity index 100% rename from AIStudio.Wpf.SFC/Models/SFCNodeDesignerItem.cs rename to Extensions/AIStudio.Wpf.SFC/Models/SFCNodeDesignerItem.cs diff --git a/AIStudio.Wpf.SFC/Models/SFCToolBoxData.cs b/Extensions/AIStudio.Wpf.SFC/Models/SFCToolBoxData.cs similarity index 100% rename from AIStudio.Wpf.SFC/Models/SFCToolBoxData.cs rename to Extensions/AIStudio.Wpf.SFC/Models/SFCToolBoxData.cs diff --git a/AIStudio.Wpf.SFC/README.txt b/Extensions/AIStudio.Wpf.SFC/README.txt similarity index 100% rename from AIStudio.Wpf.SFC/README.txt rename to Extensions/AIStudio.Wpf.SFC/README.txt diff --git a/AIStudio.Wpf.SFC/SFCNodeKinds.cs b/Extensions/AIStudio.Wpf.SFC/SFCNodeKinds.cs similarity index 100% rename from AIStudio.Wpf.SFC/SFCNodeKinds.cs rename to Extensions/AIStudio.Wpf.SFC/SFCNodeKinds.cs diff --git a/AIStudio.Wpf.SFC/SFCService.cs b/Extensions/AIStudio.Wpf.SFC/SFCService.cs similarity index 100% rename from AIStudio.Wpf.SFC/SFCService.cs rename to Extensions/AIStudio.Wpf.SFC/SFCService.cs diff --git a/AIStudio.Wpf.SFC/Themes/SFCNode.xaml b/Extensions/AIStudio.Wpf.SFC/Themes/SFCNode.xaml similarity index 100% rename from AIStudio.Wpf.SFC/Themes/SFCNode.xaml rename to Extensions/AIStudio.Wpf.SFC/Themes/SFCNode.xaml diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCActionNode.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/SFCActionNode.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/SFCActionNode.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/SFCActionNode.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCCOBeginNode.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/SFCCOBeginNode.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/SFCCOBeginNode.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/SFCCOBeginNode.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCCOEndNode.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/SFCCOEndNode.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/SFCCOEndNode.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/SFCCOEndNode.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCConditionNode.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/SFCConditionNode.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/SFCConditionNode.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/SFCConditionNode.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/SFCNode.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCNodeNode.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/SFCNodeNode.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/SFCNodeNode.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/SFCNodeNode.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCStartNode.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/SFCStartNode.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/SFCStartNode.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/SFCStartNode.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_ListViewModel.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_ListViewModel.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/Simulate_ListViewModel.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_ListViewModel.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModel.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModel.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModel.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModel.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_StartViewModel.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_StartViewModel.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/Simulate_StartViewModel.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_StartViewModel.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModel.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModel.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModel.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModel.cs diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs b/Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs similarity index 100% rename from AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs rename to Extensions/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs diff --git a/Fluent.Ribbon/Fluent.Ribbon/Themes/Styles.xaml b/Fluent.Ribbon/Fluent.Ribbon/Themes/Styles.xaml deleted file mode 100644 index a2d5549..0000000 --- a/Fluent.Ribbon/Fluent.Ribbon/Themes/Styles.xaml +++ /dev/null @@ -1,5120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 36 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 36 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -