This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

Pull request #12: Develop TrailerTool 

Merge in VECTO/vecto-dev_bt from VECTO/mq_vecto-dev_bt:develop-TrailerTool to develop-TrailerTool

* commit 'e486186a':
  Updateing build script, update of user manual
  Deletes of commit and reset button, Hitbox fix of radiobutton and checkboxes, Save and save as button visibility change
  change schema: parent element around applicable vehicle groups
parents d7067524 e486186a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 80 additions and 79 deletions
Build/Packaging.targets
+ 1
− 0
View file @ 4f58f99b
......@@ -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 @ 4f58f99b
......@@ -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 @ 4f58f99b
No preview for this file type
Documentation/User Manual Source/VECTOTrailerTool_UserManual.pptx 0 → 100644
+ 0
− 0
View file @ 4f58f99b
File added
Documentation/VectoTrailerTool/UserManual.pdf
+ 0
− 0
View file @ 4f58f99b
No preview for this file type
VECTOTrailer/Views/ComponentViews/Declaration/CompleteTrailerView.xaml
+ 65
− 65
View file @ 4f58f99b
......@@ -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" />
......@@ -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>
......@@ -320,9 +320,9 @@
<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" >
......
VECTOTrailer/Views/JoblistTabView.xaml
+ 4
− 8
View file @ 4f58f99b
......@@ -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 @ 4f58f99b
......@@ -252,7 +252,7 @@
</DockPanel>
</GroupBox>
<GroupBox Header ="Settings">
<StackPanel>
<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}"-->
......@@ -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}">
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.7_Trailer/AerodynamicDevice_sample.xml
+ 4
− 1
View file @ 4f58f99b
......@@ -14,7 +14,10 @@ xmlns:v2.7="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.7" xmlns:tns="
<CertifiedAerodynamicReduction3>2.00</CertifiedAerodynamicReduction3>
<CertifiedAerodynamicReduction6>3.00</CertifiedAerodynamicReduction6>
<CertifiedAerodynamicReduction9>4.00</CertifiedAerodynamicReduction9>
<ApplicableVehicleGroups>
<ApplicableVehicleGroup>1123</ApplicableVehicleGroup>
<ApplicableVehicleGroup>2356</ApplicableVehicleGroup>
</ApplicableVehicleGroups>
</Data>
<Signature>
<di:Reference URI="#AERO-asdf">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

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