diff --git a/VECTO3GUI2020/Resources/ViewModelBindings.xaml b/VECTO3GUI2020/Resources/ViewModelBindings.xaml index 15d5dbac5ca9e0e108154eb4f00c7126de78525d..989565530245f6076ecc56cb6d37d494b058d07d 100644 --- a/VECTO3GUI2020/Resources/ViewModelBindings.xaml +++ b/VECTO3GUI2020/Resources/ViewModelBindings.xaml @@ -18,7 +18,7 @@ <DataTemplate x:Shared="False" DataType="{x:Type impl:JobListViewModel}"> <views:JobListView /> </DataTemplate> - <DataTemplate x:Shared="False" DataType="{x:Type viewModel:OutputViewModel}"> + <DataTemplate x:Shared="False" DataType="{x:Type impl:OutputViewModel}"> <views:OutputView /> </DataTemplate> diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj index 49a079e8ee588fb2c2db90ce38466ea75590eb38..276f409f6d03d24a6bdbe66f486d49db386d7d1f 100644 --- a/VECTO3GUI2020/VECTO3GUI2020.csproj +++ b/VECTO3GUI2020/VECTO3GUI2020.csproj @@ -18,6 +18,8 @@ <PackageReference Include="InteractiveDataDisplay.WPF" Version="1.0.0" NoWarn="NU1701" /> <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" /> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" NoWarn="NU1701" /> + <PackageReference Include="Ninject" Version="3.3.5" /> + <PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" /> <PackageReference Include="PresentationFramework.Aero2" Version="1.0.1" NoWarn="NU1701" /> </ItemGroup> diff --git a/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs index c14355c9be665fad4de88691cb29487cb24bce4a..0674bc3037cc56c4185c848b5db5e21c31bc736b 100644 --- a/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs +++ b/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs @@ -22,15 +22,14 @@ namespace VECTO3GUI2020.ViewModel.Implementation private IMainViewModel _currentViewModelTop; #endregion - public MainWindowViewModel(IWindowHelper windowHelper, ISettingsViewModel settingsViewModel, IJobListViewModel jobListViewModel, IOutputViewModel outputViewModel, AboutViewModel aboutVm) + public MainWindowViewModel(IWindowHelper windowHelper, ISettingsViewModel settingsViewModel, IJobListViewModel jobListViewModel, AboutViewModel aboutVm) { _windowHelper = windowHelper; _settingsViewModel = settingsViewModel; _jobListVm = jobListViewModel; _aboutViewModel = aboutVm; _currentViewModelTop = _jobListVm; - _bottomView = outputViewModel; - + //_bottomView = new TestViewModel(); _viewModels.Add("Jobs", _jobListVm); _viewModels.Add("Settings", _settingsViewModel); @@ -63,13 +62,6 @@ namespace VECTO3GUI2020.ViewModel.Implementation } } } - - public IMainViewModel CurrentViewModelBottom - { - get { return _bottomView; } - set { _bottomView = value; } - } - public IJobListViewModel JobListVm { get => _jobListVm; diff --git a/VECTO3GUI2020/ViewModel/Implementation/OutputViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/OutputViewModel.cs index 91208e1e715c15b1fea9408c88ed2cbe49d2ced5..fc84fc8ef8dff4dcb3ac9a5171e00ca5af072f03 100644 --- a/VECTO3GUI2020/ViewModel/Implementation/OutputViewModel.cs +++ b/VECTO3GUI2020/ViewModel/Implementation/OutputViewModel.cs @@ -4,11 +4,10 @@ using System.Windows.Data; using System.Windows.Input; using VECTO3GUI2020.Helper; using VECTO3GUI2020.Util; -using VECTO3GUI2020.ViewModel.Implementation; using VECTO3GUI2020.ViewModel.Implementation.Common; using VECTO3GUI2020.ViewModel.Interfaces; -namespace VECTO3GUI2020.ViewModel +namespace VECTO3GUI2020.ViewModel.Implementation { public class OutputViewModel : ViewModelBase, IOutputViewModel