diff --git a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj index 36973e0..6ef6d0d 100644 --- a/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj +++ b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj @@ -3,8 +3,9 @@ WinExe true + true - + diff --git a/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml index 05f185e..b885f9d 100644 --- a/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml +++ b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml @@ -483,9 +483,9 @@ Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/ChangeCase.png" HorizontalAlignment="Left" SizeDefinition="Small" > - - - + + + - + - + - + - + @@ -539,28 +539,28 @@ - + - + - + - + @@ -570,28 +570,28 @@ - + - + - + - + @@ -611,7 +611,7 @@ Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/Bold.png" HorizontalAlignment="Left" SizeDefinition="Small" - IsChecked="{Binding FontWeight,Converter={converter:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}"> + IsChecked="{Binding FontWeight,Converter={dd:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}"> + IsChecked="{Binding FontStyle,Converter={dd:ConverterValueMapToBool Parameter='Normal'}, ConverterParameter='Italic'}"> - - - - - - + + + + + + - - - - + + + + - - + + diff --git a/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml b/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml index 8dd58c1..ac7c734 100644 --- a/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml +++ b/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml @@ -11,7 +11,7 @@ xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram" xmlns:conventer="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper" xmlns:command="clr-namespace:AIStudio.Wpf.DiagramHelper.Commands;assembly=AIStudio.Wpf.DiagramHelper" - xmlns:svg="clr-namespace:Svg2XamlTestExtension;assembly=Svg2XamlTestExtension" + xmlns:svg="https://gitee.com/akwkevin/aistudio.-wpf.-test/tree/master/Controls/AIStudio.Wpf.Svg2XamlExtension" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300"> diff --git a/AIStudio.Wpf.DiagramDesigner/A.ico b/AIStudio.Wpf.DiagramDesigner/A.ico new file mode 100644 index 0000000..cc92975 Binary files /dev/null and b/AIStudio.Wpf.DiagramDesigner/A.ico differ diff --git a/AIStudio.Wpf.DiagramDesigner/A.png b/AIStudio.Wpf.DiagramDesigner/A.png new file mode 100644 index 0000000..b6949fa Binary files /dev/null and b/AIStudio.Wpf.DiagramDesigner/A.png differ diff --git a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj index c70117e..461e253 100644 --- a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj +++ b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj @@ -2,11 +2,23 @@ true + AIStudio.Wpf.Controls + akwkevin + https://gitee.com/akwkevin + A.png + + + 1.0.1 + 一个Wpf的Diagram控件基础库 + + True + + @@ -32,6 +44,15 @@ + + $(DefaultXamlRuntime) + + + $(DefaultXamlRuntime) + + + $(DefaultXamlRuntime) + $(DefaultXamlRuntime) Designer diff --git a/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml b/AIStudio.Wpf.DiagramDesigner/Controls/MultiSelectComboBox.xaml similarity index 98% rename from AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml rename to AIStudio.Wpf.DiagramDesigner/Controls/MultiSelectComboBox.xaml index 96e1d8e..39ba2a0 100644 --- a/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml +++ b/AIStudio.Wpf.DiagramDesigner/Controls/MultiSelectComboBox.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for MultiSelectComboBox.xaml diff --git a/AIStudio.Wpf.DiagramHelper/Controls/PopupWindow.xaml b/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml similarity index 94% rename from AIStudio.Wpf.DiagramHelper/Controls/PopupWindow.xaml rename to AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml index 429a388..b7ac930 100644 --- a/AIStudio.Wpf.DiagramHelper/Controls/PopupWindow.xaml +++ b/AIStudio.Wpf.DiagramDesigner/Controls/PopupWindow.xaml @@ -1,4 +1,4 @@ - /// PopupWindow.xaml 的交互逻辑 diff --git a/AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml b/AIStudio.Wpf.DiagramDesigner/Controls/PropertiesView.xaml similarity index 97% rename from AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml rename to AIStudio.Wpf.DiagramDesigner/Controls/PropertiesView.xaml index 8c06995..2ab91b2 100644 --- a/AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml +++ b/AIStudio.Wpf.DiagramDesigner/Controls/PropertiesView.xaml @@ -1,4 +1,4 @@ - diff --git a/AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml.cs b/AIStudio.Wpf.DiagramDesigner/Controls/PropertiesView.xaml.cs similarity index 99% rename from AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml.cs rename to AIStudio.Wpf.DiagramDesigner/Controls/PropertiesView.xaml.cs index 0d31824..42bcc2f 100644 --- a/AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml.cs +++ b/AIStudio.Wpf.DiagramDesigner/Controls/PropertiesView.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Shapes; using System.ComponentModel; using System.Reflection; -namespace AIStudio.Wpf.DiagramHelper.Controls +namespace AIStudio.Wpf.DiagramDesigner.Controls { /// /// Interaction logic for PropertiesView.xaml diff --git a/AIStudio.Wpf.DiagramHelper/Converters/BoolVisibilityConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/BoolVisibilityConverter.cs similarity index 96% rename from AIStudio.Wpf.DiagramHelper/Converters/BoolVisibilityConverter.cs rename to AIStudio.Wpf.DiagramDesigner/Converters/BoolVisibilityConverter.cs index 0e847c2..11106ee 100644 --- a/AIStudio.Wpf.DiagramHelper/Converters/BoolVisibilityConverter.cs +++ b/AIStudio.Wpf.DiagramDesigner/Converters/BoolVisibilityConverter.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Data; -namespace AIStudio.Wpf.DiagramHelper.Converters +namespace AIStudio.Wpf.DiagramDesigner.Converters { public class BoolVisibilityConverter : IValueConverter { diff --git a/AIStudio.Wpf.DiagramHelper/Converters/ConverterBoolToValueMap.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterBoolToValueMap.cs similarity index 98% rename from AIStudio.Wpf.DiagramHelper/Converters/ConverterBoolToValueMap.cs rename to AIStudio.Wpf.DiagramDesigner/Converters/ConverterBoolToValueMap.cs index 25c46dc..9173ca8 100644 --- a/AIStudio.Wpf.DiagramHelper/Converters/ConverterBoolToValueMap.cs +++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterBoolToValueMap.cs @@ -4,7 +4,7 @@ using System.Windows; using System.Windows.Data; using System.Windows.Markup; -namespace AIStudio.Wpf.DiagramHelper.Converters +namespace AIStudio.Wpf.DiagramDesigner.Converters { public class ConverterBoolToValueMap : MarkupExtension, IValueConverter { diff --git a/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapSetToVisibility.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueMapSetToVisibility.cs similarity index 97% rename from AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapSetToVisibility.cs rename to AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueMapSetToVisibility.cs index bcfc687..f96bc30 100644 --- a/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapSetToVisibility.cs +++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueMapSetToVisibility.cs @@ -7,7 +7,7 @@ using System.Windows; using System.Windows.Data; using System.Windows.Markup; -namespace AIStudio.Wpf.DiagramHelper.Converters +namespace AIStudio.Wpf.DiagramDesigner.Converters { public class ConverterValueMapSetToVisibility : MarkupExtension, IValueConverter { diff --git a/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToBool.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueMapToBool.cs similarity index 98% rename from AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToBool.cs rename to AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueMapToBool.cs index 9fb54b0..beb3068 100644 --- a/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToBool.cs +++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueMapToBool.cs @@ -4,7 +4,7 @@ using System.Windows; using System.Windows.Data; using System.Windows.Markup; -namespace AIStudio.Wpf.DiagramHelper.Converters +namespace AIStudio.Wpf.DiagramDesigner.Converters { public class ConverterValueMapToBool : MarkupExtension, IValueConverter { diff --git a/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToVisibility.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueMapToVisibility.cs similarity index 97% rename from AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToVisibility.cs rename to AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueMapToVisibility.cs index f996ba1..5224eaf 100644 --- a/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToVisibility.cs +++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueMapToVisibility.cs @@ -7,7 +7,7 @@ using System.Windows; using System.Windows.Data; using System.Windows.Markup; -namespace AIStudio.Wpf.DiagramHelper.Converters +namespace AIStudio.Wpf.DiagramDesigner.Converters { public class ConverterValueMapToVisibility : MarkupExtension, IValueConverter { diff --git a/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueSetToOppositeVisibility.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueSetToOppositeVisibility.cs similarity index 97% rename from AIStudio.Wpf.DiagramHelper/Converters/ConverterValueSetToOppositeVisibility.cs rename to AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueSetToOppositeVisibility.cs index ac92867..8684eb9 100644 --- a/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueSetToOppositeVisibility.cs +++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConverterValueSetToOppositeVisibility.cs @@ -7,7 +7,7 @@ using System.Windows; using System.Windows.Data; using System.Windows.Markup; -namespace AIStudio.Wpf.DiagramHelper.Converters +namespace AIStudio.Wpf.DiagramDesigner.Converters { public class ConverterValueSetToOppositeVisibility : MarkupExtension, IValueConverter { diff --git a/AIStudio.Wpf.DiagramHelper/Converters/Converters.cs b/AIStudio.Wpf.DiagramDesigner/Converters/Converters.cs similarity index 99% rename from AIStudio.Wpf.DiagramHelper/Converters/Converters.cs rename to AIStudio.Wpf.DiagramDesigner/Converters/Converters.cs index 88453f1..92b9a8c 100644 --- a/AIStudio.Wpf.DiagramHelper/Converters/Converters.cs +++ b/AIStudio.Wpf.DiagramDesigner/Converters/Converters.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.Windows; using System.Windows.Data; -namespace AIStudio.Wpf.DiagramHelper.Converters +namespace AIStudio.Wpf.DiagramDesigner.Converters { #region Half public class HalfConverter : IValueConverter diff --git a/AIStudio.Wpf.DiagramHelper/Converters/IntToBoolConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/IntToBoolConverter.cs similarity index 92% rename from AIStudio.Wpf.DiagramHelper/Converters/IntToBoolConverter.cs rename to AIStudio.Wpf.DiagramDesigner/Converters/IntToBoolConverter.cs index 306afc9..5ff50ac 100644 --- a/AIStudio.Wpf.DiagramHelper/Converters/IntToBoolConverter.cs +++ b/AIStudio.Wpf.DiagramDesigner/Converters/IntToBoolConverter.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Data; -namespace AIStudio.Wpf.DiagramHelper.Converters +namespace AIStudio.Wpf.DiagramDesigner.Converters { public class IntToBoolConverter : IValueConverter { diff --git a/AIStudio.Wpf.DiagramDesigner/Properties/AssemblyInfo.cs b/AIStudio.Wpf.DiagramDesigner/Properties/AssemblyInfo.cs index 3c7c9ad..5ad37f4 100644 --- a/AIStudio.Wpf.DiagramDesigner/Properties/AssemblyInfo.cs +++ b/AIStudio.Wpf.DiagramDesigner/Properties/AssemblyInfo.cs @@ -12,5 +12,6 @@ using System.Windows.Markup; [assembly: XmlnsDefinition("https://gitee.com/akwkevin/aistudio.-wpf.-diagram", "AIStudio.Wpf.DiagramDesigner")] [assembly: XmlnsDefinition("https://gitee.com/akwkevin/aistudio.-wpf.-diagram", "AIStudio.Wpf.DiagramDesigner.Controls")] +[assembly: XmlnsDefinition("https://gitee.com/akwkevin/aistudio.-wpf.-diagram", "AIStudio.Wpf.DiagramDesigner.Converters")] [assembly: XmlnsPrefix("https://gitee.com/akwkevin/aistudio.-wpf.-diagram", "dd")] \ No newline at end of file diff --git a/AIStudio.Wpf.DiagramHelper/ApplicationServicesProvider.cs b/AIStudio.Wpf.DiagramDesigner/Services/ApplicationServicesProvider.cs similarity index 90% rename from AIStudio.Wpf.DiagramHelper/ApplicationServicesProvider.cs rename to AIStudio.Wpf.DiagramDesigner/Services/ApplicationServicesProvider.cs index e8b0838..dfe8b97 100644 --- a/AIStudio.Wpf.DiagramHelper/ApplicationServicesProvider.cs +++ b/AIStudio.Wpf.DiagramDesigner/Services/ApplicationServicesProvider.cs @@ -1,11 +1,6 @@ -using AIStudio.Wpf.DiagramHelper.Services; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; -namespace AIStudio.Wpf.DiagramHelper +namespace AIStudio.Wpf.DiagramDesigner.Services { /// /// Simple service interface diff --git a/AIStudio.Wpf.DiagramHelper/Services/IMessageBoxService.cs b/AIStudio.Wpf.DiagramDesigner/Services/IMessageBoxService.cs similarity index 99% rename from AIStudio.Wpf.DiagramHelper/Services/IMessageBoxService.cs rename to AIStudio.Wpf.DiagramDesigner/Services/IMessageBoxService.cs index a6f118f..436edb7 100644 --- a/AIStudio.Wpf.DiagramHelper/Services/IMessageBoxService.cs +++ b/AIStudio.Wpf.DiagramDesigner/Services/IMessageBoxService.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace AIStudio.Wpf.DiagramHelper.Services +namespace AIStudio.Wpf.DiagramDesigner.Services { /// /// Available Button options. diff --git a/AIStudio.Wpf.DiagramHelper/Services/IUIVisualizerService.cs b/AIStudio.Wpf.DiagramDesigner/Services/IUIVisualizerService.cs similarity index 93% rename from AIStudio.Wpf.DiagramHelper/Services/IUIVisualizerService.cs rename to AIStudio.Wpf.DiagramDesigner/Services/IUIVisualizerService.cs index 4bb696c..2215169 100644 --- a/AIStudio.Wpf.DiagramHelper/Services/IUIVisualizerService.cs +++ b/AIStudio.Wpf.DiagramDesigner/Services/IUIVisualizerService.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace AIStudio.Wpf.DiagramHelper.Services +namespace AIStudio.Wpf.DiagramDesigner.Services { /// /// This interface defines a UI controller which can be used to display dialogs diff --git a/AIStudio.Wpf.DiagramHelper/Services/WPFMessageBoxService.cs b/AIStudio.Wpf.DiagramDesigner/Services/WPFMessageBoxService.cs similarity index 99% rename from AIStudio.Wpf.DiagramHelper/Services/WPFMessageBoxService.cs rename to AIStudio.Wpf.DiagramDesigner/Services/WPFMessageBoxService.cs index 5239906..9322ef6 100644 --- a/AIStudio.Wpf.DiagramHelper/Services/WPFMessageBoxService.cs +++ b/AIStudio.Wpf.DiagramDesigner/Services/WPFMessageBoxService.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; -namespace AIStudio.Wpf.DiagramHelper.Services +namespace AIStudio.Wpf.DiagramDesigner.Services { /// /// This class implements the IMessageBoxService for WPF purposes. diff --git a/AIStudio.Wpf.DiagramHelper/Services/WPFUIVisualizerService.cs b/AIStudio.Wpf.DiagramDesigner/Services/WPFUIVisualizerService.cs similarity index 76% rename from AIStudio.Wpf.DiagramHelper/Services/WPFUIVisualizerService.cs rename to AIStudio.Wpf.DiagramDesigner/Services/WPFUIVisualizerService.cs index 6a81c3a..b6af96f 100644 --- a/AIStudio.Wpf.DiagramHelper/Services/WPFUIVisualizerService.cs +++ b/AIStudio.Wpf.DiagramDesigner/Services/WPFUIVisualizerService.cs @@ -1,12 +1,7 @@ -using AIStudio.Wpf.DiagramHelper.Controls; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using System.Windows; +using AIStudio.Wpf.DiagramDesigner.Controls; -namespace AIStudio.Wpf.DiagramHelper.Services +namespace AIStudio.Wpf.DiagramDesigner.Services { public class WPFUIVisualizerService : IUIVisualizerService { diff --git a/AIStudio.Wpf.DiagramHelper/A.ico b/AIStudio.Wpf.DiagramHelper/A.ico new file mode 100644 index 0000000..cc92975 Binary files /dev/null and b/AIStudio.Wpf.DiagramHelper/A.ico differ diff --git a/AIStudio.Wpf.DiagramHelper/A.png b/AIStudio.Wpf.DiagramHelper/A.png new file mode 100644 index 0000000..b6949fa Binary files /dev/null and b/AIStudio.Wpf.DiagramHelper/A.png differ diff --git a/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj b/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj index 944a2fd..46ef60d 100644 --- a/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj +++ b/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj @@ -3,73 +3,38 @@ true true + AIStudio.Wpf.Controls + akwkevin + https://gitee.com/akwkevin + A.png + + + 1.0.1 + 一个Wpf的Diagram控件帮助库 + - - + + + + + True + + + DLL\zxing.core.dll - - - - - $(DefaultXamlRuntime) - - - $(DefaultXamlRuntime) - - - $(DefaultXamlRuntime) - Designer - - - $(DefaultXamlRuntime) - - - $(DefaultXamlRuntime) - - - $(DefaultXamlRuntime) - Designer - - - $(DefaultXamlRuntime) - Designer - - - $(DefaultXamlRuntime) - Designer - - - $(DefaultXamlRuntime) - - - $(DefaultXamlRuntime) - Designer - - - $(DefaultXamlRuntime) - Designer - - - $(DefaultXamlRuntime) - Designer - - - - - - + diff --git a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs index 8e5fe68..e340cc5 100644 --- a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs +++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs @@ -1,6 +1,6 @@ -using AIStudio.Wpf.DiagramHelper.Services; -using System; +using System; using AIStudio.Wpf.DiagramDesigner; +using AIStudio.Wpf.DiagramDesigner.Services; using ZXing; namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels diff --git a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml index 37f09b3..58d6075 100644 --- a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml +++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml @@ -6,12 +6,11 @@ xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls" xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram" xmlns:Fluent="urn:fluent-ribbon" - xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner" xmlns:i="http://schemas.microsoft.com/xaml/behaviors"> - + - + diff --git a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs index 8891109..4137eed 100644 --- a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs +++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs @@ -1,8 +1,8 @@ -using AIStudio.Wpf.DiagramHelper.Services; -using System.Globalization; +using System.Globalization; using System.Windows; using System.Windows.Media; using AIStudio.Wpf.DiagramDesigner; +using AIStudio.Wpf.DiagramDesigner.Services; namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels { diff --git a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml index 67ca0c6..c9380b9 100644 --- a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml +++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml @@ -2,16 +2,14 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels" xmlns:gif="http://wpfanimatedgif.codeplex.com" - xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters" xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls" xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram" xmlns:Fluent="urn:fluent-ribbon" - xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner" xmlns:i="http://schemas.microsoft.com/xaml/behaviors"> - - - + + + @@ -44,9 +42,9 @@ Text="{Binding Text}" FontSize="{Binding ElementName=comboBoxFontSize,Path=SelectedItem}" FontFamily="{Binding ElementName=comboBoxFontName,Path=SelectedItem}" - FontWeight="{Binding ElementName=buttonBold,Path=IsChecked,Converter={converter:ConverterBoolToValueMap Parameter='Regular'}, ConverterParameter='Bold'}" - FontStyle="{Binding ElementName=buttonItalic,Path=IsChecked,Converter={converter:ConverterBoolToValueMap Parameter='Normal'}, ConverterParameter='Italic'}" - TextDecorations="{Binding ElementName=buttonUnderline,Path=IsChecked,Converter={converter:ConverterBoolToValueMap Parameter='None'}, ConverterParameter='Underline'}" + FontWeight="{Binding ElementName=buttonBold,Path=IsChecked,Converter={dd:ConverterBoolToValueMap Parameter='Regular'}, ConverterParameter='Bold'}" + FontStyle="{Binding ElementName=buttonItalic,Path=IsChecked,Converter={dd:ConverterBoolToValueMap Parameter='Normal'}, ConverterParameter='Italic'}" + TextDecorations="{Binding ElementName=buttonUnderline,Path=IsChecked,Converter={dd:ConverterBoolToValueMap Parameter='None'}, ConverterParameter='Underline'}" Height="100" Margin="5" TextWrapping="Wrap"/> @@ -94,13 +92,13 @@ Icon="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Images/Bold.png" HorizontalAlignment="Left" SizeDefinition="Small" - IsChecked="{Binding FontViewModel.FontWeight,Converter={converter:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}"/> + IsChecked="{Binding FontViewModel.FontWeight,Converter={dd:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}"/> + IsChecked="{Binding FontViewModel.FontStyle,Converter={dd:ConverterValueMapToBool Parameter='Normal'}, ConverterParameter='Italic'}"/> - - - + + + diff --git a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.cs index 0e913d5..e41738e 100644 --- a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.cs +++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.cs @@ -1,6 +1,6 @@ -using AIStudio.Wpf.DiagramHelper.Services; -using System; +using System; using AIStudio.Wpf.DiagramDesigner; +using AIStudio.Wpf.DiagramDesigner.Services; using AIStudio.Wpf.DiagramHelper.Extensions.Models; namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels diff --git a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml index 879f1fa..0b01e55 100644 --- a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml +++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml @@ -6,12 +6,11 @@ xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls" xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram" xmlns:Fluent="urn:fluent-ribbon" - xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner" xmlns:i="http://schemas.microsoft.com/xaml/behaviors"> - + - + diff --git a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.xaml index 31b15c7..ed4bcfe 100644 --- a/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.xaml +++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.xaml @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner" xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels" - xmlns:svg="clr-namespace:Svg2XamlTestExtension;assembly=Svg2XamlTestExtension"> + xmlns:svg="https://gitee.com/akwkevin/aistudio.-wpf.-test/tree/master/Controls/AIStudio.Wpf.Svg2XamlExtension"> diff --git a/AIStudio.Wpf.Flowchart/A.ico b/AIStudio.Wpf.Flowchart/A.ico new file mode 100644 index 0000000..cc92975 Binary files /dev/null and b/AIStudio.Wpf.Flowchart/A.ico differ diff --git a/AIStudio.Wpf.Flowchart/A.png b/AIStudio.Wpf.Flowchart/A.png new file mode 100644 index 0000000..b6949fa Binary files /dev/null and b/AIStudio.Wpf.Flowchart/A.png differ diff --git a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj b/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj index 050d2fb..23c0dc8 100644 --- a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj +++ b/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj @@ -2,16 +2,20 @@ true + AIStudio.Wpf.Controls + akwkevin + https://gitee.com/akwkevin + A.png + + + 1.0.1 + 一个Wpf的流程图控件 - - - - $(DefaultXamlRuntime) @@ -19,4 +23,15 @@ + + + True + + + + + + + + diff --git a/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs b/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs index 17021da..ffdf205 100644 --- a/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs +++ b/AIStudio.Wpf.Flowchart/Controls/FlowchartEditor.xaml.cs @@ -40,7 +40,7 @@ namespace AIStudio.Wpf.Flowchart.Controls _diagramViewModel.PageSizeType = PageSizeType.Custom; _diagramViewModel.PageSize = new Size(double.NaN, double.NaN); _diagramViewModel.ColorViewModel = new ColorViewModel() { LineWidth = 2 }; - _diagramViewModel.DrawModeViewModel = new DrawModeViewModel() { VectorLineDrawMode = DrawMode.BoundaryConnectingLine }; + //_diagramViewModel.DrawModeViewModel = new DrawModeViewModel() { VectorLineDrawMode = DrawMode.BoundaryConnectingLine }; _diagramViewModel.PropertyChanged += DiagramViewModel_PropertyChanged; } diff --git a/AIStudio.Wpf.Flowchart/Themes/FlowNode.xaml b/AIStudio.Wpf.Flowchart/Themes/FlowNode.xaml index de87280..effe1e8 100644 --- a/AIStudio.Wpf.Flowchart/Themes/FlowNode.xaml +++ b/AIStudio.Wpf.Flowchart/Themes/FlowNode.xaml @@ -1,10 +1,9 @@  + xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram" + xmlns:viewmodel="clr-namespace:AIStudio.Wpf.Flowchart.ViewModels"> - + @@ -113,10 +112,10 @@ - - - - + + + + diff --git a/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs b/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs index 3e9dbf4..b88958e 100644 --- a/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs +++ b/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs @@ -1,10 +1,9 @@ -using AIStudio.Wpf.DiagramHelper; -using AIStudio.Wpf.DiagramHelper.Services; -using AIStudio.Wpf.Flowchart.Models; +using System; using System.Collections.Generic; using System.ComponentModel; using AIStudio.Wpf.DiagramDesigner; -using System; +using AIStudio.Wpf.DiagramDesigner.Services; +using AIStudio.Wpf.Flowchart.Models; namespace AIStudio.Wpf.Flowchart.ViewModels { diff --git a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs b/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs index 77f617f..755d64b 100644 --- a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs +++ b/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs @@ -1,8 +1,8 @@ -using AIStudio.Wpf.DiagramHelper.Controls; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel; using System.Windows; using AIStudio.Wpf.DiagramDesigner; +using AIStudio.Wpf.DiagramDesigner.Controls; namespace AIStudio.Wpf.Flowchart.ViewModels { diff --git a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs b/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs index 8595563..c1fac05 100644 --- a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs +++ b/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs @@ -1,9 +1,22 @@ -using AIStudio.Wpf.DiagramHelper.Models; +using AIStudio.Wpf.DiagramDesigner; namespace AIStudio.Wpf.Flowchart.ViewModels { - public class MiddleFlowNodeData : TitleBindableBase + public class MiddleFlowNodeData : BindableBase { + private string _title; + public string Title + { + get + { + return _title; + } + set + { + SetProperty(ref _title, value); + } + } + public MiddleFlowNodeData() { Title = "审批"; diff --git a/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj b/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj index 2d4aae7..eb75742 100644 --- a/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj +++ b/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj @@ -5,7 +5,7 @@ - + diff --git a/AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml b/AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml index 709c8cd..70cf0d7 100644 --- a/AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml +++ b/AIStudio.Wpf.Logical/Themes/LogicalGateItemViewModel.xaml @@ -3,16 +3,12 @@ xmlns:local="clr-namespace:AIStudio.Wpf.Logical" xmlns:viewmodel="clr-namespace:AIStudio.Wpf.Logical.ViewModels" xmlns:gif="http://wpfanimatedgif.codeplex.com" - xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper" - xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls;assembly=AIStudio.Wpf.DiagramHelper" xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram" - xmlns:Fluent="urn:fluent-ribbon" - xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner" xmlns:i="http://schemas.microsoft.com/xaml/behaviors"> - - - + + + diff --git a/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs b/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs index 4ef9727..91e0544 100644 --- a/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs +++ b/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs @@ -1,4 +1,4 @@ -using AIStudio.Wpf.DiagramHelper.Models; +using AIStudio.Wpf.DiagramDesigner; namespace AIStudio.Wpf.Logical.ViewModels { @@ -8,8 +8,21 @@ namespace AIStudio.Wpf.Logical.ViewModels /// the popup to be cancelled without applying any changes to the calling ViewModel /// whos data will be updated if the PopupWindow.xaml window is closed successfully /// - public class LinkPointDesignerItemData : TitleBindableBase + public class LinkPointDesignerItemData : BindableBase { + private string _title; + public string Title + { + get + { + return _title; + } + set + { + SetProperty(ref _title, value); + } + } + public LinkPointDesignerItemData(LinkPoint linkPoint) { this.LinkPoint = linkPoint; diff --git a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs index 26f05ef..a9a361c 100644 --- a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs +++ b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs @@ -1,5 +1,4 @@ -using AIStudio.Wpf.DiagramHelper.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.ObjectModel; using AIStudio.Wpf.DiagramDesigner; @@ -11,8 +10,21 @@ namespace AIStudio.Wpf.Logical.ViewModels /// the popup to be cancelled without applying any changes to the calling ViewModel /// whos data will be updated if the PopupWindow.xaml window is closed successfully /// - public class LogicalGateItemData : TitleBindableBase + public class LogicalGateItemData : BindableBase { + private string _title; + public string Title + { + get + { + return _title; + } + set + { + SetProperty(ref _title, value); + } + } + public LogicalGateItemData(IEnumerable inputvalues) { this.InputValues = new ObservableCollection(inputvalues); diff --git a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs index d0cab31..e63845f 100644 --- a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs +++ b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs @@ -1,10 +1,9 @@ -using AIStudio.Wpf.DiagramHelper; -using AIStudio.Wpf.DiagramHelper.Services; -using System; +using System; using System.Collections.ObjectModel; using System.Linq; using System.Windows.Media; using AIStudio.Wpf.DiagramDesigner; +using AIStudio.Wpf.DiagramDesigner.Services; namespace AIStudio.Wpf.Logical.ViewModels { diff --git a/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs b/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs index 32fdee6..27eb099 100644 --- a/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs +++ b/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs @@ -1,4 +1,4 @@ -using AIStudio.Wpf.DiagramHelper.Models; +using AIStudio.Wpf.DiagramDesigner; namespace AIStudio.Wpf.Logical.ViewModels { @@ -8,8 +8,21 @@ namespace AIStudio.Wpf.Logical.ViewModels /// the popup to be cancelled without applying any changes to the calling ViewModel /// whos data will be updated if the PopupWindow.xaml window is closed successfully /// - public class ValueDesignerItemData : TitleBindableBase + public class ValueDesignerItemData : BindableBase { + private string _title; + public string Title + { + get + { + return _title; + } + set + { + SetProperty(ref _title, value); + } + } + public ValueDesignerItemData(double value) { this.Value = value; diff --git a/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj b/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj index 5e54e3e..b8bf641 100644 --- a/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj +++ b/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj @@ -9,7 +9,7 @@ - + diff --git a/AIStudio.Wpf.SFC/Themes/SFCNode.xaml b/AIStudio.Wpf.SFC/Themes/SFCNode.xaml index 928bdd2..f5bd3d2 100644 --- a/AIStudio.Wpf.SFC/Themes/SFCNode.xaml +++ b/AIStudio.Wpf.SFC/Themes/SFCNode.xaml @@ -1,13 +1,12 @@  + xmlns:local="clr-namespace:AIStudio.Wpf.SFC"> - - - + + + diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs b/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs index 91897b4..94c133a 100644 --- a/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs +++ b/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs @@ -1,10 +1,4 @@ -using AIStudio.Wpf.DiagramHelper.Commands; -using AIStudio.Wpf.DiagramHelper.Models; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Windows.Input; -using AIStudio.Wpf.DiagramDesigner; +using AIStudio.Wpf.DiagramDesigner; namespace AIStudio.Wpf.SFC.ViewModels { @@ -14,8 +8,21 @@ namespace AIStudio.Wpf.SFC.ViewModels /// the popup to be cancelled without applying any changes to the calling ViewModel /// whos data will be updated if the PopupWindow.xaml window is closed successfully /// - public class SFCActionNodeData : TitleBindableBase + public class SFCActionNodeData : BindableBase { + private string _title; + public string Title + { + get + { + return _title; + } + set + { + SetProperty(ref _title, value); + } + } + public SFCActionNodeData(LinkPoint linkPoint, string expression) { Title = "输出动作"; diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs b/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs index e550811..22e88b1 100644 --- a/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs +++ b/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs @@ -1,7 +1,4 @@ -using AIStudio.Wpf.DiagramHelper.Commands; -using AIStudio.Wpf.DiagramHelper.Models; -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Windows.Input; using AIStudio.Wpf.DiagramDesigner; @@ -14,8 +11,20 @@ namespace AIStudio.Wpf.SFC.ViewModels /// the popup to be cancelled without applying any changes to the calling ViewModel /// whos data will be updated if the PopupWindow.xaml window is closed successfully /// - public class SFCConditionNodeData : TitleBindableBase + public class SFCConditionNodeData : BindableBase { + private string _title; + public string Title + { + get + { + return _title; + } + set + { + SetProperty(ref _title, value); + } + } public SFCConditionNodeData(IEnumerable linkPoint, string expression) { Title = "转移条件"; @@ -54,7 +63,7 @@ namespace AIStudio.Wpf.SFC.ViewModels { get { - return this._addCommand ?? (this._addCommand = new DelegateCommand(para => this.AddExecuted(para))); + return this._addCommand ?? (this._addCommand = new SimpleCommand(para => { return true; }, para => this.AddExecuted(para))); } } @@ -63,7 +72,7 @@ namespace AIStudio.Wpf.SFC.ViewModels { get { - return this._deleteCommand ?? (this._deleteCommand = new DelegateCommand(para => this.DeleteExecuted(para))); + return this._deleteCommand ?? (this._deleteCommand = new SimpleCommand(para => { return true; }, para => this.DeleteExecuted(para))); } } diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs b/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs index d173559..04f836e 100644 --- a/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs +++ b/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs @@ -4,8 +4,7 @@ using System.ComponentModel; using System.Linq; using System.Windows.Media; using AIStudio.Wpf.DiagramDesigner; -using AIStudio.Wpf.DiagramHelper; -using AIStudio.Wpf.DiagramHelper.Services; +using AIStudio.Wpf.DiagramDesigner.Services; using AIStudio.Wpf.SFC.Models; namespace AIStudio.Wpf.SFC.ViewModels diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs b/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs index f63ede2..c15e6ec 100644 --- a/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs +++ b/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs @@ -1,13 +1,22 @@ -using AIStudio.Wpf.DiagramHelper.Models; -using System; -using System.Collections.Generic; -using System.Text; -using AIStudio.Wpf.DiagramDesigner; +using AIStudio.Wpf.DiagramDesigner; namespace AIStudio.Wpf.SFC.ViewModels { - public class Simulate_SolenoidViewModelData : TitleBindableBase + public class Simulate_SolenoidViewModelData : BindableBase { + private string _title; + public string Title + { + get + { + return _title; + } + set + { + SetProperty(ref _title, value); + } + } + public Simulate_SolenoidViewModelData(LinkPoint dILinkPoint, LinkPoint dOLinkPoint) { Title = "阀门"; diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs b/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs index 793a860..b82c3dd 100644 --- a/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs +++ b/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs @@ -1,13 +1,22 @@ -using AIStudio.Wpf.DiagramHelper.Models; -using System; -using System.Collections.Generic; -using System.Text; -using AIStudio.Wpf.DiagramDesigner; +using AIStudio.Wpf.DiagramDesigner; namespace AIStudio.Wpf.SFC.ViewModels { - public class Simulate_TankViewModelData : TitleBindableBase + public class Simulate_TankViewModelData : BindableBase { + private string _title; + public string Title + { + get + { + return _title; + } + set + { + SetProperty(ref _title, value); + } + } + public Simulate_TankViewModelData(LinkPoint linkPoint) { Title = "容器";