Merge branch 'bugfix/CodeEU-616_multistep_gui' into 'amdm2/develop'

Bugfix/code eu 616 multistep gui

See merge request vecto/vecto!208

VECTO3GUI2020/Helper/DialogHelper.cs

@@ -146,20 +146,18 @@ namespace VECTO3GUI2020.Helper
 			MessageBoxImage icon)
 		{
 			var t = Application.Current.Dispatcher
-				.InvokeAsync(() => MessageBox.Show(messageBoxText, caption, button, icon)).Task;
+				.Invoke(() => MessageBox.Show(messageBoxText, caption, button, icon));
 
-			t.Wait();
-			return t.Result;
+			return t;
             //return MessageBox.Show(messageBoxText, caption, button, icon);
 		}
 
 		public MessageBoxResult ShowMessageBox(string messageBoxText, string caption)
 		{
 			var t = Application.Current.Dispatcher
-				.InvokeAsync(() => MessageBox.Show(messageBoxText, caption)).Task;
+				.Invoke(() => MessageBox.Show(messageBoxText, caption), DispatcherPriority.Send);
 
-			t.Wait();
-			return t.Result;
+			return t;
             //return MessageBox.Show(messageBoxText, caption);
         }
 

VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel.cs

@@ -372,7 +372,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 
 			_parameterViewModels[nameof(DoorDriveTechnology)].AllowedItems =
 				EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, ConsumerTechnology>(
-					ConsumerTechnology.Unknown);
+					ConsumerTechnology.Unknown, ConsumerTechnology.Mechanically);
 
 			//Setup additional consolidatedVehicleData
 			_parameterViewModels[nameof(EngineStopStartNullable)].PreviousContent =
@@ -387,8 +387,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			//Set Mandatory Fields
 
 			_parameterViewModels[nameof(Manufacturer)].Mandatory = true;
+			_parameterViewModels[nameof(Manufacturer)].EditingEnabled = true;
 			_parameterViewModels[nameof(ManufacturerAddress)].Mandatory = true;
+			_parameterViewModels[nameof(ManufacturerAddress)].EditingEnabled = true;
 			_parameterViewModels[nameof(VIN)].Mandatory = true;
+			_parameterViewModels[nameof(VIN)].EditingEnabled = true;
 		}
 
         #region Overrides of ViewModelBase
@@ -541,7 +544,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 
 		public string ManufacturerAddress
 		{
-			get { return String.IsNullOrEmpty(_manufacturerAddress) ? null : _manufacturerAddress; }
+			get { return /*String.IsNullOrEmpty(_manufacturerAddress) ? null :*/ _manufacturerAddress; }
 			set { SetProperty(ref _manufacturerAddress, value); }
 		}
 
@@ -689,6 +692,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			set { SetProperty(ref _tankSystem, value); }
 		}
 
+		public virtual bool TankSystemEnabled => true;
+
 		public MultistageParameterViewModel TankSystemVM
 		{
 			get => _parameterViewModels[nameof(TankSystem)];
@@ -951,6 +956,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			}
 		}
 
+		public virtual bool EngineStopStartEnabled => true;
+
 		public bool EngineStopStart
 		{
 			get
@@ -976,6 +983,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			}
 		}
 
+		public virtual bool EcoRollEnabled => true;
+
 		public PredictiveCruiseControlType? PredictiveCruiseControlNullable
 		{
 			get => _predictiveCruiseControlNullable;
@@ -985,6 +994,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			}
 		}
 
+		public virtual bool PredictiveCruiseControlEnabled => true;
+
 		public PredictiveCruiseControlType PredictiveCruiseControl
 		{
 			get
@@ -1004,6 +1015,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			}
 		}
 
+		public virtual bool ATEcoRollReleaseLockupClutchEnabled => true;
+
 		#endregion
 
 
@@ -1321,6 +1334,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			get => CompletedBusArchitecture.HEV;
 		}
 
+		public override bool EcoRollEnabled => false;
+
+		public override bool ATEcoRollReleaseLockupClutchEnabled => false;
+
+
         public override string XMLType => XMLTypes.Vehicle_Hev_CompletedBusDeclarationType;
     }
 
