diff --git a/.gitignore b/.gitignore index 3105e41..e6e6982 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /*/bin/* /*/obj/* +/.vs/* diff --git a/Dichtheitsprüfung.sln b/Dichtheitsprüfung.sln index 50b4534..ea8ee04 100644 --- a/Dichtheitsprüfung.sln +++ b/Dichtheitsprüfung.sln @@ -1,33 +1,35 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31019.35 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DPGetDataContract", "DPGetDataContract\DPGetDataContract.csproj", "{FEAFDFF0-4E0F-4C3F-AA04-3DB55FE40EEF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DPGetDataContract", "DPGetDataContract\DPGetDataContract.csproj", "{FEAFDFF0-4E0F-4C3F-AA04-3DB55FE40EEF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataGen", "DataGen\DataGen.csproj", "{6353BC4D-10F2-44D5-AB72-DB93B51E8B04}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataGen", "DataGen\DataGen.csproj", "{6353BC4D-10F2-44D5-AB72-DB93B51E8B04}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication", "ConsoleApplication\ConsoleApplication.csproj", "{1C7FAD38-27EA-44DD-BACF-D5C6D03D48BB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApplication", "ConsoleApplication\ConsoleApplication.csproj", "{1C7FAD38-27EA-44DD-BACF-D5C6D03D48BB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtokollWriterContract", "ProtokollWriterContract\ProtokollWriterContract.csproj", "{2CD864B2-7DC5-4667-98D3-5DC841E21CD9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtokollWriterContract", "ProtokollWriterContract\ProtokollWriterContract.csproj", "{2CD864B2-7DC5-4667-98D3-5DC841E21CD9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "Models\Models.csproj", "{E5A85D83-CEC8-4925-B8AA-068BD6B50528}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Models", "Models\Models.csproj", "{E5A85D83-CEC8-4925-B8AA-068BD6B50528}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtokollWriter", "ProtokollWriter\ProtokollWriter.csproj", "{9762AAF6-BB07-4416-9522-3D2A05C4216A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtokollWriter", "ProtokollWriter\ProtokollWriter.csproj", "{9762AAF6-BB07-4416-9522-3D2A05C4216A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStoring.Contract", "DataStoring.Contract\DataStoring.Contract.csproj", "{BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataStoring.Contract", "DataStoring.Contract\DataStoring.Contract.csproj", "{BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStoring.CSV", "DataStoring.CSV\DataStoring.CSV.csproj", "{18E745A2-2D17-4C21-BD6F-521E681A9834}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataStoring.CSV", "DataStoring.CSV\DataStoring.CSV.csproj", "{18E745A2-2D17-4C21-BD6F-521E681A9834}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiWPF", "GuiWPF\GuiWPF.csproj", "{4CEEFEE5-9AD5-48E5-9168-5C56E232EFED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuiWPF", "GuiWPF\GuiWPF.csproj", "{4CEEFEE5-9AD5-48E5-9168-5C56E232EFED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStoring.EfCore", "DataStoring.EfCore\DataStoring.EfCore.csproj", "{E660EB07-8284-4047-B534-20FB65D76632}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataStoring.EfCore", "DataStoring.EfCore\DataStoring.EfCore.csproj", "{E660EB07-8284-4047-B534-20FB65D76632}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DichtheitManagement", "DichtheitManagement\DichtheitManagement.csproj", "{2F84635C-4414-4B99-967D-12B8CB8C8B10}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DichtheitManagement", "DichtheitManagement\DichtheitManagement.csproj", "{2F84635C-4414-4B99-967D-12B8CB8C8B10}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DichtheitManagement.Contract", "DichtheitManagement.Contract\DichtheitManagement.Contract.csproj", "{29298D7D-36C6-4092-8615-1B49E0D7A74C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DichtheitManagement.Contract", "DichtheitManagement.Contract\DichtheitManagement.Contract.csproj", "{29298D7D-36C6-4092-8615-1B49E0D7A74C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mappings", "Mappings\Mappings.csproj", "{CB3C8585-E6B2-42AC-BED6-9924E7CDC355}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mappings", "Mappings\Mappings.csproj", "{CB3C8585-E6B2-42AC-BED6-9924E7CDC355}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiWPF_ViewModel", "GuiWPF_ViewModel\GuiWPF_ViewModel.csproj", "{AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -38,9 +40,6 @@ Global Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FEAFDFF0-4E0F-4C3F-AA04-3DB55FE40EEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FEAFDFF0-4E0F-4C3F-AA04-3DB55FE40EEF}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -114,18 +113,6 @@ Global {9762AAF6-BB07-4416-9522-3D2A05C4216A}.Release|x64.Build.0 = Release|Any CPU {9762AAF6-BB07-4416-9522-3D2A05C4216A}.Release|x86.ActiveCfg = Release|Any CPU {9762AAF6-BB07-4416-9522-3D2A05C4216A}.Release|x86.Build.0 = Release|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Debug|x64.ActiveCfg = Debug|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Debug|x64.Build.0 = Debug|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Debug|x86.ActiveCfg = Debug|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Debug|x86.Build.0 = Debug|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Release|Any CPU.Build.0 = Release|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Release|x64.ActiveCfg = Release|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Release|x64.Build.0 = Release|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Release|x86.ActiveCfg = Release|Any CPU - {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Release|x86.Build.0 = Release|Any CPU {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -162,18 +149,6 @@ Global {4CEEFEE5-9AD5-48E5-9168-5C56E232EFED}.Release|x64.Build.0 = Release|Any CPU {4CEEFEE5-9AD5-48E5-9168-5C56E232EFED}.Release|x86.ActiveCfg = Release|Any CPU {4CEEFEE5-9AD5-48E5-9168-5C56E232EFED}.Release|x86.Build.0 = Release|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Debug|x64.ActiveCfg = Debug|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Debug|x64.Build.0 = Debug|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Debug|x86.ActiveCfg = Debug|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Debug|x86.Build.0 = Debug|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Release|Any CPU.Build.0 = Release|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Release|x64.ActiveCfg = Release|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Release|x64.Build.0 = Release|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Release|x86.ActiveCfg = Release|Any CPU - {32F96484-B002-454B-97C9-8976270726C6}.Release|x86.Build.0 = Release|Any CPU {E660EB07-8284-4047-B534-20FB65D76632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E660EB07-8284-4047-B534-20FB65D76632}.Debug|Any CPU.Build.0 = Debug|Any CPU {E660EB07-8284-4047-B534-20FB65D76632}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -222,5 +197,23 @@ Global {CB3C8585-E6B2-42AC-BED6-9924E7CDC355}.Release|x64.Build.0 = Release|Any CPU {CB3C8585-E6B2-42AC-BED6-9924E7CDC355}.Release|x86.ActiveCfg = Release|Any CPU {CB3C8585-E6B2-42AC-BED6-9924E7CDC355}.Release|x86.Build.0 = Release|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Debug|x64.ActiveCfg = Debug|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Debug|x64.Build.0 = Debug|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Debug|x86.ActiveCfg = Debug|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Debug|x86.Build.0 = Debug|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Release|Any CPU.Build.0 = Release|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Release|x64.ActiveCfg = Release|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Release|x64.Build.0 = Release|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Release|x86.ActiveCfg = Release|Any CPU + {AEE0E978-875E-4BF4-B5D5-CF8D85E227CE}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BFF628DF-FF6C-4DE8-85AB-A62767FD917D} EndGlobalSection EndGlobal diff --git a/GuiWPF/GuiWPF.csproj b/GuiWPF/GuiWPF.csproj index 407932c..2975bef 100644 --- a/GuiWPF/GuiWPF.csproj +++ b/GuiWPF/GuiWPF.csproj @@ -6,4 +6,8 @@ true + + + + diff --git a/GuiWPF/MainWindow.xaml b/GuiWPF/MainWindow.xaml index f309cfb..30c3f9c 100644 --- a/GuiWPF/MainWindow.xaml +++ b/GuiWPF/MainWindow.xaml @@ -5,8 +5,14 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:GuiWPF" mc:Ignorable="d" - Title="MainWindow" Height="450" Width="800"> + Title="{Binding Titel, StringFormat={} DP - {0}}" Height="450" Width="800"> + + + + + diff --git a/GuiWPF/MainWindow.xaml.cs b/GuiWPF/MainWindow.xaml.cs index db5c7b9..800f408 100644 --- a/GuiWPF/MainWindow.xaml.cs +++ b/GuiWPF/MainWindow.xaml.cs @@ -1,4 +1,5 @@ -using System; +using GuiWPF_ViewModel; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -23,6 +24,7 @@ namespace GuiWPF public MainWindow() { InitializeComponent(); + this.DataContext = new MainViewModel(); } } } diff --git a/GuiWPF_ViewModel/GuiWPF_ViewModel.csproj b/GuiWPF_ViewModel/GuiWPF_ViewModel.csproj new file mode 100644 index 0000000..9f5c4f4 --- /dev/null +++ b/GuiWPF_ViewModel/GuiWPF_ViewModel.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/GuiWPF_ViewModel/MainViewModel.cs b/GuiWPF_ViewModel/MainViewModel.cs new file mode 100644 index 0000000..806d71c --- /dev/null +++ b/GuiWPF_ViewModel/MainViewModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace GuiWPF_ViewModel +{ + public class MainViewModel : NotificationObject + { + public string Titel { get; set; } + + public MainViewModel() + { + Titel = "Dichtheitsprüfung by Damian"; + //Initialisieren(); + } + } +} diff --git a/GuiWPF_ViewModel/NotificationObject.cs b/GuiWPF_ViewModel/NotificationObject.cs new file mode 100644 index 0000000..2863fd7 --- /dev/null +++ b/GuiWPF_ViewModel/NotificationObject.cs @@ -0,0 +1,19 @@ +using System; +using System.ComponentModel; +using System.Runtime.CompilerServices; + +namespace GuiWPF_ViewModel +{ + public class NotificationObject : INotifyPropertyChanged + { + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void OnPropertyChanged([CallerMemberName]string propertyName="") + { + if(PropertyChanged != null) + { + PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } +} diff --git a/GuiWPF_ViewModel/ViewModelBase.cs b/GuiWPF_ViewModel/ViewModelBase.cs new file mode 100644 index 0000000..f8bca8b --- /dev/null +++ b/GuiWPF_ViewModel/ViewModelBase.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace GuiWPF_ViewModel +{ + public class ViewModelBase : NotificationObject + { + private bool valIsBusy; + private string valBusyMessage; + + public bool IsBusy + { + get => valIsBusy; + set + { + if(valIsBusy != value) + { + valIsBusy = value; + OnPropertyChanged(); + } + } + } + public string BusyMessage + { + get => valBusyMessage; + set + { + if(valBusyMessage != value) + { + valBusyMessage = value; + OnPropertyChanged(); + } + } + } + } +}