Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit e486186a authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'ITnA-1-GUI-Correction' into 'develop-TrailerTool' 

Deletes of commit and reset button, Hitbox fix of radiobutton and checkboxes,...

See merge request em/vecto-trailertool!1
parents 7980116d 5f9e6371
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 76 additions and 78 deletions
Build/Packaging.targets
+ 1
− 0
View file @ e486186a
......@@ -46,6 +46,7 @@
<Target Name="GenerateReleasenotesPDF" BeforeTargets="AfterBuild" Condition="$(Configuration) == 'DeployTrailer'">
<Message Text="Generating Release Notes PDF"/>
<Exec Command="cscript &quot;$(solutiondir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>
<Exec Command="cscript &quot;$(solutiondir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(solutiondir)documentation\user manual source\VECTOTrailerTool_UserManual.pptx&quot; &quot;$(solutiondir)documentation\VectoTrailerTool\UserManual.pdf&quot;"/>
</Target>
<!--
<Target Name="GenerateHelpHTML" BeforeTargets="AfterBuild" Condition="$(Configuration) == 'DeployTrailer'">
......
Build/TextPreProcessing.targets
+ 2
− 1
View file @ e486186a
......@@ -6,6 +6,7 @@
</ItemGroup>
<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\12.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\14.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%ProgramFiles%\Microsoft Visual Studio\2022\Community\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
</Target>
</Project>
\ No newline at end of file
Documentation/User Manual Source/Release Notes Vecto3.x.pdf
+ 0
− 0
View file @ e486186a
No preview for this file type
Documentation/User Manual Source/VECTOTrailerTool_UserManual.pptx 0 → 100644
+ 0
− 0
View file @ e486186a
File added
Documentation/VectoTrailerTool/UserManual.pdf
+ 0
− 0
View file @ e486186a
No preview for this file type
VECTOTrailer/Views/ComponentViews/Declaration/CompleteTrailerView.xaml
+ 65
− 65
View file @ e486186a
......@@ -11,7 +11,7 @@
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:validation="clr-namespace:VECTOTrailer.Helper.Validation"
mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="500">
d:DesignHeight="800" d:DesignWidth="1210">
<d:CompleteTrailerViewModel.DataContext>
<x:Type Type="interfaces:ICompleteTrailerViewModel" />
......@@ -21,8 +21,8 @@
<BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
</UserControl.Resources>
<Grid>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="10" />
<ColumnDefinition Width="400" />
......@@ -37,7 +37,7 @@
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<!--Width="400" Height="200"-->
<!--Width="400" Height="200"-->
<GroupBox Header="Documentation" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5">
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" Grid.IsSharedSizeScope="True" VerticalAlignment="Stretch">
<StackPanel Orientation="Vertical" DockPanel.Dock="Top" Grid.IsSharedSizeScope="True">
......@@ -123,48 +123,48 @@
</StackPanel>
</StackPanel>
</GroupBox>
<!--Width="400" Height="350"-->
<!--Width="400" Height="350"-->
<GroupBox Header="Dimensions" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5">
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" Grid.IsSharedSizeScope="True" VerticalAlignment="Stretch">
<!--<StackPanel Orientation="Vertical" DockPanel.Dock="Top" Grid.IsSharedSizeScope="True">-->
<Grid>
<customControls:VectoParameterControl
<Grid>
<customControls:VectoParameterControl
Caption="External length of the body" CaptionWidthGroup="lblGWidth"
Value="{Binding ExternalLengthOfTheBody,
Converter={converter:SIValueConverter},
ConverterParameter=AsMeter|double3, UpdateSourceTrigger=LostFocus, NotifyOnValidationError=True}" ValueAlign="right"
Unit="m" UnitWidthGroup="unitWidth"/>
</Grid>
</Grid>
<Grid>
<customControls:VectoParameterControl
<Grid>
<customControls:VectoParameterControl
Caption="External width of the body" CaptionWidthGroup="lblGWidth"
Value="{Binding ExternalWidthOfTheBody, Converter={converter:SIValueConverter},
ConverterParameter=AsMeter|double3, UpdateSourceTrigger=LostFocus, NotifyOnValidationError=True}" ValueAlign="right"
Unit="m" UnitWidthGroup="unitWidth"/>
</Grid>
</Grid>
<Grid>
<customControls:VectoParameterControl
<Grid>
<customControls:VectoParameterControl
Caption="External height of the body" CaptionWidthGroup="lblGWidth"
Value="{Binding ExternalHeightOfTheBody,
Converter={converter:SIValueConverter},
ConverterParameter=AsMeter|double3, UpdateSourceTrigger=LostFocus, NotifyOnValidationError=True}" ValueAlign="right"
Unit="m" UnitWidthGroup="unitWidth"/>
</Grid>
</Grid>
<Grid>
<customControls:VectoParameterControl
<Grid>
<customControls:VectoParameterControl
Caption="Total height of the trailer" CaptionWidthGroup="lblGWidth"
Value="{Binding TotalHeightOfTheTrailer,
Converter={converter:SIValueConverter},
ConverterParameter=AsMeter|double3, UpdateSourceTrigger=LostFocus, NotifyOnValidationError=True}" ValueAlign="right"
Unit="m" UnitWidthGroup="unitWidth"/>
</Grid>
</Grid>
<Grid>
<customControls:VectoParameterControl
<Grid>
<customControls:VectoParameterControl
Caption="Length from trailer front end to centre of first axle" CaptionWidthGroup="lblGWidth"
Value="{Binding LengthFromFrontToFirstAxle,
Converter={converter:SIValueConverter},
......@@ -173,11 +173,11 @@
UpdateSourceTrigger=LostFocus,
NotifyOnValidationError=True}" ValueAlign="right"
Unit="m" UnitWidthGroup="unitWidth"/>
</Grid>
</Grid>
<Grid>
<customControls:VectoParameterControl
<Grid>
<customControls:VectoParameterControl
Caption="Length between centres of axles" CaptionWidthGroup="lblGWidth"
Value="{Binding LengthBetweenCentersOfAxles,
Converter={converter:SIValueConverter},
......@@ -186,27 +186,27 @@
NotifyOnValidationError=True}" ValueAlign="right"
Unit="m" UnitWidthGroup="unitWidth" Visibility="{Binding ShowLengthBetweenCentersOfAxles,
Converter={StaticResource BoolToVisibilityConverter}}"/>
</Grid>
</Grid>
<Grid>
<customControls:VectoParameterControl
<Grid>
<customControls:VectoParameterControl
Caption="Cargo volume" CaptionWidthGroup="lblGWidth"
Value="{Binding CargoVolume,
Converter={converter:SIValueConverter},
ConverterParameter=AsCubicMeter|double3,
UpdateSourceTrigger=LostFocus, NotifyOnValidationError=True}" ValueAlign="right"
Unit="m3" UnitWidthGroup="unitWidth"/>
</Grid>
</Grid>
<!--</StackPanel>-->
</StackPanel>
</GroupBox>
<!--Width="330" Height="200"-->
<!--Width="330" Height="200"-->
<GroupBox Header="Classification" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5">
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" Grid.IsSharedSizeScope="True" VerticalAlignment="Top">
<StackPanel Orientation="Vertical" DockPanel.Dock="Top" Grid.IsSharedSizeScope="True">
<Grid Margin="5">
<Grid.ColumnDefinitions>
<ColumnDefinition SharedSizeGroup="vehicleLbl"/>
......@@ -263,7 +263,7 @@
<TextBlock Grid.Column="0" Text="Trailer Coupling Point" Margin="0,0,10,0" Visibility="{Binding ShowTrailerCouplingPoint, Converter={StaticResource BoolToVisibilityConverter}}"/>
<Grid Grid.Column="1">
<customControls:DefaultTextComboBox
<customControls:DefaultTextComboBox
Margin="20,0,0,0"
ItemsSource="{Binding AllowedTrailerCouplingPoint}"
SelectedValue="{Binding TrailerCouplingPoint, Mode=TwoWay ,ValidatesOnDataErrors=True, NotifyOnValidationError=True, UpdateSourceTrigger=PropertyChanged}"
......@@ -273,7 +273,7 @@
IsReadOnly="True"
DefaultText="Select..."
Visibility="{Binding ShowTrailerCouplingPoint, Converter={StaticResource BoolToVisibilityConverter}}">
</customControls:DefaultTextComboBox>
</customControls:DefaultTextComboBox>
</Grid>
</Grid>
......@@ -307,7 +307,7 @@
<TextBlock Grid.Column="0" Text="Volume Orientation" Margin="0,0,0,0"/>
<TextBlock Grid.Column="0" Text="(see Annex I, point 1(6))" Margin="0,0,0,0"/>
</StackPanel>
<CheckBox Grid.Column="1" VerticalAlignment="Center" IsChecked="{Binding VolumeOrientation}" Margin="20,0,0,0"/>
<CheckBox Grid.Column="1" VerticalAlignment="Center" IsChecked="{Binding VolumeOrientation}" Margin="20,0,7.5,0" Height="15" HorizontalAlignment="Right"/>
</Grid>
......@@ -315,47 +315,47 @@
</StackPanel>
</StackPanel>
</GroupBox>
<!--Width="330" Height="350"-->
<!--Width="330" Height="350"-->
<GroupBox Header="Αero feature technologies" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5">
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" Grid.IsSharedSizeScope="True" VerticalAlignment="Top">
<StackPanel Orientation="Vertical" DockPanel.Dock="Top" Grid.IsSharedSizeScope="True">
<RadioButton Margin="0,5,0,0" GroupName="features" Name="standard" IsChecked="{Binding IsStandard}">Standard aerodynamic devices</RadioButton>
<RadioButton Margin="0,5,0,0" GroupName="features" Name="certified" IsChecked="{Binding IsCertified}">Certified aerodynamic device</RadioButton>
<RadioButton Margin="0,5,0,0" GroupName="features" Name="none" IsChecked="{Binding IsNone}">None</RadioButton>
<RadioButton Margin="0,5,0,0" GroupName="features" Name="standard" IsChecked="{Binding IsStandard}" HorizontalAlignment="Left">Standard aerodynamic devices</RadioButton>
<RadioButton Margin="0,5,0,0" GroupName="features" Name="certified" IsChecked="{Binding IsCertified}" HorizontalAlignment="Left">Certified aerodynamic device</RadioButton>
<RadioButton Margin="0,5,0,0" GroupName="features" Name="none" IsChecked="{Binding IsNone}" HorizontalAlignment="Left">None</RadioButton>
<GroupBox Header="Side covers" Visibility="{Binding IsChecked,ElementName=standard,Converter={StaticResource BoolToVisibilityConverter}}">
<Grid Margin="5" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="20"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Grid Margin="5" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="20"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="Short side covers"/>
<CheckBox Grid.Column="1" IsChecked="{Binding SideSkirtsShort}"/>
<TextBlock Grid.Column="3" Text="Long side covers"/>
<CheckBox Grid.Column="4" IsChecked="{Binding SideSkirtsLong}"/>
<TextBlock Grid.Column="0" Text="Short side covers"/>
<CheckBox Grid.Column="1" IsChecked="{Binding SideSkirtsShort}"/>
<TextBlock Grid.Column="3" Text="Long side covers"/>
<CheckBox Grid.Column="4" IsChecked="{Binding SideSkirtsLong}"/>
</Grid>
</Grid>
</GroupBox>
<GroupBox Header="Rear flaps" Visibility="{Binding IsChecked,ElementName=standard,Converter={StaticResource BoolToVisibilityConverter}}">
<Grid Margin="5" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="20"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="Short rear flaps" />
<CheckBox Grid.Column="1" IsChecked="{Binding BoatTailShort}"/>
<Grid Margin="5" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="20"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="Short rear flaps" />
<CheckBox Grid.Column="1" IsChecked="{Binding BoatTailShort}"/>
<TextBlock Grid.Column="3" Text="Tall rear flaps"/>
<CheckBox Grid.Column="4" IsChecked="{Binding BoatTailLong}"/>
<CheckBox Grid.Column="4" IsChecked="{Binding BoatTailLong}"/>
</Grid>
</GroupBox>
<GroupBox Header="Certified aerodynamic device XML" Margin="5" HorizontalAlignment="Stretch" Visibility="{Binding IsChecked,ElementName=certified,Converter={StaticResource BoolToVisibilityConverter}}">
......@@ -421,11 +421,11 @@
</StackPanel>
</StackPanel>
</GroupBox>
<!--Width="560" Height="200"-->
<!--Width="560" Height="200"-->
<GroupBox Header="Masses" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5">
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" Grid.IsSharedSizeScope="True" VerticalAlignment="Top">
<StackPanel Orientation="Vertical" DockPanel.Dock="Top" Grid.IsSharedSizeScope="True">
<Grid>
<customControls:VectoParameterControl
Caption="Corrected mass in running order" CaptionWidthGroup="lblGWidth"
......@@ -473,7 +473,7 @@
</Style>
</TextBlock.Style>
</TextBlock>
<!--#region Axle1 -->
<Grid Margin="5">
<Grid.Style>
......
VECTOTrailer/Views/JoblistTabView.xaml
+ 4
− 8
View file @ e486186a
......@@ -85,24 +85,20 @@
<Grid>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,15,0">
<Button HorizontalAlignment="Right" MinWidth="80" Margin="0,0,10,0"
Content="Save As..." Visibility="{Binding SaveAsButtonVisible, Converter={converter:BoolVisibilityConverter}}"
Content="Save As..."
Command="{Binding SaveAsJob}"
CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
<Button HorizontalAlignment="Right" MinWidth="80" Margin="0,0,10,0"
Content="Save" Visibility="{Binding SaveButtonVisibility, Converter={converter:BoolVisibilityConverter}}"
Content="Save"
Command="{Binding SaveJob}"
CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
<Button HorizontalAlignment="Right" MinWidth="140"
Content="{Binding ElementName=ComponentsTab, Path=SelectedItem,
Converter={converter:SaveButtonLabelConverter}, ConverterParameter='Commit'}"
Command="{Binding CommitComponent}" CommandParameter="{Binding ElementName=ComponentsTab, Path=SelectedItem}"/>
</StackPanel>
<Button Content="Reset" HorizontalAlignment="Left" Margin="15,0,0,0" MinWidth="80"
Command="{Binding ResetComponent}" CommandParameter="{Binding ElementName=ComponentsTab, Path=SelectedItem}"/>
</Grid>
</StackPanel>
</Grid>
......
VECTOTrailer/Views/JoblistView.xaml
+ 4
− 4
View file @ e486186a
......@@ -252,8 +252,8 @@
</DockPanel>
</GroupBox>
<GroupBox Header ="Settings">
<StackPanel>
<CheckBox Margin="0,0,0,3" IsEnabled="{Binding CanRunSimulation}" IsChecked="{Binding TrailerToolSettings.SimulationSettings.WriteModData, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">Write modal results</CheckBox>
<StackPanel HorizontalAlignment="Left">
<CheckBox Margin="0,0,0,3" IsEnabled="{Binding CanRunSimulation}" IsChecked="{Binding TrailerToolSettings.SimulationSettings.WriteModData, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">Write modal results</CheckBox>
<CheckBox Margin="0,0,0,3" IsChecked="{Binding TrailerToolSettings.SimulationSettings.WritePDFReport, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<!--IsEnabled="{Binding WritePdfCanBeEdited}"-->
Create PDF reports
......@@ -286,8 +286,8 @@
</GroupBox>
<GroupBox Header="Background Worker Settings" >
<StackPanel Orientation="Vertical">
<CheckBox Margin="0,0,0,3" IsEnabled="{Binding BackGroundSimulator.AutoSimActive, Converter={converter:InvertBoolConverter}}" IsChecked="{Binding TrailerToolSettings.SimulationSettings.BackgroundWriteModData, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">Write modal results</CheckBox>
<CheckBox Margin="0,0,0,3" IsChecked="{Binding TrailerToolSettings.SimulationSettings.BackgroudWritePDF, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<CheckBox Margin="0,0,0,3" IsEnabled="{Binding BackGroundSimulator.AutoSimActive, Converter={converter:InvertBoolConverter}}" IsChecked="{Binding TrailerToolSettings.SimulationSettings.BackgroundWriteModData, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left">Write modal results</CheckBox>
<CheckBox Margin="0,0,0,3" IsChecked="{Binding TrailerToolSettings.SimulationSettings.BackgroudWritePDF, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left">
<!--IsEnabled="{Binding WritePdfCanBeEdited}"-->
<CheckBox.IsEnabled>
<MultiBinding Converter="{ converter:BoolANDMultiValConverter}">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about