From ffa6230df4136e63b1df22c54f25577bbd8e1a09 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Mon, 24 Feb 2020 18:15:11 +0100
Subject: [PATCH] changed namespace to VECTO3GUI, started to add
PrimaryVehicleBus to the gui
---
VECTO3GUI/App.xaml.cs | 10 +-
VECTO3GUI/Helper/BaseConverter.cs | 2 +-
VECTO3GUI/Helper/DataContextBaseExtension.cs | 2 +-
VECTO3GUI/Helper/JobEntrySelectedConverter.cs | 2 +-
VECTO3GUI/Helper/SIUnit.cs | 5 +-
VECTO3GUI/Helper/SIValueConverter.cs | 6 +-
VECTO3GUI/Helper/VehicleClassConverter.cs | 2 +-
VECTO3GUI/MainWindow.xaml | 2 +-
VECTO3GUI/MainWindow.xaml.cs | 2 +-
VECTO3GUI/Resources/ViewModelMappings.xaml | 24 ++--
VECTO3GUI/Util/AllowedEntry.cs | 2 +-
VECTO3GUI/Util/Component.cs | 3 +-
VECTO3GUI/Util/RelayCommand.cs | 6 +-
VECTO3GUI/Util/SIUtils.cs | 2 +-
VECTO3GUI/Util/TableDataConverter.cs | 4 +-
VECTO3GUI/Util/VectoParameterAttribute.cs | 2 +-
VECTO3GUI/Util/ViewModelFactory.cs | 8 +-
VECTO3GUI/VECTO3GUI.csproj | 10 ++
.../Declaration/AbstractDeclarationAdapter.cs | 14 +--
.../Declaration/AirdragDeclarationAdapter.cs | 5 +-
.../AngledriveDeclarationAdapter.cs | 9 +-
.../AuxiliariesDeclarationAdapter.cs | 5 +-
.../Declaration/AxleDeclarationAdapter.cs | 4 +-
.../Declaration/AxlegearDeclarationAdapter.cs | 6 +-
.../Declaration/DeclarationJobAdapter.cs | 8 +-
.../Declaration/EngineDeclarationAdapter.cs | 9 +-
.../Declaration/GearboxDeclarationAdapter.cs | 8 +-
.../Declaration/RetarderDeclarationAdapter.cs | 7 +-
.../TorqueConverterDeclarationAdapter.cs | 7 +-
.../Declaration/TyreDeclarationAdapter.cs | 7 +-
.../Declaration/VehicleDeclarationAdapter.cs | 8 +-
.../ViewModel/Adapter/IAdapterFactory.cs | 6 +-
.../Impl/AbstractComponentViewModel.cs | 4 +-
.../ViewModel/Impl/AbstractJobViewModel.cs | 6 +-
VECTO3GUI/ViewModel/Impl/AbstractViewModel.cs | 7 +-
VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs | 4 +-
.../ViewModel/Impl/AngledriveViewModel.cs | 8 +-
.../ViewModel/Impl/AuxiliariesViewModel.cs | 12 +-
VECTO3GUI/ViewModel/Impl/AxleViewModel.cs | 10 +-
VECTO3GUI/ViewModel/Impl/AxlegearViewModel.cs | 8 +-
VECTO3GUI/ViewModel/Impl/AxlesViewModel.cs | 6 +-
VECTO3GUI/ViewModel/Impl/CyclesViewModel.cs | 6 +-
.../ViewModel/Impl/DeclarationJobViewModel.cs | 11 +-
.../ViewModel/Impl/EngineOnlyJobViewModel.cs | 6 +-
VECTO3GUI/ViewModel/Impl/EngineViewModel.cs | 8 +-
VECTO3GUI/ViewModel/Impl/GearboxViewModel.cs | 8 +-
VECTO3GUI/ViewModel/Impl/JobEntry.cs | 2 +-
VECTO3GUI/ViewModel/Impl/JoblistViewModel.cs | 98 ++++++++++------
.../ViewModel/Impl/MainWindowViewModel.cs | 6 +-
VECTO3GUI/ViewModel/Impl/NoneViewModel.cs | 4 +-
VECTO3GUI/ViewModel/Impl/ObservableObject.cs | 2 +-
.../Impl/PrimaryVehicleBusJobViewModel.cs | 38 +++++++
.../Impl/PrimaryVehicleBusViewModel.cs | 106 ++++++++++++++++++
VECTO3GUI/ViewModel/Impl/RetarderViewModel.cs | 8 +-
.../Impl/TorqueConverterViewModel.cs | 8 +-
VECTO3GUI/ViewModel/Impl/TyreViewModel.cs | 6 +-
.../ViewModel/Impl/ValidatingViewModel.cs | 4 +-
VECTO3GUI/ViewModel/Impl/VehicleViewModel.cs | 15 ++-
.../Interfaces/FuelConsumptionEntry.cs | 4 +-
.../ViewModel/Interfaces/FullLoadEntry.cs | 4 +-
VECTO3GUI/ViewModel/Interfaces/Gear.cs | 6 +-
.../ViewModel/Interfaces/GearLossMapEntry.cs | 4 +-
.../ViewModel/Interfaces/IAirdragViewModel.cs | 2 +-
.../Interfaces/IAngledriveViewModel.cs | 4 +-
.../Interfaces/IAuxiliariesViewModel.cs | 4 +-
.../ViewModel/Interfaces/IAxleViewModel.cs | 4 +-
.../Interfaces/IAxlegearViewModel.cs | 4 +-
.../ViewModel/Interfaces/IAxlesViewModel.cs | 2 +-
.../Interfaces/ICommonComponentParameters.cs | 2 +-
.../Interfaces/IComponentViewModel.cs | 6 +-
.../ViewModel/Interfaces/ICyclesViewModel.cs | 2 +-
.../ViewModel/Interfaces/IEngineViewModel.cs | 4 +-
.../ViewModel/Interfaces/IGearboxViewModel.cs | 4 +-
.../ViewModel/Interfaces/IJobEditViewModel.cs | 4 +-
.../ViewModel/Interfaces/IJoblistViewModel.cs | 4 +-
VECTO3GUI/ViewModel/Interfaces/IMainView.cs | 2 +-
.../Interfaces/IMainWindowViewModel.cs | 2 +-
.../ViewModel/Interfaces/INoneViewModel.cs | 2 +-
.../Interfaces/IPrimaryVehicleBusViewModel.cs | 49 ++++++++
.../Interfaces/IRetarderViewModel.cs | 4 +-
.../Interfaces/ITorqueConverterViewModel.cs | 4 +-
.../ViewModel/Interfaces/ITyreViewModel.cs | 4 +-
.../ViewModel/Interfaces/IVehicleViewModel.cs | 4 +-
.../Interfaces/RetarderLossMapEntry.cs | 4 +-
.../ViewModel/Interfaces/SteeringPumpEntry.cs | 4 +-
.../TorqueConverterCharacteristics.cs | 2 +-
VECTO3GUI/ViewModel/Interfaces/TorqueEntry.cs | 5 +-
.../Declaration/AirdragDeclarationView.xaml | 10 +-
.../AirdragDeclarationView.xaml.cs | 2 +-
.../AngledriveDeclarationView.xaml | 8 +-
.../AngledriveDeclarationView.xaml.cs | 2 +-
.../AuxiliariesDeclarationView.xaml | 6 +-
.../AuxiliariesDeclarationView.xaml.cs | 2 +-
.../Declaration/AxleDeclarationView.xaml | 6 +-
.../Declaration/AxleDeclarationView.xaml.cs | 2 +-
.../Declaration/AxlegearDeclarationView.xaml | 8 +-
.../AxlegearDeclarationView.xaml.cs | 2 +-
.../Declaration/AxlesDeclarationView.xaml | 4 +-
.../Declaration/AxlesDeclarationView.xaml.cs | 2 +-
.../Declaration/CyclesDeclarationView.xaml | 8 +-
.../Declaration/CyclesDeclarationView.xaml.cs | 2 +-
.../Declaration/EngineDeclarationView.xaml | 8 +-
.../Declaration/EngineDeclarationView.xaml.cs | 2 +-
.../Declaration/GearboxDeclarationView.xaml | 8 +-
.../GearboxDeclarationView.xaml.cs | 2 +-
.../Declaration/PrimaryVehicleBusView.xaml | 45 ++++++++
.../Declaration/PrimaryVehicleBusView.xaml.cs | 28 +++++
.../Declaration/RetarderDeclarationView.xaml | 10 +-
.../RetarderDeclarationView.xaml.cs | 2 +-
.../TorqueConverterDeclarationView.xaml | 10 +-
.../TorqueConverterDeclarationView.xaml.cs | 2 +-
.../Declaration/TyreDeclarationView.xaml | 8 +-
.../Declaration/TyreDeclarationView.xaml.cs | 2 +-
.../Declaration/VehicleDeclarationView.xaml | 12 +-
.../VehicleDeclarationView.xaml.cs | 2 +-
.../ComponentViews/EditComponentNoneView.xaml | 2 +-
.../EditComponentNoneView.xaml.cs | 2 +-
.../Engineering/AirdragEngineeringView.xaml | 6 +-
.../AirdragEngineeringView.xaml.cs | 2 +-
.../AngledriveEngineeringView.xaml | 6 +-
.../AngledriveEngineeringView.xaml.cs | 2 +-
.../AuxiliariesEngineerngView.xaml | 4 +-
.../AuxiliariesEngineerngView.xaml.cs | 2 +-
.../Engineering/AxleEngineeringView.xaml | 4 +-
.../Engineering/AxleEngineeringView.xaml.cs | 2 +-
.../Engineering/AxlegearEngineeringView.xaml | 6 +-
.../AxlegearEngineeringView.xaml.cs | 2 +-
.../Engineering/AxlesEngineeringView.xaml | 4 +-
.../Engineering/AxlesEngineeringView.xaml.cs | 2 +-
.../Engineering/CyclesEngineeringView.xaml | 8 +-
.../Engineering/CyclesEngineeringView.xaml.cs | 2 +-
.../Engineering/EngineEngineeringView.xaml | 10 +-
.../Engineering/EngineEngineeringView.xaml.cs | 2 +-
.../Engineering/GearboxEngineeringView.xaml | 6 +-
.../GearboxEngineeringView.xaml.cs | 2 +-
.../Engineering/RetarderEngineeringView.xaml | 6 +-
.../RetarderEngineeringView.xaml.cs | 2 +-
.../TorqueConverterEngineeringView.xaml | 6 +-
.../TorqueConverterEngineeringView.xaml.cs | 2 +-
.../Engineering/TyreEngineeringView.xaml | 4 +-
.../Engineering/TyreEngineeringView.xaml.cs | 2 +-
.../Engineering/VehicleEngineeringView.xaml | 6 +-
.../VehicleEngineeringView.xaml.cs | 2 +-
.../CustomControls/CheckboxParameter.xaml | 4 +-
.../CustomControls/CheckboxParameter.xaml.cs | 2 +-
.../Views/CustomControls/ComboParameter.xaml | 4 +-
.../CustomControls/ComboParameter.xaml.cs | 2 +-
.../CommonDeclarationComponentData.xaml | 4 +-
.../CommonDeclarationComponentData.xaml.cs | 2 +-
.../CustomControls/VectoParameterControl.xaml | 4 +-
.../VectoParameterControl.xaml.cs | 2 +-
VECTO3GUI/Views/EngineeringEngineView.xaml | 4 +-
VECTO3GUI/Views/EngineeringEngineView.xaml.cs | 2 +-
VECTO3GUI/Views/JobEditView.xaml | 12 +-
VECTO3GUI/Views/JobEditView.xaml.cs | 6 +-
VECTO3GUI/Views/JobView.xaml | 2 +-
VECTO3GUI/Views/JobView.xaml.cs | 2 +-
VECTO3GUI/Views/JoblistView.xaml | 14 +--
VECTO3GUI/Views/JoblistView.xaml.cs | 8 +-
159 files changed, 718 insertions(+), 415 deletions(-)
create mode 100644 VECTO3GUI/ViewModel/Impl/PrimaryVehicleBusJobViewModel.cs
create mode 100644 VECTO3GUI/ViewModel/Impl/PrimaryVehicleBusViewModel.cs
create mode 100644 VECTO3GUI/ViewModel/Interfaces/IPrimaryVehicleBusViewModel.cs
create mode 100644 VECTO3GUI/Views/ComponentViews/Declaration/PrimaryVehicleBusView.xaml
create mode 100644 VECTO3GUI/Views/ComponentViews/Declaration/PrimaryVehicleBusView.xaml.cs
diff --git a/VECTO3GUI/App.xaml.cs b/VECTO3GUI/App.xaml.cs
index 8340f6247f..6e356769a6 100644
--- a/VECTO3GUI/App.xaml.cs
+++ b/VECTO3GUI/App.xaml.cs
@@ -9,10 +9,10 @@ using Ninject;
using Ninject.Extensions.Factory;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore;
-using VECTO3.ViewModel.Adapter;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Adapter;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Interfaces;
namespace VECTO3GUI
{
@@ -40,8 +40,10 @@ namespace VECTO3GUI
container.Bind<IMainWindowViewModel>().To<MainWindowViewModel>();
container.Bind<IJoblistViewModel>().To<JoblistViewModel>();
container.Bind<IJobEditViewModel>().To<DeclarationJobViewModel>();
+ container.Bind<IJobEditViewModel>().To<PrimaryVehicleBusJobViewModel>();
container.Bind<INoneViewModel>().To<NoneViewModel>();
container.Bind<IVehicleViewModel>().To<VehicleViewModel>();
+ container.Bind<IPrimaryVehicleBusViewModel>().To<PrimaryVehicleBusViewModel>();
container.Bind<IAirdragViewModel>().To<AirdragViewModel>();
container.Bind<IAngledriveViewModel>().To<AngledriveViewModel>();
diff --git a/VECTO3GUI/Helper/BaseConverter.cs b/VECTO3GUI/Helper/BaseConverter.cs
index 64c42d6199..d1291d131f 100644
--- a/VECTO3GUI/Helper/BaseConverter.cs
+++ b/VECTO3GUI/Helper/BaseConverter.cs
@@ -1,7 +1,7 @@
using System;
using System.Windows.Markup;
-namespace VECTO3.Helper {
+namespace VECTO3GUI.Helper {
public class BaseConverter : MarkupExtension
{
#region Overrides of MarkupExtension
diff --git a/VECTO3GUI/Helper/DataContextBaseExtension.cs b/VECTO3GUI/Helper/DataContextBaseExtension.cs
index a7e09adca9..1808129951 100644
--- a/VECTO3GUI/Helper/DataContextBaseExtension.cs
+++ b/VECTO3GUI/Helper/DataContextBaseExtension.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using System.Windows;
using System.Windows.Markup;
-namespace VECTO3.Helper
+namespace VECTO3GUI.Helper
{
public abstract class DataContextBaseExtension : MarkupExtension
{
diff --git a/VECTO3GUI/Helper/JobEntrySelectedConverter.cs b/VECTO3GUI/Helper/JobEntrySelectedConverter.cs
index 277a690576..58382962a4 100644
--- a/VECTO3GUI/Helper/JobEntrySelectedConverter.cs
+++ b/VECTO3GUI/Helper/JobEntrySelectedConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
using System.Windows.Controls;
using System.Windows.Data;
-namespace VECTO3.Helper
+namespace VECTO3GUI.Helper
{
public class JobEntrySelectedConverter : IValueConverter
{
diff --git a/VECTO3GUI/Helper/SIUnit.cs b/VECTO3GUI/Helper/SIUnit.cs
index 6cd4e33295..3267e91dbe 100644
--- a/VECTO3GUI/Helper/SIUnit.cs
+++ b/VECTO3GUI/Helper/SIUnit.cs
@@ -1,11 +1,10 @@
using System;
using System.Linq;
-using System.Linq.Expressions;
using System.Reflection;
-using SIUtils = VECTO3.Util.SIUtils;
+using SIUtils = VECTO3GUI.Util.SIUtils;
-namespace VECTO3.Helper {
+namespace VECTO3GUI.Helper {
public class SIUnit : DataContextBaseExtension
{
diff --git a/VECTO3GUI/Helper/SIValueConverter.cs b/VECTO3GUI/Helper/SIValueConverter.cs
index 9c7fd96a13..494cb8f52d 100644
--- a/VECTO3GUI/Helper/SIValueConverter.cs
+++ b/VECTO3GUI/Helper/SIValueConverter.cs
@@ -1,15 +1,13 @@
using System;
-using System.Collections.Generic;
using System.Globalization;
-using System.Reflection;
using System.Windows;
using System.Windows.Data;
using TUGraz.VectoCommon.Utils;
using Expression = System.Linq.Expressions.Expression;
-using SIUtils = VECTO3.Util.SIUtils;
+using SIUtils = VECTO3GUI.Util.SIUtils;
-namespace VECTO3.Helper
+namespace VECTO3GUI.Helper
{
public class SIValueConverter : BaseConverter, IValueConverter
{
diff --git a/VECTO3GUI/Helper/VehicleClassConverter.cs b/VECTO3GUI/Helper/VehicleClassConverter.cs
index acede650cf..b164b376b8 100644
--- a/VECTO3GUI/Helper/VehicleClassConverter.cs
+++ b/VECTO3GUI/Helper/VehicleClassConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
using System.Windows.Data;
using TUGraz.VectoCore.Models.Declaration;
-namespace VECTO3.Helper
+namespace VECTO3GUI.Helper
{
public class VehicleClassConverter : BaseConverter, IValueConverter
{
diff --git a/VECTO3GUI/MainWindow.xaml b/VECTO3GUI/MainWindow.xaml
index 1b2cb3e5cd..27fafbb837 100644
--- a/VECTO3GUI/MainWindow.xaml
+++ b/VECTO3GUI/MainWindow.xaml
@@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:VECTO3GUI"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
Title="VECTO 3" Height="515.36" Width="972.48" >
diff --git a/VECTO3GUI/MainWindow.xaml.cs b/VECTO3GUI/MainWindow.xaml.cs
index 2a20034f48..b7ca5628d6 100644
--- a/VECTO3GUI/MainWindow.xaml.cs
+++ b/VECTO3GUI/MainWindow.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
namespace VECTO3GUI
{
diff --git a/VECTO3GUI/Resources/ViewModelMappings.xaml b/VECTO3GUI/Resources/ViewModelMappings.xaml
index 5c5b155246..59e0be724a 100644
--- a/VECTO3GUI/Resources/ViewModelMappings.xaml
+++ b/VECTO3GUI/Resources/ViewModelMappings.xaml
@@ -1,10 +1,10 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:impl="clr-namespace:VECTO3.ViewModel.Impl"
- xmlns:views="clr-namespace:VECTO3.Views"
- xmlns:engineering="clr-namespace:VECTO3.Views.ComponentViews.Engineering"
- xmlns:declaration="clr-namespace:VECTO3.Views.ComponentViews.Declaration"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces">
+ xmlns:impl="clr-namespace:VECTO3GUI.ViewModel.Impl"
+ xmlns:views="clr-namespace:VECTO3GUI.Views"
+ xmlns:engineering="clr-namespace:VECTO3GUI.Views.ComponentViews.Engineering"
+ xmlns:declaration="clr-namespace:VECTO3GUI.Views.ComponentViews.Declaration"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces">
<DataTemplate DataType="{x:Type impl:JoblistViewModel}">
<views:JoblistView />
@@ -15,11 +15,19 @@
<DataTemplate DataType="{x:Type impl:EngineOnlyJobViewModel}">
<views:JobEditView/>
</DataTemplate>
+ <DataTemplate DataType="{x:Type impl:PrimaryVehicleBusJobViewModel}">
+ <views:JobEditView/>
+ </DataTemplate>
+
<DataTemplate DataType="{x:Type impl:NoneViewModel}">
<views:EditComponentNoneView/>
</DataTemplate>
-
-
+
+ <DataTemplate DataType="{x:Type impl:PrimaryVehicleBusViewModel}">
+ <declaration:PrimaryVehicleBusView/>
+ </DataTemplate>
+
+
<DataTemplate x:Key="EditAirdragDeclaration">
<declaration:AirdragDeclarationView/>
</DataTemplate>
@@ -164,6 +172,8 @@
</DataTemplate.Triggers>
</DataTemplate>
+
+
<DataTemplate x:Key="EditVehicleDeclaration">
<declaration:VehicleDeclarationView/>
</DataTemplate>
diff --git a/VECTO3GUI/Util/AllowedEntry.cs b/VECTO3GUI/Util/AllowedEntry.cs
index 2d7c5d55bc..d59ddfcf6a 100644
--- a/VECTO3GUI/Util/AllowedEntry.cs
+++ b/VECTO3GUI/Util/AllowedEntry.cs
@@ -1,4 +1,4 @@
-namespace VECTO3.Util {
+namespace VECTO3GUI.Util {
public class AllowedEntry
{
diff --git a/VECTO3GUI/Util/Component.cs b/VECTO3GUI/Util/Component.cs
index 7facdbbf0a..6abe94ace8 100644
--- a/VECTO3GUI/Util/Component.cs
+++ b/VECTO3GUI/Util/Component.cs
@@ -1,7 +1,8 @@
-namespace VECTO3.Util {
+namespace VECTO3GUI.Util {
public enum Component
{
Vehicle = 1,
+ PrimaryBusVehicle,
Engine,
Gearbox,
TorqueConverter,
diff --git a/VECTO3GUI/Util/RelayCommand.cs b/VECTO3GUI/Util/RelayCommand.cs
index 4b59d810f1..ad87b4a426 100644
--- a/VECTO3GUI/Util/RelayCommand.cs
+++ b/VECTO3GUI/Util/RelayCommand.cs
@@ -1,10 +1,8 @@
-
-
-using System;
+using System;
using System.Diagnostics;
using System.Windows.Input;
-namespace VECTO3.Util
+namespace VECTO3GUI.Util
{
/// <summary>
/// A command whose sole purpose is to relay its functionality to other objects by invoking delegates. The default return value for the CanExecute method is 'true'.
diff --git a/VECTO3GUI/Util/SIUtils.cs b/VECTO3GUI/Util/SIUtils.cs
index ec70b09824..73d034ec91 100644
--- a/VECTO3GUI/Util/SIUtils.cs
+++ b/VECTO3GUI/Util/SIUtils.cs
@@ -4,7 +4,7 @@ using System.Linq.Expressions;
using System.Reflection;
using TUGraz.VectoCommon.Utils;
-namespace VECTO3.Util
+namespace VECTO3GUI.Util
{
public static class SIUtils
{
diff --git a/VECTO3GUI/Util/TableDataConverter.cs b/VECTO3GUI/Util/TableDataConverter.cs
index 01fd60fde2..4d6f4f1b24 100644
--- a/VECTO3GUI/Util/TableDataConverter.cs
+++ b/VECTO3GUI/Util/TableDataConverter.cs
@@ -2,9 +2,9 @@ using System.Collections.Generic;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.Util {
+namespace VECTO3GUI.Util {
public static class TableDataConverter {
public static TableData Convert(IEnumerable<GearLossMapEntry> viewModelLossMap)
diff --git a/VECTO3GUI/Util/VectoParameterAttribute.cs b/VECTO3GUI/Util/VectoParameterAttribute.cs
index 1a41a27bac..b5a3293729 100644
--- a/VECTO3GUI/Util/VectoParameterAttribute.cs
+++ b/VECTO3GUI/Util/VectoParameterAttribute.cs
@@ -1,6 +1,6 @@
using System;
-namespace VECTO3.Util {
+namespace VECTO3GUI.Util {
[AttributeUsage(AttributeTargets.Property)]
public class VectoParameterAttribute : Attribute
{
diff --git a/VECTO3GUI/Util/ViewModelFactory.cs b/VECTO3GUI/Util/ViewModelFactory.cs
index d5395d4e75..ef225e24fe 100644
--- a/VECTO3GUI/Util/ViewModelFactory.cs
+++ b/VECTO3GUI/Util/ViewModelFactory.cs
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
-using Ninject;
-using VECTO3.ViewModel.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.Util
+namespace VECTO3GUI.Util
{
public static class ViewModelFactory
{
@@ -12,6 +11,7 @@ namespace VECTO3.Util
public static Dictionary<Component, Type> ComponentViewModelMapping = new Dictionary<Component, Type>()
{
{ Component.Vehicle, typeof(IVehicleViewModel)},
+ { Component.PrimaryBusVehicle, typeof(IPrimaryVehicleBusViewModel) },
{ Component.Engine ,typeof(IEngineViewModel) },
{ Component.Gearbox ,typeof(IGearboxViewModel) },
{ Component.TorqueConverter ,typeof(ITorqueConverterViewModel) },
diff --git a/VECTO3GUI/VECTO3GUI.csproj b/VECTO3GUI/VECTO3GUI.csproj
index 4e7ac88d22..429bc675b4 100644
--- a/VECTO3GUI/VECTO3GUI.csproj
+++ b/VECTO3GUI/VECTO3GUI.csproj
@@ -109,6 +109,8 @@
<Compile Include="ViewModel\Impl\MainWindowViewModel.cs" />
<Compile Include="ViewModel\Impl\NoneViewModel.cs" />
<Compile Include="ViewModel\Impl\ObservableObject.cs" />
+ <Compile Include="ViewModel\Impl\PrimaryVehicleBusJobViewModel.cs" />
+ <Compile Include="ViewModel\Impl\PrimaryVehicleBusViewModel.cs" />
<Compile Include="ViewModel\Impl\RetarderViewModel.cs" />
<Compile Include="ViewModel\Impl\TorqueConverterViewModel.cs" />
<Compile Include="ViewModel\Impl\TyreViewModel.cs" />
@@ -134,6 +136,7 @@
<Compile Include="ViewModel\Interfaces\IMainView.cs" />
<Compile Include="ViewModel\Interfaces\IMainWindowViewModel.cs" />
<Compile Include="ViewModel\Interfaces\INoneViewModel.cs" />
+ <Compile Include="ViewModel\Interfaces\IPrimaryVehicleBusViewModel.cs" />
<Compile Include="ViewModel\Interfaces\IRetarderViewModel.cs" />
<Compile Include="ViewModel\Interfaces\ITorqueConverterViewModel.cs" />
<Compile Include="ViewModel\Interfaces\ITyreViewModel.cs" />
@@ -169,6 +172,9 @@
<Compile Include="Views\ComponentViews\Declaration\GearboxDeclarationView.xaml.cs">
<DependentUpon>GearboxDeclarationView.xaml</DependentUpon>
</Compile>
+ <Compile Include="Views\ComponentViews\Declaration\PrimaryVehicleBusView.xaml.cs">
+ <DependentUpon>PrimaryVehicleBusView.xaml</DependentUpon>
+ </Compile>
<Compile Include="Views\ComponentViews\Declaration\RetarderDeclarationView.xaml.cs">
<DependentUpon>RetarderDeclarationView.xaml</DependentUpon>
</Compile>
@@ -305,6 +311,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
+ <Page Include="Views\ComponentViews\Declaration\PrimaryVehicleBusView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Views\ComponentViews\Declaration\RetarderDeclarationView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/AbstractDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/AbstractDeclarationAdapter.cs
index beb58b5e5a..7172666657 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/AbstractDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/AbstractDeclarationAdapter.cs
@@ -1,15 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using Ninject;
-using TUGraz.VectoCommon.InputData;
-using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.InputData.Reader;
-using TUGraz.VectoCore.InputData.Reader.ComponentData;
-using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
-using VECTO3.ViewModel.Interfaces;
+using TUGraz.VectoCommon.InputData;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration
+namespace VECTO3GUI.ViewModel.Adapter.Declaration
{
public abstract class AbstractDeclarationAdapter
{
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/AirdragDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/AirdragDeclarationAdapter.cs
index 210df05cf9..a3738061a8 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/AirdragDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/AirdragDeclarationAdapter.cs
@@ -2,10 +2,9 @@
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
-using VECTO3.ViewModel.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration
+namespace VECTO3GUI.ViewModel.Adapter.Declaration
{
public class AirdragDeclarationAdapter : AbstractDeclarationAdapter, IAirdragDeclarationInputData
{
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/AngledriveDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/AngledriveDeclarationAdapter.cs
index 949cdddb1a..e1ba3a8c94 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/AngledriveDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/AngledriveDeclarationAdapter.cs
@@ -1,13 +1,10 @@
using System;
-using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.InputData.Reader.ComponentData;
-using VECTO3.Util;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration {
+namespace VECTO3GUI.ViewModel.Adapter.Declaration {
public class AngledriveDeclarationAdapter : AbstractDeclarationAdapter, IAngledriveInputData
{
protected IAngledriveViewModel ViewModel;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/AuxiliariesDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/AuxiliariesDeclarationAdapter.cs
index f402496bcc..2ba8254518 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/AuxiliariesDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/AuxiliariesDeclarationAdapter.cs
@@ -3,11 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration {
+namespace VECTO3GUI.ViewModel.Adapter.Declaration {
public class AuxiliariesDeclarationAdapter : IAuxiliariesDeclarationInputData
{
protected IAuxiliariesViewModel ViewModel;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/AxleDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/AxleDeclarationAdapter.cs
index b2cc57edda..c56e9a6cb3 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/AxleDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/AxleDeclarationAdapter.cs
@@ -1,8 +1,8 @@
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration {
+namespace VECTO3GUI.ViewModel.Adapter.Declaration {
public class AxleDeclarationAdapter : IAxleDeclarationInputData
{
protected IAxleViewModel ViewModel;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/AxlegearDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/AxlegearDeclarationAdapter.cs
index e97d7fd4e9..4833490743 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/AxlegearDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/AxlegearDeclarationAdapter.cs
@@ -1,10 +1,10 @@
using System;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.Util;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration {
+namespace VECTO3GUI.ViewModel.Adapter.Declaration {
public class AxlegearDeclarationAdapter : AbstractDeclarationAdapter, IAxleGearInputData
{
protected IAxlegearViewModel ViewModel;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/DeclarationJobAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/DeclarationJobAdapter.cs
index 782d8d1f91..e0ae6e3810 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/DeclarationJobAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/DeclarationJobAdapter.cs
@@ -1,10 +1,10 @@
using System.Xml.Linq;
using TUGraz.VectoCommon.InputData;
-using VECTO3.Util;
-using VECTO3.ViewModel.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration {
+namespace VECTO3GUI.ViewModel.Adapter.Declaration {
public class DeclarationJobAdapter : IDeclarationInputDataProvider, IDeclarationJobInputData
{
protected readonly DeclarationJobViewModel Model;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/EngineDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/EngineDeclarationAdapter.cs
index c2f0a88c93..57740ce567 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/EngineDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/EngineDeclarationAdapter.cs
@@ -4,11 +4,12 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
-using VECTO3.Util;
-using VECTO3.ViewModel.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Interfaces;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Adapter.Declaration {
+
+namespace VECTO3GUI.ViewModel.Adapter.Declaration {
public class EngineDeclarationAdapter : AbstractDeclarationAdapter, IEngineDeclarationInputData
{
private IEngineViewModel ViewModel;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/GearboxDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/GearboxDeclarationAdapter.cs
index 03639f0de2..c2d5311006 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/GearboxDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/GearboxDeclarationAdapter.cs
@@ -4,11 +4,11 @@ using System.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.InputData.Impl;
-using VECTO3.Util;
-using VECTO3.ViewModel.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration {
+namespace VECTO3GUI.ViewModel.Adapter.Declaration {
public class GearboxDeclarationAdapter : AbstractDeclarationAdapter, IGearboxDeclarationInputData
{
protected IGearboxViewModel ViewModel;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/RetarderDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/RetarderDeclarationAdapter.cs
index faa7df3cd9..0a733c28b5 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/RetarderDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/RetarderDeclarationAdapter.cs
@@ -2,10 +2,11 @@
using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.Util;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration {
+namespace VECTO3GUI.ViewModel.Adapter.Declaration {
public class RetarderDeclarationAdapter : AbstractDeclarationAdapter, IRetarderInputData
{
protected IRetarderViewModel ViewModel;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/TorqueConverterDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/TorqueConverterDeclarationAdapter.cs
index f349221847..da0d20e59f 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/TorqueConverterDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/TorqueConverterDeclarationAdapter.cs
@@ -2,10 +2,11 @@
using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.Util;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration {
+namespace VECTO3GUI.ViewModel.Adapter.Declaration {
public class TorqueConverterDeclarationAdapter : AbstractDeclarationAdapter, ITorqueConverterDeclarationInputData
{
protected ITorqueConverterViewModel ViewModel;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/TyreDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/TyreDeclarationAdapter.cs
index 29a9cc1cb8..02d4bf77e1 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/TyreDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/TyreDeclarationAdapter.cs
@@ -2,10 +2,11 @@
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
public class TyreDeclarationAdapter : AbstractDeclarationAdapter, ITyreDeclarationInputData
{
protected ITyreViewModel ViewModel;
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
index a12e233b2b..7cc42ef29d 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
@@ -8,11 +8,11 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Impl;
-using VECTO3.Util;
-using VECTO3.ViewModel.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter.Declaration
+namespace VECTO3GUI.ViewModel.Adapter.Declaration
{
public class VehicleDeclarationAdapter : IVehicleDeclarationInputData, IPTOTransmissionInputData, IVehicleComponentsDeclaration, IAxlesDeclarationInputData
{
diff --git a/VECTO3GUI/ViewModel/Adapter/IAdapterFactory.cs b/VECTO3GUI/ViewModel/Adapter/IAdapterFactory.cs
index feba7bf331..61c2deadce 100644
--- a/VECTO3GUI/ViewModel/Adapter/IAdapterFactory.cs
+++ b/VECTO3GUI/ViewModel/Adapter/IAdapterFactory.cs
@@ -1,8 +1,8 @@
using TUGraz.VectoCommon.InputData;
-using VECTO3.ViewModel.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Adapter
+namespace VECTO3GUI.ViewModel.Adapter
{
public interface IAdapterFactory
{
diff --git a/VECTO3GUI/ViewModel/Impl/AbstractComponentViewModel.cs b/VECTO3GUI/ViewModel/Impl/AbstractComponentViewModel.cs
index b911ad49db..bd17c7d5e5 100644
--- a/VECTO3GUI/ViewModel/Impl/AbstractComponentViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AbstractComponentViewModel.cs
@@ -1,8 +1,8 @@
using System;
using Ninject;
-using VECTO3.ViewModel.Adapter;
+using VECTO3GUI.ViewModel.Adapter;
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
public abstract class AbstractComponentViewModel : AbstractViewModel
{
private string _manufacturer;
diff --git a/VECTO3GUI/ViewModel/Impl/AbstractJobViewModel.cs b/VECTO3GUI/ViewModel/Impl/AbstractJobViewModel.cs
index 922f44df6a..cbb8288863 100644
--- a/VECTO3GUI/ViewModel/Impl/AbstractJobViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AbstractJobViewModel.cs
@@ -4,10 +4,10 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using Ninject;
-using VECTO3.Util;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public abstract class AbstractJobViewModel : AbstractViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/AbstractViewModel.cs b/VECTO3GUI/ViewModel/Impl/AbstractViewModel.cs
index ad45b5b1e1..1cde1d1653 100644
--- a/VECTO3GUI/ViewModel/Impl/AbstractViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AbstractViewModel.cs
@@ -4,10 +4,11 @@ using System.Collections.Specialized;
using System.ComponentModel;
using System.Linq;
using TUGraz.VectoCommon.InputData;
-using VECTO3.ViewModel.Interfaces;
-using Component = VECTO3.Util.Component;
+using VECTO3GUI.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
+using Component = VECTO3GUI.Util.Component;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public abstract class AbstractViewModel : ValidatingViewModel, IComponentViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs b/VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs
index 25494d7103..fb8c4ae02d 100644
--- a/VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs
@@ -2,9 +2,9 @@
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class AirdragViewModel : AbstractComponentViewModel, IAirdragViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/AngledriveViewModel.cs b/VECTO3GUI/ViewModel/Impl/AngledriveViewModel.cs
index 24d2b863e1..d891b7c96f 100644
--- a/VECTO3GUI/ViewModel/Impl/AngledriveViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AngledriveViewModel.cs
@@ -6,11 +6,11 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
public class AngledriveViewModel : AbstractComponentViewModel, IAngledriveViewModel
{
private CertificationMethod _certificationMethod;
diff --git a/VECTO3GUI/ViewModel/Impl/AuxiliariesViewModel.cs b/VECTO3GUI/ViewModel/Impl/AuxiliariesViewModel.cs
index 547781cb98..cba69797dd 100644
--- a/VECTO3GUI/ViewModel/Impl/AuxiliariesViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AuxiliariesViewModel.cs
@@ -8,13 +8,13 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
-using Component = VECTO3.Util.Component;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Interfaces;
+using Component = VECTO3GUI.Util.Component;
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
public class AuxiliariesViewModel : AbstractViewModel, IAuxiliariesViewModel
{
[Inject] public IAdapterFactory AdapterFactory { set; protected get; }
diff --git a/VECTO3GUI/ViewModel/Impl/AxleViewModel.cs b/VECTO3GUI/ViewModel/Impl/AxleViewModel.cs
index 124a1493d6..ea7b63ccbb 100644
--- a/VECTO3GUI/ViewModel/Impl/AxleViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AxleViewModel.cs
@@ -4,12 +4,12 @@ using Ninject;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Models.Declaration;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public class AxleViewModel : AbstractViewModel, IAxleViewModel
{
[Inject] public IAdapterFactory AdapterFactory { set; protected get; }
diff --git a/VECTO3GUI/ViewModel/Impl/AxlegearViewModel.cs b/VECTO3GUI/ViewModel/Impl/AxlegearViewModel.cs
index 7963114f1b..bce1d12693 100644
--- a/VECTO3GUI/ViewModel/Impl/AxlegearViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AxlegearViewModel.cs
@@ -6,11 +6,11 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
public class AxlegearViewModel : AbstractComponentViewModel, IAxlegearViewModel
{
private double _ratio;
diff --git a/VECTO3GUI/ViewModel/Impl/AxlesViewModel.cs b/VECTO3GUI/ViewModel/Impl/AxlesViewModel.cs
index bb24fb46e0..79a97c483e 100644
--- a/VECTO3GUI/ViewModel/Impl/AxlesViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AxlesViewModel.cs
@@ -9,10 +9,10 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
-using VECTO3.ViewModel.Interfaces;
-using Component = VECTO3.Util.Component;
+using VECTO3GUI.ViewModel.Interfaces;
+using Component = VECTO3GUI.Util.Component;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class AxlesViewModel : AbstractViewModel, IAxlesViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/CyclesViewModel.cs b/VECTO3GUI/ViewModel/Impl/CyclesViewModel.cs
index 1405469208..b3c1efeab4 100644
--- a/VECTO3GUI/ViewModel/Impl/CyclesViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/CyclesViewModel.cs
@@ -4,10 +4,10 @@ using System.ComponentModel;
using System.Linq;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
-using VECTO3.ViewModel.Interfaces;
-using Component = VECTO3.Util.Component;
+using VECTO3GUI.ViewModel.Interfaces;
+using Component = VECTO3GUI.Util.Component;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class CyclesViewModel : AbstractViewModel, ICyclesViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/DeclarationJobViewModel.cs b/VECTO3GUI/ViewModel/Impl/DeclarationJobViewModel.cs
index 6707f47a3b..890983a2b9 100644
--- a/VECTO3GUI/ViewModel/Impl/DeclarationJobViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/DeclarationJobViewModel.cs
@@ -20,12 +20,13 @@ using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.OutputData.XML;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
-using Component = VECTO3.Util.Component;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Interfaces;
+using Component = VECTO3GUI.Util.Component;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class DeclarationJobViewModel : AbstractJobViewModel, IJobEditViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/EngineOnlyJobViewModel.cs b/VECTO3GUI/ViewModel/Impl/EngineOnlyJobViewModel.cs
index a46c06fb0d..01446b17ab 100644
--- a/VECTO3GUI/ViewModel/Impl/EngineOnlyJobViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/EngineOnlyJobViewModel.cs
@@ -2,10 +2,10 @@
using Ninject;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class EngineOnlyJobViewModel : AbstractJobViewModel, IJobEditViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/EngineViewModel.cs b/VECTO3GUI/ViewModel/Impl/EngineViewModel.cs
index 5773d54032..4da0035310 100644
--- a/VECTO3GUI/ViewModel/Impl/EngineViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/EngineViewModel.cs
@@ -9,11 +9,11 @@ using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class EngineViewModel : AbstractComponentViewModel, IEngineViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/GearboxViewModel.cs b/VECTO3GUI/ViewModel/Impl/GearboxViewModel.cs
index d7ddb8a51c..30c53c65cb 100644
--- a/VECTO3GUI/ViewModel/Impl/GearboxViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/GearboxViewModel.cs
@@ -7,11 +7,11 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
public class GearboxViewModel : AbstractComponentViewModel, IGearboxViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/JobEntry.cs b/VECTO3GUI/ViewModel/Impl/JobEntry.cs
index 65eb6ade8c..f5b65b148b 100644
--- a/VECTO3GUI/ViewModel/Impl/JobEntry.cs
+++ b/VECTO3GUI/ViewModel/Impl/JobEntry.cs
@@ -1,4 +1,4 @@
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
public class JobEntry : ObservableObject
{
private bool _selected;
diff --git a/VECTO3GUI/ViewModel/Impl/JoblistViewModel.cs b/VECTO3GUI/ViewModel/Impl/JoblistViewModel.cs
index c619e922bd..a16997e9f4 100644
--- a/VECTO3GUI/ViewModel/Impl/JoblistViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/JoblistViewModel.cs
@@ -5,6 +5,7 @@ using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Documents;
using System.Windows.Input;
using Ninject;
using Ninject.Parameters;
@@ -16,10 +17,13 @@ using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration;
using TUGraz.VectoCore.InputData.FileIO.XML.Engineering;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Interfaces;
+using System.Collections.Generic;
+using System.Xml;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class JoblistViewModel : ObservableObject, IJoblistViewModel
{
@@ -28,10 +32,13 @@ namespace VECTO3.ViewModel.Impl
public JoblistViewModel()
{
- AddJobEntry(@"~\..\..\..\..\Generic Vehicles\Declaration Mode\Class5_Tractor_4x2\Class5_Tractor_DECL.xml");
- AddJobEntry("DummyEntry");
- AddJobEntry(@"~\..\..\..\..\Generic Vehicles\Declaration Mode\Class5_Tractor_4x2\Class5_Tractor_ENG.vecto");
- AddJobEntry(@"~\..\..\..\..\Generic Vehicles\Engineering Mode\EngineOnly\EngineOnly.vecto");
+ AddJobEntry(@"~\..\..\..\..\VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\example_heavyBus_PIF.xml");
+
+ //AddJobEntry(@"~\..\..\..\..\Generic Vehicles\Declaration Mode\Class5_Tractor_4x2\Class5_Tractor_DECL.xml");
+ //AddJobEntry(@"~\..\..\..\..\Generic Vehicles\Declaration Mode\Class5_Tractor_4x2\Class5_Tractor_DECL.xml");
+ //AddJobEntry("DummyEntry");
+ //AddJobEntry(@"~\..\..\..\..\Generic Vehicles\Declaration Mode\Class5_Tractor_4x2\Class5_Tractor_ENG.vecto");
+ //AddJobEntry(@"~\..\..\..\..\Generic Vehicles\Engineering Mode\EngineOnly\EngineOnly.vecto");
}
private void AddJobEntry(string jobFile)
@@ -55,18 +62,17 @@ namespace VECTO3.ViewModel.Impl
private void DoRemoveJob(object selected)
{
- var list = (IList)selected;
- var selectedEntries = list.Cast<JobEntry>().ToArray();
+ var jobEntry = selected as JobEntry;
+ if(jobEntry == null)
+ return;
- foreach (var entry in selectedEntries) {
- _jobs.Remove(entry);
- }
+ _jobs.Remove(jobEntry);
}
private bool CanRemoveJob(object selected)
{
- var list = (IList)selected;
- return list.Count > 0;
+ var jobEntry = selected as JobEntry;
+ return jobEntry != null;
}
public ICommand MoveJobUp { get { return new RelayCommand(() => { }, () => false); } }
@@ -98,7 +104,7 @@ namespace VECTO3.ViewModel.Impl
private void DoEditJob(object selected)
{
- var entry = (JobEntry)selected;
+ var entry = selected as JobEntry;
if (entry == null) {
return;
}
@@ -117,27 +123,47 @@ namespace VECTO3.ViewModel.Impl
private IJobEditViewModel ReadJob(string jobFile)
{
- IInputDataProvider inputData = null;
- var ext = Path.GetExtension(jobFile);
- switch (ext) {
- case Constants.FileExtensions.VectoJobFile:
- inputData = JSONInputDataFactory.ReadJsonJob(jobFile);
- break;
- case Constants.FileExtensions.VectoXMLDeclarationFile:
- //ToDo
- //case Constants.FileExtensions.VectoXMLJobFile:
- //inputData = Kernel.Get<IXMLInputDataReader>().CreateDeclaration(jobFile);
- //break;
- default:
- throw new UnsupportedFileVersionException(jobFile);
- }
- var retVal = CreateJobEditViewModel(inputData);
+ if (jobFile == null)
+ return null;
- if (retVal == null) {
- throw new Exception("Unsupported job type");
- }
- return retVal;
+ var xmlInputReader = Kernel.Get<IXMLInputDataReader>();
+ var reader = XmlReader.Create(jobFile);
+ var inputDataProvider = xmlInputReader.Create(reader);
+
+
+
+ return CreatePrimaryBusVehicleViewModel(inputDataProvider);
+
+
+
+ //IInputDataProvider inputData = null;
+ //var ext = Path.GetExtension(jobFile);
+ //switch (ext) {
+ // case Constants.FileExtensions.VectoJobFile:
+ // inputData = JSONInputDataFactory.ReadJsonJob(jobFile);
+ // break;
+ // case Constants.FileExtensions.VectoXMLDeclarationFile:
+ // //ToDo
+ // //case Constants.FileExtensions.VectoXMLJobFile:
+ // inputData = Kernel.Get<IXMLInputDataReader>().CreateDeclaration(jobFile);
+ // break;
+ // default:
+ // throw new UnsupportedFileVersionException(jobFile);
+ //}
+
+ //var retVal = CreateJobEditViewModel(inputData);
+
+ //if (retVal == null) {
+ // throw new Exception("Unsupported job type");
+ //}
+ //return retVal;
+ }
+
+ private IJobEditViewModel CreatePrimaryBusVehicleViewModel(IInputDataProvider inputData)
+ {
+ var declInput = inputData as IPrimaryVehicleInputDataProvider;
+ return new PrimaryVehicleBusJobViewModel(Kernel, declInput);
}
private IJobEditViewModel CreateJobEditViewModel(IInputDataProvider inputData)
@@ -165,8 +191,8 @@ namespace VECTO3.ViewModel.Impl
private bool CanEditJob(object selected)
{
- var list = (IList)selected;
- return list.Count == 1;
+ var jobEntry = selected as JobEntry;
+ return jobEntry != null;
}
}
}
diff --git a/VECTO3GUI/ViewModel/Impl/MainWindowViewModel.cs b/VECTO3GUI/ViewModel/Impl/MainWindowViewModel.cs
index 8be75d7aa1..3a7c3d2903 100644
--- a/VECTO3GUI/ViewModel/Impl/MainWindowViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/MainWindowViewModel.cs
@@ -1,8 +1,8 @@
using Ninject;
-using VECTO3.ViewModel.Interfaces;
-using VECTO3.Views;
+using VECTO3GUI.ViewModel.Interfaces;
+using VECTO3GUI.Views;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class MainWindowViewModel : ObservableObject, IMainWindowViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/NoneViewModel.cs b/VECTO3GUI/ViewModel/Impl/NoneViewModel.cs
index 5cb7254e74..914d0d339b 100644
--- a/VECTO3GUI/ViewModel/Impl/NoneViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/NoneViewModel.cs
@@ -1,6 +1,6 @@
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
internal class NoneViewModel : AbstractViewModel, INoneViewModel {
}
diff --git a/VECTO3GUI/ViewModel/Impl/ObservableObject.cs b/VECTO3GUI/ViewModel/Impl/ObservableObject.cs
index c8c0da64fc..7da9501458 100644
--- a/VECTO3GUI/ViewModel/Impl/ObservableObject.cs
+++ b/VECTO3GUI/ViewModel/Impl/ObservableObject.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using System.Runtime.CompilerServices;
using Ninject;
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
public abstract class ObservableObject : INotifyPropertyChanged
{
diff --git a/VECTO3GUI/ViewModel/Impl/PrimaryVehicleBusJobViewModel.cs b/VECTO3GUI/ViewModel/Impl/PrimaryVehicleBusJobViewModel.cs
new file mode 100644
index 0000000000..061b0eb7c2
--- /dev/null
+++ b/VECTO3GUI/ViewModel/Impl/PrimaryVehicleBusJobViewModel.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Ninject;
+using TUGraz.VectoCommon.InputData;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Interfaces;
+
+namespace VECTO3GUI.ViewModel.Impl
+{
+ public class PrimaryVehicleBusJobViewModel : AbstractJobViewModel, IJobEditViewModel
+ {
+
+ public PrimaryVehicleBusJobViewModel(IKernel kernel, IPrimaryVehicleInputDataProvider inputData)
+ {
+ Kernel = kernel;
+ InputDataProvider = inputData;
+ JobViewModel = this;
+ CreateComponentModel(Component.PrimaryBusVehicle);
+ CurrentComponent = GetComponentViewModel(Component.PrimaryBusVehicle);
+ }
+
+
+ protected override void DoSaveJob()
+ {
+ throw new NotImplementedException();
+ }
+
+ public string JobFile
+ {
+ get { return "some JobFile string"; }
+ }
+ public IInputDataProvider InputDataProvider { get; set; }
+ }
+}
diff --git a/VECTO3GUI/ViewModel/Impl/PrimaryVehicleBusViewModel.cs b/VECTO3GUI/ViewModel/Impl/PrimaryVehicleBusViewModel.cs
new file mode 100644
index 0000000000..2c6f516a0b
--- /dev/null
+++ b/VECTO3GUI/ViewModel/Impl/PrimaryVehicleBusViewModel.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Ninject;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
+using TUGraz.VectoCore.Utils;
+using VECTO3GUI.ViewModel.Adapter;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Interfaces;
+
+namespace VECTO3GUI.ViewModel.Impl
+{
+ public class PrimaryVehicleBusViewModel : AbstractViewModel, IPrimaryVehicleBusViewModel
+ {
+
+ #region Members
+
+ private string _manufacturer;
+
+ #endregion
+
+ #region Properties
+ #endregion
+
+
+
+ public PrimaryVehicleBusViewModel()
+ {
+
+ }
+
+
+ [Inject]
+ public IAdapterFactory AdapterFactory { set; protected get; }
+
+
+ #region Methods IPrimaryVehicleBusViewModel
+
+ public IVehicleDeclarationInputData Vehicle { get; set; }
+ public DigestData ResultDataHash { get; set; }
+ public IResultsInputData ResultsInputData { get; set; }
+ public IApplicationInformation ApplicationInformation { get; set; }
+ public DigestData ManufacturerHash { get; set; }
+
+
+ public string Manufacturer
+ {
+ get { return _manufacturer;}
+ set { SetProperty(ref _manufacturer, value); }
+ }
+ public string ManufacturerAddress { get; set; }
+ public string Model { get; set; }
+ public string VIN { get; set; }
+ public DateTime Date { get; set; }
+ public VehicleCategory VehicleCategory { get; set; }
+ public AxleConfiguration AxleConfiguration { get; set; }
+ public bool Articulated { get; set; }
+ public Kilogram TechnicalPermissibleMaximumLadenMass { get; set; }
+ public PerSecond IdlingSpeed { get; set; }
+ public RetarderType RetarderType { get; set; }
+ public double RetarderRatio { get; set; }
+ public AngledriveType AngledriveType { get; set; }
+ public bool ZeroEmissionVehicle { get; set; }
+ public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get; set; }
+ public IList<ITorqueLimitInputData> TorqueLimits { get; set; }
+
+
+ #endregion
+
+ private void SetVehicleData(IVehicleDeclarationInputData vehicle)
+ {
+ Manufacturer = vehicle.Manufacturer;
+ Model = vehicle.Model;
+ ManufacturerAddress = vehicle.ManufacturerAddress;
+ VIN = vehicle.VIN;
+ Date = vehicle.Date;
+ VehicleCategory = vehicle.VehicleCategory;
+ AxleConfiguration = vehicle.AxleConfiguration;
+ Articulated = vehicle.Articulated;
+ TechnicalPermissibleMaximumLadenMass = vehicle.GrossVehicleMassRating;
+ IdlingSpeed = vehicle.EngineIdleSpeed;
+
+ RetarderType = ((XMLDeclarationPrimaryVehicleBusDataProviderV01)vehicle).RetarderType;
+ RetarderRatio = ((XMLDeclarationPrimaryVehicleBusDataProviderV01)vehicle).RetarderRatio;
+ AngledriveType = ((XMLDeclarationPrimaryVehicleBusDataProviderV01)vehicle).AngledriveType;
+
+ ZeroEmissionVehicle = vehicle.ZeroEmissionVehicle;
+ ADAS = vehicle.ADAS;
+ TorqueLimits = vehicle.TorqueLimits;
+ }
+
+
+ protected override void InputDataChanged()
+ {
+ var inputData = JobViewModel.InputDataProvider as IPrimaryVehicleInputDataProvider;
+ SetVehicleData(inputData?.Vehicle);
+ }
+
+
+ }
+}
diff --git a/VECTO3GUI/ViewModel/Impl/RetarderViewModel.cs b/VECTO3GUI/ViewModel/Impl/RetarderViewModel.cs
index 377cbb767f..0e18f66848 100644
--- a/VECTO3GUI/ViewModel/Impl/RetarderViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/RetarderViewModel.cs
@@ -6,11 +6,11 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class RetarderViewModel : AbstractComponentViewModel, IRetarderViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/TorqueConverterViewModel.cs b/VECTO3GUI/ViewModel/Impl/TorqueConverterViewModel.cs
index 7fae9a9905..9d1ce63430 100644
--- a/VECTO3GUI/ViewModel/Impl/TorqueConverterViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/TorqueConverterViewModel.cs
@@ -6,11 +6,11 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl {
+namespace VECTO3GUI.ViewModel.Impl {
public class TorqueConverterViewModel : AbstractComponentViewModel, ITorqueConverterViewModel
{
private readonly ObservableCollection<TorqueConverterCharacteristics> _characteristics = new ObservableCollection<TorqueConverterCharacteristics>();
diff --git a/VECTO3GUI/ViewModel/Impl/TyreViewModel.cs b/VECTO3GUI/ViewModel/Impl/TyreViewModel.cs
index 08d64932c3..76bf220c2d 100644
--- a/VECTO3GUI/ViewModel/Impl/TyreViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/TyreViewModel.cs
@@ -3,10 +3,10 @@ using System.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
-using VECTO3.Util;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class TyreViewModel : AbstractComponentViewModel, ITyreViewModel
{
diff --git a/VECTO3GUI/ViewModel/Impl/ValidatingViewModel.cs b/VECTO3GUI/ViewModel/Impl/ValidatingViewModel.cs
index 2c489785c8..6e5b8de16f 100644
--- a/VECTO3GUI/ViewModel/Impl/ValidatingViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/ValidatingViewModel.cs
@@ -8,9 +8,9 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class ValidatingViewModel : ObservableObject, INotifyDataErrorInfo
{
diff --git a/VECTO3GUI/ViewModel/Impl/VehicleViewModel.cs b/VECTO3GUI/ViewModel/Impl/VehicleViewModel.cs
index 00421d757c..34a4e0ae05 100644
--- a/VECTO3GUI/ViewModel/Impl/VehicleViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/VehicleViewModel.cs
@@ -14,13 +14,13 @@ using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
-using VECTO3.Util;
-using VECTO3.ViewModel.Adapter;
-using VECTO3.ViewModel.Adapter.Declaration;
-using VECTO3.ViewModel.Interfaces;
-using Component = VECTO3.Util.Component;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Adapter;
+using VECTO3GUI.ViewModel.Adapter.Declaration;
+using VECTO3GUI.ViewModel.Interfaces;
+using Component = VECTO3GUI.Util.Component;
-namespace VECTO3.ViewModel.Impl
+namespace VECTO3GUI.ViewModel.Impl
{
public class VehicleViewModel : AbstractViewModel, IVehicleViewModel
{
@@ -147,8 +147,7 @@ namespace VECTO3.ViewModel.Impl
ManufacturerAddress = vehicle.ManufacturerAddress;
Model = vehicle.Model;
VIN = vehicle.VIN;
- //ToDo
- //Date = DateTime.Parse(vehicle.Date);
+ Date = vehicle.Date;
LegislativeClass = vehicle.LegislativeClass;
VehicleCategory = vehicle.VehicleCategory;
AxleConfiguration = vehicle.AxleConfiguration;
diff --git a/VECTO3GUI/ViewModel/Interfaces/FuelConsumptionEntry.cs b/VECTO3GUI/ViewModel/Interfaces/FuelConsumptionEntry.cs
index 41d71f3ecb..9a9154e7df 100644
--- a/VECTO3GUI/ViewModel/Interfaces/FuelConsumptionEntry.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/FuelConsumptionEntry.cs
@@ -1,8 +1,8 @@
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public class FuelConsumptionEntry : ObservableObject
{
private PerSecond _engineSpeed;
diff --git a/VECTO3GUI/ViewModel/Interfaces/FullLoadEntry.cs b/VECTO3GUI/ViewModel/Interfaces/FullLoadEntry.cs
index c4b88e5084..d40ff76cd5 100644
--- a/VECTO3GUI/ViewModel/Interfaces/FullLoadEntry.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/FullLoadEntry.cs
@@ -1,8 +1,8 @@
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public class FullLoadEntry : ObservableObject
{
private PerSecond _engineSpeed;
diff --git a/VECTO3GUI/ViewModel/Interfaces/Gear.cs b/VECTO3GUI/ViewModel/Interfaces/Gear.cs
index 03034d92c3..5bd5eb3801 100644
--- a/VECTO3GUI/ViewModel/Interfaces/Gear.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/Gear.cs
@@ -5,10 +5,10 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
-using VECTO3.Util;
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public class Gear : ValidatingViewModel
{
private PerSecond _maxSpeed;
diff --git a/VECTO3GUI/ViewModel/Interfaces/GearLossMapEntry.cs b/VECTO3GUI/ViewModel/Interfaces/GearLossMapEntry.cs
index e8794331d4..9c0f87d66d 100644
--- a/VECTO3GUI/ViewModel/Interfaces/GearLossMapEntry.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/GearLossMapEntry.cs
@@ -1,8 +1,8 @@
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public class GearLossMapEntry : ObservableObject
{
private NewtonMeter _torqueLoss;
diff --git a/VECTO3GUI/ViewModel/Interfaces/IAirdragViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IAirdragViewModel.cs
index b6e1f15847..19cbd65c17 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IAirdragViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IAirdragViewModel.cs
@@ -1,7 +1,7 @@
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface IAirdragViewModel : IComponentViewModel, ICommonComponentParameters
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/IAngledriveViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IAngledriveViewModel.cs
index 0337a2e40c..69874ad1bc 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IAngledriveViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IAngledriveViewModel.cs
@@ -1,9 +1,9 @@
using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface IAngledriveViewModel : IComponentViewModel, ICommonComponentParameters
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/IAuxiliariesViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IAuxiliariesViewModel.cs
index 063ac31082..0c4b2f0058 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IAuxiliariesViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IAuxiliariesViewModel.cs
@@ -1,8 +1,8 @@
using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public interface IAuxiliariesViewModel : IComponentViewModel
{
IAuxiliariesDeclarationInputData ModelData { get; }
diff --git a/VECTO3GUI/ViewModel/Interfaces/IAxleViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IAxleViewModel.cs
index 00d0a7431c..131530d309 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IAxleViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IAxleViewModel.cs
@@ -1,8 +1,8 @@
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public interface IAxleViewModel : IComponentViewModel
{
IAxleDeclarationInputData ModelData { get; }
diff --git a/VECTO3GUI/ViewModel/Interfaces/IAxlegearViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IAxlegearViewModel.cs
index ba29a81a61..f3a800989a 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IAxlegearViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IAxlegearViewModel.cs
@@ -1,9 +1,9 @@
using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface IAxlegearViewModel : IComponentViewModel, ICommonComponentParameters
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/IAxlesViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IAxlesViewModel.cs
index e10dc88493..be174efb0d 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IAxlesViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IAxlesViewModel.cs
@@ -3,7 +3,7 @@ using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public interface IAxlesViewModel : IComponentViewModel
{
IList<IAxleDeclarationInputData> ModelData { get; }
diff --git a/VECTO3GUI/ViewModel/Interfaces/ICommonComponentParameters.cs b/VECTO3GUI/ViewModel/Interfaces/ICommonComponentParameters.cs
index a8c566056d..17890f1468 100644
--- a/VECTO3GUI/ViewModel/Interfaces/ICommonComponentParameters.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/ICommonComponentParameters.cs
@@ -1,6 +1,6 @@
using System;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public interface ICommonComponentParameters
{
string Manufacturer { get; set; }
diff --git a/VECTO3GUI/ViewModel/Interfaces/IComponentViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IComponentViewModel.cs
index bef22cf8b2..c0ef6640a6 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IComponentViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IComponentViewModel.cs
@@ -1,9 +1,9 @@
using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
-using VECTO3.Util;
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.Util;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public interface IComponentViewModel
{
IJobEditViewModel JobViewModel { set; }
diff --git a/VECTO3GUI/ViewModel/Interfaces/ICyclesViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/ICyclesViewModel.cs
index 317cd92010..f7aafe9542 100644
--- a/VECTO3GUI/ViewModel/Interfaces/ICyclesViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/ICyclesViewModel.cs
@@ -1,6 +1,6 @@
using System.Collections.ObjectModel;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface ICyclesViewModel : IComponentViewModel
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/IEngineViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IEngineViewModel.cs
index a22a15d6e7..10c2a1d2fa 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IEngineViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IEngineViewModel.cs
@@ -2,9 +2,9 @@
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface IEngineViewModel : IComponentViewModel, ICommonComponentParameters
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/IGearboxViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IGearboxViewModel.cs
index 540f821a13..fc5da230e7 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IGearboxViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IGearboxViewModel.cs
@@ -1,9 +1,9 @@
using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface IGearboxViewModel : IComponentViewModel, ICommonComponentParameters
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/IJobEditViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IJobEditViewModel.cs
index c563da0611..a9a2ccb682 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IJobEditViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IJobEditViewModel.cs
@@ -1,9 +1,9 @@
using System.Collections.ObjectModel;
using System.Windows.Input;
using TUGraz.VectoCommon.InputData;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface IJobEditViewModel
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/IJoblistViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IJoblistViewModel.cs
index 5cbfac3644..38b0821943 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IJoblistViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IJoblistViewModel.cs
@@ -1,8 +1,8 @@
using System.Collections.ObjectModel;
using System.Windows.Input;
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface IJoblistViewModel : IMainView
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/IMainView.cs b/VECTO3GUI/ViewModel/Interfaces/IMainView.cs
index a6ef58bf04..4d93aaa2ca 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IMainView.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IMainView.cs
@@ -1,4 +1,4 @@
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public interface IMainView
{ }
}
\ No newline at end of file
diff --git a/VECTO3GUI/ViewModel/Interfaces/IMainWindowViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IMainWindowViewModel.cs
index 2b2f971b1a..00a452eaf6 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IMainWindowViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IMainWindowViewModel.cs
@@ -1,4 +1,4 @@
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface IMainWindowViewModel
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/INoneViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/INoneViewModel.cs
index 04ab1d1548..14063aa0f0 100644
--- a/VECTO3GUI/ViewModel/Interfaces/INoneViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/INoneViewModel.cs
@@ -1,3 +1,3 @@
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
internal interface INoneViewModel : IComponentViewModel { }
}
\ No newline at end of file
diff --git a/VECTO3GUI/ViewModel/Interfaces/IPrimaryVehicleBusViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IPrimaryVehicleBusViewModel.cs
new file mode 100644
index 0000000000..d1320f848a
--- /dev/null
+++ b/VECTO3GUI/ViewModel/Interfaces/IPrimaryVehicleBusViewModel.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.Declaration;
+
+namespace VECTO3GUI.ViewModel.Interfaces
+{
+ public interface IPrimaryVehicleBusViewModel : IComponentViewModel
+ {
+ #region Interfase IPrimaryVehicleInputDataProvider
+ IVehicleDeclarationInputData Vehicle { get; set; }
+ DigestData ResultDataHash { get; set; }
+ IResultsInputData ResultsInputData { get; set; }
+ IApplicationInformation ApplicationInformation { get; set; }
+ DigestData ManufacturerHash { get; set; }
+
+ #endregion
+
+ #region VehiclePIFType
+
+ string Manufacturer { get; set; }
+ string ManufacturerAddress { get; set; }
+ string Model { get; set; }
+ string VIN { get; set; }
+ DateTime Date { get; set; }
+ VehicleCategory VehicleCategory { get; set; }
+ AxleConfiguration AxleConfiguration { get; set; }
+ bool Articulated { get; set; }
+ Kilogram TechnicalPermissibleMaximumLadenMass { get; set; }
+ PerSecond IdlingSpeed { get; set; }
+ RetarderType RetarderType { get; set; }
+ double RetarderRatio { get; set; }
+ AngledriveType AngledriveType { get; set; }
+ bool ZeroEmissionVehicle { get; set; }
+ IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get; set; }
+
+ IList<ITorqueLimitInputData> TorqueLimits { get; set; }
+
+
+ #endregion
+
+
+ }
+}
diff --git a/VECTO3GUI/ViewModel/Interfaces/IRetarderViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IRetarderViewModel.cs
index 9425add90d..713d0bae3e 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IRetarderViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IRetarderViewModel.cs
@@ -1,9 +1,9 @@
using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface IRetarderViewModel : IComponentViewModel, ICommonComponentParameters
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/ITorqueConverterViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/ITorqueConverterViewModel.cs
index 6b799539ab..e7311c10ff 100644
--- a/VECTO3GUI/ViewModel/Interfaces/ITorqueConverterViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/ITorqueConverterViewModel.cs
@@ -1,9 +1,9 @@
using System.Collections.ObjectModel;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces
+namespace VECTO3GUI.ViewModel.Interfaces
{
public interface ITorqueConverterViewModel : IComponentViewModel, ICommonComponentParameters
{
diff --git a/VECTO3GUI/ViewModel/Interfaces/ITyreViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/ITyreViewModel.cs
index fae23eabca..a23f098d64 100644
--- a/VECTO3GUI/ViewModel/Interfaces/ITyreViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/ITyreViewModel.cs
@@ -1,8 +1,8 @@
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public interface ITyreViewModel : IComponentViewModel, ICommonComponentParameters
{
ITyreDeclarationInputData ModelData { get; }
diff --git a/VECTO3GUI/ViewModel/Interfaces/IVehicleViewModel.cs b/VECTO3GUI/ViewModel/Interfaces/IVehicleViewModel.cs
index 5233bc1bd6..7e9ccbc2c9 100644
--- a/VECTO3GUI/ViewModel/Interfaces/IVehicleViewModel.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/IVehicleViewModel.cs
@@ -5,9 +5,9 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
-using VECTO3.Util;
+using VECTO3GUI.Util;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public interface IVehicleViewModel : IComponentViewModel
{
IVehicleDeclarationInputData ModelData { get; }
diff --git a/VECTO3GUI/ViewModel/Interfaces/RetarderLossMapEntry.cs b/VECTO3GUI/ViewModel/Interfaces/RetarderLossMapEntry.cs
index b6fdf574ee..d92b0ae896 100644
--- a/VECTO3GUI/ViewModel/Interfaces/RetarderLossMapEntry.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/RetarderLossMapEntry.cs
@@ -1,8 +1,8 @@
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public class RetarderLossMapEntry : ObservableObject
{
private NewtonMeter _torqueLoss;
diff --git a/VECTO3GUI/ViewModel/Interfaces/SteeringPumpEntry.cs b/VECTO3GUI/ViewModel/Interfaces/SteeringPumpEntry.cs
index 897f7dd29c..eb6b8ae0db 100644
--- a/VECTO3GUI/ViewModel/Interfaces/SteeringPumpEntry.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/SteeringPumpEntry.cs
@@ -1,6 +1,6 @@
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public class SteeringPumpEntry : ObservableObject
{
private string _steeringPumpTechnology;
diff --git a/VECTO3GUI/ViewModel/Interfaces/TorqueConverterCharacteristics.cs b/VECTO3GUI/ViewModel/Interfaces/TorqueConverterCharacteristics.cs
index d851c580d2..b70054ea0b 100644
--- a/VECTO3GUI/ViewModel/Interfaces/TorqueConverterCharacteristics.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/TorqueConverterCharacteristics.cs
@@ -1,7 +1,7 @@
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
-namespace VECTO3.ViewModel.Interfaces {
+namespace VECTO3GUI.ViewModel.Interfaces {
public class TorqueConverterCharacteristics
{
public TorqueConverterCharacteristics(TorqueConverterEntry entry)
diff --git a/VECTO3GUI/ViewModel/Interfaces/TorqueEntry.cs b/VECTO3GUI/ViewModel/Interfaces/TorqueEntry.cs
index f048c1064b..bb95067180 100644
--- a/VECTO3GUI/ViewModel/Interfaces/TorqueEntry.cs
+++ b/VECTO3GUI/ViewModel/Interfaces/TorqueEntry.cs
@@ -4,9 +4,10 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
-using VECTO3.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Impl;
-namespace VECTO3.ViewModel.Interfaces {
+
+namespace VECTO3GUI.ViewModel.Interfaces {
public class TorqueEntry : ValidatingViewModel
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AirdragDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/AirdragDeclarationView.xaml
index d3cf0fd219..96264c0871 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AirdragDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AirdragDeclarationView.xaml
@@ -1,12 +1,12 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.AirdragDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.AirdragDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:helper="clr-namespace:VECTO3.Helper"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:AirdragDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AirdragDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/AirdragDeclarationView.xaml.cs
index 5d69cb697e..bcacb29424 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AirdragDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AirdragDeclarationView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for AirdragDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AngledriveDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/AngledriveDeclarationView.xaml
index eb7a4f0869..aa8d9585aa 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AngledriveDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AngledriveDeclarationView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.AngledriveDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.AngledriveDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:helper="clr-namespace:VECTO3.Helper"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:AngledriveDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AngledriveDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/AngledriveDeclarationView.xaml.cs
index 8918f63ac4..b3b0e94853 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AngledriveDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AngledriveDeclarationView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for AngledriveDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AuxiliariesDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/AuxiliariesDeclarationView.xaml
index 5a57e131a1..60bece4969 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AuxiliariesDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AuxiliariesDeclarationView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.AuxiliariesDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.AuxiliariesDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:EditCyclesView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AuxiliariesDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/AuxiliariesDeclarationView.xaml.cs
index 6181a46570..0fcabc8e68 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AuxiliariesDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AuxiliariesDeclarationView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for AuxiliariesDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AxleDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/AxleDeclarationView.xaml
index 782c552e6a..5bb9748ca2 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AxleDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AxleDeclarationView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.AxleDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.AxleDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<d:AxleDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AxleDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/AxleDeclarationView.xaml.cs
index 073e08eb1d..e393249e7c 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AxleDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AxleDeclarationView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for AxleDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AxlegearDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/AxlegearDeclarationView.xaml
index d6b36a3add..2acefa2eb2 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AxlegearDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AxlegearDeclarationView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.AxlegearDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.AxlegearDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:helper="clr-namespace:VECTO3.Helper"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:AxlegearDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AxlegearDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/AxlegearDeclarationView.xaml.cs
index ff55c4f1e4..fb608ff8fe 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AxlegearDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AxlegearDeclarationView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for AxlegearDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AxlesDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/AxlesDeclarationView.xaml
index f419f28401..c24467b82b 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AxlesDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AxlesDeclarationView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.AxlesDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.AxlesDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:AxlesDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/AxlesDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/AxlesDeclarationView.xaml.cs
index b0f1d8ab11..6660b04c54 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/AxlesDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/AxlesDeclarationView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for AxlesDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/CyclesDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/CyclesDeclarationView.xaml
index 65ab2bd0f9..ac4d8ca262 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/CyclesDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/CyclesDeclarationView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.CyclesDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.CyclesDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:helper="clr-namespace:VECTO3.Helper"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:EditCyclesView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/CyclesDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/CyclesDeclarationView.xaml.cs
index c9db7f961d..eddb12a282 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/CyclesDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/CyclesDeclarationView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for CyclesDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/EngineDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/EngineDeclarationView.xaml
index 1622acc728..ea66883d1b 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/EngineDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/EngineDeclarationView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.EngineDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.EngineDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:helper="clr-namespace:VECTO3.Helper"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="600">
<d:EngineDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/EngineDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/EngineDeclarationView.xaml.cs
index 92507fdeae..0f76506fb8 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/EngineDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/EngineDeclarationView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for EngineDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/GearboxDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/GearboxDeclarationView.xaml
index dff1657be8..de40200a79 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/GearboxDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/GearboxDeclarationView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.GearboxDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.GearboxDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:helper="clr-namespace:VECTO3.Helper"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:GearboxDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/GearboxDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/GearboxDeclarationView.xaml.cs
index ea1ec07df7..1c36adb362 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/GearboxDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/GearboxDeclarationView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for GearboxDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/PrimaryVehicleBusView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/PrimaryVehicleBusView.xaml
new file mode 100644
index 0000000000..746d971e4e
--- /dev/null
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/PrimaryVehicleBusView.xaml
@@ -0,0 +1,45 @@
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.PrimaryVehicleBusView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:local="clr-namespace:VECTO3GUI.Views.ComponentViews.Declaration"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
+ mc:Ignorable="d"
+ d:DesignHeight="600" d:DesignWidth="600">
+
+ <d:PrimaryVehicleBusView.DataContext>
+ <x:Type Type="interfaces:IPrimaryVehicleBusViewModel" />
+ </d:PrimaryVehicleBusView.DataContext>
+
+ <Grid>
+ <StackPanel Orientation="Vertical" Width="400" HorizontalAlignment="Left" Grid.IsSharedSizeScope="True">
+ <StackPanel Orientation="Vertical" DockPanel.Dock="Top" Grid.IsSharedSizeScope="True">
+ <customControls:VectoParameterControl
+ Caption="Manufacturer" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding Manufacturer}" />
+ <customControls:VectoParameterControl
+ Caption="Manufacturer Address" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding ManufacturerAddress}" />
+ <customControls:VectoParameterControl
+ Caption="Model" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding Model}" />
+ <customControls:VectoParameterControl
+ Caption="VIN" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding VIN}" />
+ <customControls:VectoParameterControl
+ Caption="Date" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding Date}" />
+ </StackPanel>
+
+
+
+
+ </StackPanel>
+
+
+
+ </Grid>
+</UserControl>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/PrimaryVehicleBusView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/PrimaryVehicleBusView.xaml.cs
new file mode 100644
index 0000000000..e68a252349
--- /dev/null
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/PrimaryVehicleBusView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace VECTO3GUI.Views.ComponentViews.Declaration
+{
+ /// <summary>
+ /// Interaction logic for PrimaryBusVehicleView.xaml
+ /// </summary>
+ public partial class PrimaryVehicleBusView : UserControl
+ {
+ public PrimaryVehicleBusView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/RetarderDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/RetarderDeclarationView.xaml
index 7e4f0241b4..7dd50b9004 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/RetarderDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/RetarderDeclarationView.xaml
@@ -1,12 +1,12 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.RetarderDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.RetarderDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:helper="clr-namespace:VECTO3.Helper"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:RetarderDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/RetarderDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/RetarderDeclarationView.xaml.cs
index fef896aab4..eb298f1965 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/RetarderDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/RetarderDeclarationView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for RetarderDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/TorqueConverterDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/TorqueConverterDeclarationView.xaml
index 4f58548c1e..77e6f13e5c 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/TorqueConverterDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/TorqueConverterDeclarationView.xaml
@@ -1,12 +1,12 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.TorqueConverterDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.TorqueConverterDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:helper="clr-namespace:VECTO3.Helper"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:TorqueConverterDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/TorqueConverterDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/TorqueConverterDeclarationView.xaml.cs
index 6258dc9497..feb7255f76 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/TorqueConverterDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/TorqueConverterDeclarationView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for TorqueConverterDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/TyreDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/TyreDeclarationView.xaml
index 16ce821539..3639230080 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/TyreDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/TyreDeclarationView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.TyreDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.TyreDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:helper="clr-namespace:VECTO3.Helper"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<d:TyreDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/TyreDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/TyreDeclarationView.xaml.cs
index 7e918d8ad5..241a4599a6 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/TyreDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/TyreDeclarationView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for TyreDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/VehicleDeclarationView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/VehicleDeclarationView.xaml
index a577384bb6..2803c33b2b 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/VehicleDeclarationView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/VehicleDeclarationView.xaml
@@ -1,13 +1,13 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Declaration.VehicleDeclarationView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Declaration.VehicleDeclarationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:helper="clr-namespace:VECTO3.Helper"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:impl="clr-namespace:VECTO3.ViewModel.Impl"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:impl="clr-namespace:VECTO3GUI.ViewModel.Impl"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800">
<d:VehicleDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/VehicleDeclarationView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Declaration/VehicleDeclarationView.xaml.cs
index f9216180fd..21f1f274c5 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/VehicleDeclarationView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/VehicleDeclarationView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Declaration
+namespace VECTO3GUI.Views.ComponentViews.Declaration
{
/// <summary>
/// Interaction logic for EditComponentVehicleDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/EditComponentNoneView.xaml b/VECTO3GUI/Views/ComponentViews/EditComponentNoneView.xaml
index 4d0deca78a..a16d9aa377 100644
--- a/VECTO3GUI/Views/ComponentViews/EditComponentNoneView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/EditComponentNoneView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="VECTO3.Views.EditComponentNoneView"
+<UserControl x:Class="VECTO3GUI.Views.EditComponentNoneView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/VECTO3GUI/Views/ComponentViews/EditComponentNoneView.xaml.cs b/VECTO3GUI/Views/ComponentViews/EditComponentNoneView.xaml.cs
index c124f29826..cc9bb7bd75 100644
--- a/VECTO3GUI/Views/ComponentViews/EditComponentNoneView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/EditComponentNoneView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views
+namespace VECTO3GUI.Views
{
/// <summary>
/// Interaction logic for EditComponentNoneView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AirdragEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/AirdragEngineeringView.xaml
index def7c86e1e..beafa19260 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AirdragEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AirdragEngineeringView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.AirdragEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.AirdragEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<d:AirdragDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AirdragEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/AirdragEngineeringView.xaml.cs
index 2cd4b39c79..f2d2c421a6 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AirdragEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AirdragEngineeringView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for AirdragDeclarationView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AngledriveEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/AngledriveEngineeringView.xaml
index 39d91a6fbf..71078e2294 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AngledriveEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AngledriveEngineeringView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.AngledriveEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.AngledriveEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<d:AngledriveDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AngledriveEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/AngledriveEngineeringView.xaml.cs
index 2079a87e04..8110332b0b 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AngledriveEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AngledriveEngineeringView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for AngledriveEngineeringView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AuxiliariesEngineerngView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/AuxiliariesEngineerngView.xaml
index 37fee2d45b..f411179122 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AuxiliariesEngineerngView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AuxiliariesEngineerngView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.AuxiliariesEngineerngView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.AuxiliariesEngineerngView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<d:EditCyclesView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AuxiliariesEngineerngView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/AuxiliariesEngineerngView.xaml.cs
index 5f392f27a0..239d345085 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AuxiliariesEngineerngView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AuxiliariesEngineerngView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for AuxiliariesEngineerngView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AxleEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/AxleEngineeringView.xaml
index 92380174af..00be9f7e71 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AxleEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AxleEngineeringView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.AxleEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.AxleEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:VECTO3.Views.ComponentViews.Engineering"
+ xmlns:local="clr-namespace:VECTO3GUI.Views.ComponentViews.Engineering"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AxleEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/AxleEngineeringView.xaml.cs
index 1cc4003062..81f5f3a6f3 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AxleEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AxleEngineeringView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for AxleEngineeringView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AxlegearEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/AxlegearEngineeringView.xaml
index 387d300f78..5d84780e76 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AxlegearEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AxlegearEngineeringView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.AxlegearEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.AxlegearEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<d:AxlegearDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AxlegearEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/AxlegearEngineeringView.xaml.cs
index c432f9143d..81d2fd5730 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AxlegearEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AxlegearEngineeringView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for AxlegearEngineeringView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AxlesEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/AxlesEngineeringView.xaml
index 4bc26b3137..403eae9d07 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AxlesEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AxlesEngineeringView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.AxlesEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.AxlesEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:VECTO3.Views.ComponentViews.Engineering"
+ xmlns:local="clr-namespace:VECTO3GUI.Views.ComponentViews.Engineering"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/AxlesEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/AxlesEngineeringView.xaml.cs
index 668092b4e7..265a4a4503 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/AxlesEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/AxlesEngineeringView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for AxlesEngineeringView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/CyclesEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/CyclesEngineeringView.xaml
index 844eab390b..b320b53bed 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/CyclesEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/CyclesEngineeringView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.CyclesEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.CyclesEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:VECTO3.Views"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:local="clr-namespace:VECTO3GUI.Views"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="600">
<d:EditCyclesView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/CyclesEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/CyclesEngineeringView.xaml.cs
index cd413a4995..b0dc19289d 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/CyclesEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/CyclesEngineeringView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for EditCyclesView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/EngineEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/EngineEngineeringView.xaml
index 12d79a8767..7ed2ecb7cb 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/EngineEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/EngineEngineeringView.xaml
@@ -1,12 +1,12 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.EngineEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.EngineEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
- xmlns:helper="clr-namespace:VECTO3.Helper"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
d:DesignHeight="500" d:DesignWidth="500">
<d:EngineDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/EngineEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/EngineEngineeringView.xaml.cs
index af6b36c9a2..70ef8cabf8 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/EngineEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/EngineEngineeringView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for EngineEngineeringView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/GearboxEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/GearboxEngineeringView.xaml
index ec112ac06a..db85a37114 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/GearboxEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/GearboxEngineeringView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.GearboxEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.GearboxEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<d:GearboxDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/GearboxEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/GearboxEngineeringView.xaml.cs
index cbae26dd4b..23f8eaa7cb 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/GearboxEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/GearboxEngineeringView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for GearboxEngineeringView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/RetarderEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/RetarderEngineeringView.xaml
index 395b1f0f9b..d53281c081 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/RetarderEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/RetarderEngineeringView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.RetarderEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.RetarderEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/RetarderEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/RetarderEngineeringView.xaml.cs
index a4ee05e70b..7db1a1243d 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/RetarderEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/RetarderEngineeringView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for RetarderEngineeringView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/TorqueConverterEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/TorqueConverterEngineeringView.xaml
index 35cb089b60..97f33f2ad2 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/TorqueConverterEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/TorqueConverterEngineeringView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.TorqueConverterEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.TorqueConverterEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<d:TorqueConverterDeclarationView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/TorqueConverterEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/TorqueConverterEngineeringView.xaml.cs
index f7a07ab9f2..4823c6e92f 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/TorqueConverterEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/TorqueConverterEngineeringView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for TorqueConverterEngineeringView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/TyreEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/TyreEngineeringView.xaml
index 9fecd85d5c..09ecaee59c 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/TyreEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/TyreEngineeringView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.TyreEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.TyreEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:VECTO3.Views.ComponentViews.Engineering"
+ xmlns:local="clr-namespace:VECTO3GUI.Views.ComponentViews.Engineering"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/TyreEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/TyreEngineeringView.xaml.cs
index 7c216d7ebb..e59a910dba 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/TyreEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/TyreEngineeringView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for TyreEngineeringView.xaml
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/VehicleEngineeringView.xaml b/VECTO3GUI/Views/ComponentViews/Engineering/VehicleEngineeringView.xaml
index 9f1d421f75..e472f79a12 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/VehicleEngineeringView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/VehicleEngineeringView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="VECTO3.Views.ComponentViews.Engineering.VehicleEngineeringView"
+<UserControl x:Class="VECTO3GUI.Views.ComponentViews.Engineering.VehicleEngineeringView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<d:VehicleEngineeringView.DataContext>
diff --git a/VECTO3GUI/Views/ComponentViews/Engineering/VehicleEngineeringView.xaml.cs b/VECTO3GUI/Views/ComponentViews/Engineering/VehicleEngineeringView.xaml.cs
index b911203a8f..b2af042bd3 100644
--- a/VECTO3GUI/Views/ComponentViews/Engineering/VehicleEngineeringView.xaml.cs
+++ b/VECTO3GUI/Views/ComponentViews/Engineering/VehicleEngineeringView.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace VECTO3.Views.ComponentViews.Engineering
+namespace VECTO3GUI.Views.ComponentViews.Engineering
{
/// <summary>
/// Interaction logic for EditComponentVehicleView.xaml
diff --git a/VECTO3GUI/Views/CustomControls/CheckboxParameter.xaml b/VECTO3GUI/Views/CustomControls/CheckboxParameter.xaml
index 885c7adcad..5418a3d679 100644
--- a/VECTO3GUI/Views/CustomControls/CheckboxParameter.xaml
+++ b/VECTO3GUI/Views/CustomControls/CheckboxParameter.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.CustomControls.CheckboxParameter"
+<UserControl x:Class="VECTO3GUI.Views.CustomControls.CheckboxParameter"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:VECTO3.Views.CustomControls"
+ xmlns:local="clr-namespace:VECTO3GUI.Views.CustomControls"
mc:Ignorable="d"
d:DesignHeight="30" d:DesignWidth="300" d:DataContext="{d:DesignInstance {x:Type local:CheckboxParameter}}">
<Grid Margin="5">
diff --git a/VECTO3GUI/Views/CustomControls/CheckboxParameter.xaml.cs b/VECTO3GUI/Views/CustomControls/CheckboxParameter.xaml.cs
index d6d5efc559..7d95158248 100644
--- a/VECTO3GUI/Views/CustomControls/CheckboxParameter.xaml.cs
+++ b/VECTO3GUI/Views/CustomControls/CheckboxParameter.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.CustomControls
+namespace VECTO3GUI.Views.CustomControls
{
/// <summary>
/// Interaction logic for CheckboxParameter.xaml
diff --git a/VECTO3GUI/Views/CustomControls/ComboParameter.xaml b/VECTO3GUI/Views/CustomControls/ComboParameter.xaml
index 22448b008d..6109102cd0 100644
--- a/VECTO3GUI/Views/CustomControls/ComboParameter.xaml
+++ b/VECTO3GUI/Views/CustomControls/ComboParameter.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.CustomControls.ComboParameter"
+<UserControl x:Class="VECTO3GUI.Views.CustomControls.ComboParameter"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:VECTO3.Views.CustomControls"
+ xmlns:local="clr-namespace:VECTO3GUI.Views.CustomControls"
mc:Ignorable="d"
d:DesignHeight="50" d:DesignWidth="300" d:DataContext="{d:DesignInstance {x:Type local:ComboParameter}}">
<Grid Margin="5">
diff --git a/VECTO3GUI/Views/CustomControls/ComboParameter.xaml.cs b/VECTO3GUI/Views/CustomControls/ComboParameter.xaml.cs
index 83ae752de0..e4b20e2f2d 100644
--- a/VECTO3GUI/Views/CustomControls/ComboParameter.xaml.cs
+++ b/VECTO3GUI/Views/CustomControls/ComboParameter.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.CustomControls
+namespace VECTO3GUI.Views.CustomControls
{
/// <summary>
/// Interaction logic for ComboParameter.xaml
diff --git a/VECTO3GUI/Views/CustomControls/CommonDeclarationComponentData.xaml b/VECTO3GUI/Views/CustomControls/CommonDeclarationComponentData.xaml
index 24ed445c74..b56cd54e83 100644
--- a/VECTO3GUI/Views/CustomControls/CommonDeclarationComponentData.xaml
+++ b/VECTO3GUI/Views/CustomControls/CommonDeclarationComponentData.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.CustomControls.CommonDeclarationComponentData"
+<UserControl x:Class="VECTO3GUI.Views.CustomControls.CommonDeclarationComponentData"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:VECTO3.Views.CustomControls"
+ xmlns:local="clr-namespace:VECTO3GUI.Views.CustomControls"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance {x:Type local:CommonDeclarationComponentData}}">
<Grid IsSharedSizeScope="True">
diff --git a/VECTO3GUI/Views/CustomControls/CommonDeclarationComponentData.xaml.cs b/VECTO3GUI/Views/CustomControls/CommonDeclarationComponentData.xaml.cs
index 0f4e0e90f8..a3455c6cf2 100644
--- a/VECTO3GUI/Views/CustomControls/CommonDeclarationComponentData.xaml.cs
+++ b/VECTO3GUI/Views/CustomControls/CommonDeclarationComponentData.xaml.cs
@@ -15,7 +15,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views.CustomControls
+namespace VECTO3GUI.Views.CustomControls
{
/// <summary>
/// Interaction logic for CommonComponentData.xaml
diff --git a/VECTO3GUI/Views/CustomControls/VectoParameterControl.xaml b/VECTO3GUI/Views/CustomControls/VectoParameterControl.xaml
index efb759171c..cc602f30f1 100644
--- a/VECTO3GUI/Views/CustomControls/VectoParameterControl.xaml
+++ b/VECTO3GUI/Views/CustomControls/VectoParameterControl.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.CustomControls.VectoParameterControl"
+<UserControl x:Class="VECTO3GUI.Views.CustomControls.VectoParameterControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:customControls="clr-namespace:VECTO3.Views.CustomControls"
+ xmlns:customControls="clr-namespace:VECTO3GUI.Views.CustomControls"
mc:Ignorable="d"
d:DesignHeight="40" d:DesignWidth="300" d:DataContext="{d:DesignInstance {x:Type customControls:VectoParameterControl}}">
<Grid Margin="5">
diff --git a/VECTO3GUI/Views/CustomControls/VectoParameterControl.xaml.cs b/VECTO3GUI/Views/CustomControls/VectoParameterControl.xaml.cs
index 23ee8f9b9d..c902957a1f 100644
--- a/VECTO3GUI/Views/CustomControls/VectoParameterControl.xaml.cs
+++ b/VECTO3GUI/Views/CustomControls/VectoParameterControl.xaml.cs
@@ -10,7 +10,7 @@ using System.Windows.Data;
using TUGraz.VectoCommon.Utils;
-namespace VECTO3.Views.CustomControls
+namespace VECTO3GUI.Views.CustomControls
{
/// <summary>
/// Interaction logic for VectoParameterControl.xaml
diff --git a/VECTO3GUI/Views/EngineeringEngineView.xaml b/VECTO3GUI/Views/EngineeringEngineView.xaml
index 47c84b473d..4a05b0fd66 100644
--- a/VECTO3GUI/Views/EngineeringEngineView.xaml
+++ b/VECTO3GUI/Views/EngineeringEngineView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="VECTO3.Views.EngineeringEngineView"
+<UserControl x:Class="VECTO3GUI.Views.EngineeringEngineView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:VECTO3.Views"
+ xmlns:local="clr-namespace:VECTO3GUI.Views"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="400">
<Grid>
diff --git a/VECTO3GUI/Views/EngineeringEngineView.xaml.cs b/VECTO3GUI/Views/EngineeringEngineView.xaml.cs
index d087f1f001..a85b469718 100644
--- a/VECTO3GUI/Views/EngineeringEngineView.xaml.cs
+++ b/VECTO3GUI/Views/EngineeringEngineView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views
+namespace VECTO3GUI.Views
{
/// <summary>
/// Interaction logic for EngineeringEngineView.xaml
diff --git a/VECTO3GUI/Views/JobEditView.xaml b/VECTO3GUI/Views/JobEditView.xaml
index c6134b74a9..2ae0f9a03a 100644
--- a/VECTO3GUI/Views/JobEditView.xaml
+++ b/VECTO3GUI/Views/JobEditView.xaml
@@ -1,13 +1,13 @@
-<UserControl x:Class="VECTO3.Views.JobEditView" Name="JobEditForm"
+<UserControl x:Class="VECTO3GUI.Views.JobEditView" Name="JobEditForm"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:VECTO3.Views"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:impl="clr-namespace:VECTO3.ViewModel.Impl"
- xmlns:util="clr-namespace:VECTO3.Util"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:local="clr-namespace:VECTO3GUI.Views"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:impl="clr-namespace:VECTO3GUI.ViewModel.Impl"
+ xmlns:util="clr-namespace:VECTO3GUI.Util"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="400" d:DesignWidth="600">
<d:JobEditView.DataContext>
diff --git a/VECTO3GUI/Views/JobEditView.xaml.cs b/VECTO3GUI/Views/JobEditView.xaml.cs
index 32b2594349..a25a18224c 100644
--- a/VECTO3GUI/Views/JobEditView.xaml.cs
+++ b/VECTO3GUI/Views/JobEditView.xaml.cs
@@ -12,10 +12,10 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-using VECTO3.ViewModel;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.Views
+namespace VECTO3GUI.Views
{
/// <summary>
/// Interaction logic for JobEditView.xaml
diff --git a/VECTO3GUI/Views/JobView.xaml b/VECTO3GUI/Views/JobView.xaml
index a5d4d95501..1de9b4fb6f 100644
--- a/VECTO3GUI/Views/JobView.xaml
+++ b/VECTO3GUI/Views/JobView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="VECTO3.Views.JobView"
+<UserControl x:Class="VECTO3GUI.Views.JobView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/VECTO3GUI/Views/JobView.xaml.cs b/VECTO3GUI/Views/JobView.xaml.cs
index 49975f50e9..250679cdcb 100644
--- a/VECTO3GUI/Views/JobView.xaml.cs
+++ b/VECTO3GUI/Views/JobView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-namespace VECTO3.Views
+namespace VECTO3GUI.Views
{
/// <summary>
/// Interaction logic for JobView.xaml
diff --git a/VECTO3GUI/Views/JoblistView.xaml b/VECTO3GUI/Views/JoblistView.xaml
index 3b9d5ae9a0..2645a64e8c 100644
--- a/VECTO3GUI/Views/JoblistView.xaml
+++ b/VECTO3GUI/Views/JoblistView.xaml
@@ -1,12 +1,12 @@
-<UserControl x:Class="VECTO3.Views.JoblistView"
+<UserControl x:Class="VECTO3GUI.Views.JoblistView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:viewModel="clr-namespace:VECTO3.ViewModel"
- xmlns:helper="clr-namespace:VECTO3.Helper"
- xmlns:impl="clr-namespace:VECTO3.ViewModel.Impl"
- xmlns:interfaces="clr-namespace:VECTO3.ViewModel.Interfaces"
+ xmlns:viewModel="clr-namespace:VECTO3GUI.ViewModel"
+ xmlns:helper="clr-namespace:VECTO3GUI.Helper"
+ xmlns:impl="clr-namespace:VECTO3GUI.ViewModel.Impl"
+ xmlns:interfaces="clr-namespace:VECTO3GUI.ViewModel.Interfaces"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="600">
<d:JoblistView.DataContext>
@@ -39,9 +39,9 @@
</ListView.View>
</ListView>
<StackPanel Grid.Column="1">
- <Button Margin="0,20,0,0" Command="{Binding EditJob}" CommandParameter="{Binding SelectedItems, ElementName=Joblisting}">Edit</Button>
+ <Button Margin="0,20,0,0" Command="{Binding EditJob}" CommandParameter="{Binding ElementName=Joblisting, Path=SelectedItem}">Edit</Button>
<Button Margin="0,15,0,0" Command="{Binding AddJob}">Add</Button>
- <Button Margin="0,5,0,0" Command="{Binding RemoveJob}" CommandParameter="{Binding SelectedItems, ElementName=Joblisting}">Remove</Button>
+ <Button Margin="0,5,0,0" Command="{Binding RemoveJob}" CommandParameter="{Binding ElementName=Joblisting, Path=SelectedItem}">Remove</Button>
<Button Margin="0,5,0,0" Command="{Binding MoveJobUp}">Up</Button>
<Button Margin="0,5,0,0" Command="{Binding MoveJobDown}">Down</Button>
<Button Margin="0,20,0,0" Command="{Binding StartSimulation}">Start</Button>
diff --git a/VECTO3GUI/Views/JoblistView.xaml.cs b/VECTO3GUI/Views/JoblistView.xaml.cs
index 8730cc2b52..c5e90f2517 100644
--- a/VECTO3GUI/Views/JoblistView.xaml.cs
+++ b/VECTO3GUI/Views/JoblistView.xaml.cs
@@ -13,11 +13,11 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
-using VECTO3.ViewModel;
-using VECTO3.ViewModel.Impl;
-using VECTO3.ViewModel.Interfaces;
+using VECTO3GUI.ViewModel;
+using VECTO3GUI.ViewModel.Impl;
+using VECTO3GUI.ViewModel.Interfaces;
-namespace VECTO3.Views
+namespace VECTO3GUI.Views
{
/// <summary>
/// Interaction logic for HomeView.xaml
--
GitLab