@@ -1340,6 +1358,16 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		{
 			get { return CompletedBusArchitecture.PEV; }
 		}
+
+		public override bool TankSystemEnabled => false;
+
+		public override bool EcoRollEnabled => false;
+
+		public override bool EngineStopStartEnabled => false;
+
+		public override bool ATEcoRollReleaseLockupClutchEnabled => false;
+
+
 		public override string XMLType => XMLTypes.Vehicle_Pev_CompletedBusDeclarationType;
         #endregion
     }
@@ -1358,6 +1386,16 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 
 		public override CompletedBusArchitecture Architecture =>
 			CompletedBusArchitecture.IEPC;
+
+		public override bool TankSystemEnabled => false;
+
+		public override bool EcoRollEnabled => false;
+
+		public override bool EngineStopStartEnabled => false;
+
+		public override bool ATEcoRollReleaseLockupClutchEnabled => false;
+
+
         public override string XMLType => XMLTypes.Vehicle_Iepc_CompletedBusDeclarationType;
         #endregion
     }

VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml

@@ -48,7 +48,7 @@
                     Content="{Binding ParameterViewModels[AirdragModifiedEnum]}"/>
 
                 <ContentControl 
-                    Content="{Binding ParameterViewModels[TankSystem]}"/>
+                    Content="{Binding ParameterViewModels[TankSystem]}" Visibility="{Binding TankSystemEnabled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
 
                 <ContentControl 
                     Content="{Binding ParameterViewModels[RegisteredClass]}"/>
@@ -115,19 +115,19 @@
                     <Label Content="Advanced Driver Assistant Systems" Style="{DynamicResource LabelStyle1}"/>
 
                 <ContentControl 
-                    Content="{Binding ParameterViewModels[EngineStopStartNullable]}"/>
+                    Content="{Binding ParameterViewModels[EngineStopStartNullable]}" Visibility="{Binding EngineStopStartEnabled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
 
 
 
                 <ContentControl 
-                    Content="{Binding ParameterViewModels[EcoRollTypeNullable]}"/>
+                    Content="{Binding ParameterViewModels[EcoRollTypeNullable]}" Visibility="{Binding EcoRollEnabled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
 
 
                 <ContentControl 
-                    Content="{Binding ParameterViewModels[PredictiveCruiseControlNullable]}"/>
+                    Content="{Binding ParameterViewModels[PredictiveCruiseControlNullable]}" Visibility="{Binding PredictiveCruiseControlEnabled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
 
                 <ContentControl 
-                    Content="{Binding ParameterViewModels[ATEcoRollReleaseLockupClutch]}"/>
+                    Content="{Binding ParameterViewModels[ATEcoRollReleaseLockupClutch]}" Visibility="{Binding ATEcoRollReleaseLockupClutchEnabled, Converter={StaticResource BooleanToVisibilityConverter}}"/>
                 </StackPanel>
         </DockPanel>
         </ScrollViewer>

VectoCore/VectoCore/OutputData/XML/GroupWriter/Declaration/Vehicle/CompletedBus/CompletedBusDimensionsWriter.cs

@@ -17,7 +17,7 @@ namespace TUGraz.VectoCore.OutputData.XML.GroupWriter.Declaration.Vehicle.Comple
 			}
 			return new XElement[] {
 				new XElement(writerNamespace + XMLNames.Bus_HeightIntegratedBody,
-					vehicle.Height.ConvertToMilliMeter()),
+					vehicle.Height.ConvertToMilliMeter().ToXMLFormat(0)),
 				new XElement(writerNamespace + XMLNames.Bus_VehicleLength, vehicle.Length.ConvertToMilliMeter().ToXMLFormat(0)),
 				new XElement(writerNamespace + XMLNames.Bus_VehicleWidth, vehicle.Width.ConvertToMilliMeter().ToXMLFormat(0)),
 				new XElement(writerNamespace + XMLNames.Bus_EntranceHeight,