From c383928662f2571286cbdc8b10fc21bcc2b5b793 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Tue, 21 Apr 2020 10:54:32 +0200
Subject: [PATCH] GUI update vehiclebus
---
.../TempDataObject/VehicleBusComponentData.cs | 2 +-
.../Declaration/CompleteVehicleBusView.xaml | 169 ++++++++++--------
2 files changed, 92 insertions(+), 79 deletions(-)
diff --git a/VECTO3GUI/Model/TempDataObject/VehicleBusComponentData.cs b/VECTO3GUI/Model/TempDataObject/VehicleBusComponentData.cs
index 43b569272c..d78200e7db 100644
--- a/VECTO3GUI/Model/TempDataObject/VehicleBusComponentData.cs
+++ b/VECTO3GUI/Model/TempDataObject/VehicleBusComponentData.cs
@@ -104,7 +104,7 @@ namespace VECTO3GUI.Model.TempDataObject
ManufacturerAddress = vehicleBus.ManufacturerAddress;
Model = vehicleBus.Model;
VIN = vehicleBus.VIN;
- Date = vehicleBus.Date;
+ Date = DateTime.UtcNow;//Set DateTime UTC of current save
LegislativeClass = vehicleBus.LegislativeClass;
RegisteredClass = vehicleBus.RegisteredClass;
VehicleCode = vehicleBus.VehicleCode;
diff --git a/VECTO3GUI/Views/ComponentViews/Declaration/CompleteVehicleBusView.xaml b/VECTO3GUI/Views/ComponentViews/Declaration/CompleteVehicleBusView.xaml
index 41a5fba49e..4deebd40f8 100644
--- a/VECTO3GUI/Views/ComponentViews/Declaration/CompleteVehicleBusView.xaml
+++ b/VECTO3GUI/Views/ComponentViews/Declaration/CompleteVehicleBusView.xaml
@@ -16,84 +16,97 @@
</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="VIN" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding VIN}" />
- <customControls:VectoParameterControl
- Caption="Date" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding Date}" />
-
- <customControls:ComboParameter
- Caption="Legislative Class"
- CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding LegislativeClass}"
- AllowedValues="{Binding AllowedLegislativeClasses}" />
-
- <customControls:VectoParameterControl
- Caption="Registered Class" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding RegisteredClass}" />
-
- <customControls:ComboParameter
- Caption="Vehicle Code"
- CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding VehicleCode}"
- AllowedValues="{Binding AllowedVehicleCodes}" />
-
- <customControls:VectoParameterControl
- Caption="Curb Mass Chassis" Unit="{helper:SIUnit CurbMassChassis}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding CurbMassChassis, Converter={converter:SIValueConverter}, ConverterParameter=int}" />
-
- <customControls:VectoParameterControl
- Caption="Permissible Maximum Laden Mass" Unit="{helper:SIUnit TechnicalPermissibleMaximumLadenMass}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding TechnicalPermissibleMaximumLadenMass, Converter={converter:SIValueConverter}, ConverterParameter=int}" />
-
- <customControls:VectoParameterControl
- Caption="Passengers Lower Deck" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding NumberOfPassengersLowerDeck}" />
-
- <customControls:VectoParameterControl
- Caption="Passengers Upper Deck" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding NumberOfPassengersUpperDeck}" />
-
- <customControls:ComboParameter
- Caption="Floor Type"
- CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding FloorType}"
- AllowedValues="{Binding AllowedFloorTypes}" />
-
- <customControls:VectoParameterControl
- Caption="Height Integrated Body" Unit="{helper:SIUnit HeightIntegratedBody}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding HeightIntegratedBody, Converter={converter:SIValueConverter}, ConverterParameter=double}" />
-
- <customControls:VectoParameterControl
- Caption="Vehicle Length" Unit="{helper:SIUnit VehicleLength}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding VehicleLength, Converter={converter:SIValueConverter}, ConverterParameter=double}" />
-
- <customControls:VectoParameterControl
- Caption="Vehicle Width" Unit="{helper:SIUnit VehicleWidth}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding VehicleWidth, Converter={converter:SIValueConverter}, ConverterParameter=double}" />
-
- <customControls:VectoParameterControl
- Caption="Entrance Height" Unit="{helper:SIUnit EntranceHeight}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding EntranceHeight, Converter={converter:SIValueConverter}, ConverterParameter=double}" />
-
-
- <customControls:ComboParameter
- Caption="Door Drive Technology"
- CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
- Value="{Binding DoorDriveTechnology}"
- AllowedValues="{Binding AllowedConsumerTechnologies}" />
-
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="10"/>
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
+
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="10"/>
+ <RowDefinition/>
+ </Grid.RowDefinitions>
+
+ <GroupBox Header="Vehicle Data" Grid.Row="1" Grid.Column="1" Width="420" HorizontalAlignment="Left">
+ <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="VIN" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding VIN}" />
+ <customControls:VectoParameterControl
+ Caption="Date" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding Date}" />
+
+ <customControls:ComboParameter
+ Caption="Legislative Class"
+ CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding LegislativeClass}"
+ AllowedValues="{Binding AllowedLegislativeClasses}" />
+
+ <customControls:VectoParameterControl
+ Caption="Registered Class" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding RegisteredClass}" />
+
+ <customControls:ComboParameter
+ Caption="Vehicle Code"
+ CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding VehicleCode}"
+ AllowedValues="{Binding AllowedVehicleCodes}" />
+
+ <customControls:VectoParameterControl
+ Caption="Curb Mass Chassis" Unit="{helper:SIUnit CurbMassChassis}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding CurbMassChassis, Converter={converter:SIValueConverter}, ConverterParameter=int}" />
+
+ <customControls:VectoParameterControl
+ Caption="Permissible Maximum Laden Mass" Unit="{helper:SIUnit TechnicalPermissibleMaximumLadenMass}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding TechnicalPermissibleMaximumLadenMass, Converter={converter:SIValueConverter}, ConverterParameter=int}" />
+
+ <customControls:VectoParameterControl
+ Caption="Passengers Lower Deck" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding NumberOfPassengersLowerDeck}" />
+
+ <customControls:VectoParameterControl
+ Caption="Passengers Upper Deck" Unit="" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding NumberOfPassengersUpperDeck}" />
+
+ <customControls:ComboParameter
+ Caption="Floor Type"
+ CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding FloorType}"
+ AllowedValues="{Binding AllowedFloorTypes}" />
+
+ <customControls:VectoParameterControl
+ Caption="Height Integrated Body" Unit="{helper:SIUnit HeightIntegratedBody}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding HeightIntegratedBody, Converter={converter:SIValueConverter}, ConverterParameter=double}" />
+
+ <customControls:VectoParameterControl
+ Caption="Vehicle Length" Unit="{helper:SIUnit VehicleLength}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding VehicleLength, Converter={converter:SIValueConverter}, ConverterParameter=double}" />
+
+ <customControls:VectoParameterControl
+ Caption="Vehicle Width" Unit="{helper:SIUnit VehicleWidth}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding VehicleWidth, Converter={converter:SIValueConverter}, ConverterParameter=double}" />
+
+ <customControls:VectoParameterControl
+ Caption="Entrance Height" Unit="{helper:SIUnit EntranceHeight}" CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding EntranceHeight, Converter={converter:SIValueConverter}, ConverterParameter=double}" />
+
+
+ <customControls:ComboParameter
+ Caption="Door Drive Technology"
+ CaptionWidthGroup="vehicleLbl" UnitWidthGroup="unitWidth"
+ Value="{Binding DoorDriveTechnology}"
+ AllowedValues="{Binding AllowedConsumerTechnologies}" />
+
+ </StackPanel>
</StackPanel>
- </StackPanel>
+ </GroupBox>
</Grid>
</UserControl>
--
GitLab