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 0f58125d authored by Harald Martini's avatar Harald Martini
Browse files

added PTO-el to vehicle form

parent 1eeca8f9
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,8 @@ Public Module FileBrowserModule
public ManRXMLFileBrowser As FileBrowser
Public DrivingCycleFileBrowser As FileBrowser
Public PTODrivingCycleStandstillFileBrowser As FileBrowser
Public PTODrivingCycleDrivingFileBrowser As FileBrowser
Public PTODrivingCycleDrivingFileBrowser As FileBrowser
Public PTODrivingCycleElectricStandstillFileBrowser As FileBrowser
Public FuelConsumptionMapFileBrowser As FileBrowser
Public FullLoadCurveFileBrowser As FileBrowser
......
......@@ -130,6 +130,7 @@ Public Class MainForm
TransmissionLossMapFileBrowser = New FileBrowser("vtlm")
PtoLossMapFileBrowser = New FileBrowser("vptol")
PTODrivingCycleStandstillFileBrowser = New FileBrowser("vptoc")
PTODrivingCycleElectricStandstillFileBrowser = New FileBrowser("vptoel")
PTODrivingCycleDrivingFileBrowser = New FileBrowser("vptor")
TorqueConverterFileBrowser = New FileBrowser("vtcc")
TorqueConverterShiftPolygonFileBrowser = New FileBrowser("vgbs")
......
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
......
......@@ -133,6 +133,7 @@ Public Class VehicleForm
cbPTOType.DataSource = DeclarationData.PTOTransmission.GetTechnologies.Select(
Function(technology) New With {.Key = technology, .Value = technology}).ToList()
cbLegislativeClass.DataSource = EnumHelper.GetKeyValuePairs(Of LegislativeClass)(Function(t) t.GetLabel())
'cbLegislativeClass.DataSource = EnumHelper.GetValues(Of LegislativeClass).Cast(Of LegislativeClass?).Select( _
' Function(x) New With {.Key = x, .Value = x.GetLabel()}).ToList()
......@@ -1504,6 +1505,12 @@ Public Class VehicleForm
End If
End Sub
Private Sub btnPTOelCycle_Click(sender As Object, e As EventArgs) Handles btnPTOelCycle.Click
If PTODrivingCycleDrivingFileBrowser.OpenDialog(FileRepl(tbPTOElectricCycle.Text, GetPath(_vehFile))) Then
tbPTOElectricCycle.Text = GetFilenameWithoutDirectory(PTODrivingCycleDrivingFileBrowser.Files(0), GetPath(_vehFile))
End If
End Sub
Private Sub cbEmPos_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbEmPos.SelectedIndexChanged
gbRatiosPerGear.Enabled = PowertrainPosition.HybridP2_5.Equals(cbEmPos.SelectedValue)
Dim selectedValue = CbRtType.SelectedValue
......@@ -1730,18 +1737,18 @@ Public Class VehicleForm
Dim f = FileRepl(tbIHPCFilePath.Text, GetPath(_vehFile))
IHPCForm.JobDir = GetPath(_vehFile)
IHPCForm.AutoSendTo = Sub(file, vehicleForm)
If UCase(FileRepl(vehicleForm.tbIHPCFilePath.Text, JobDir)) <> UCase(file) Then _
vehicleForm.tbIHPCFilePath.Text = GetFilenameWithoutDirectory(file, JobDir)
VectoJobForm.UpdatePic()
End Sub
IHPCForm.AutoSendTo = Sub(file, vehicleForm)
If UCase(FileRepl(vehicleForm.tbIHPCFilePath.Text, JobDir)) <> UCase(file) Then _
vehicleForm.tbIHPCFilePath.Text = GetFilenameWithoutDirectory(file, JobDir)
VectoJobForm.UpdatePic()
End Sub
If Not Trim(f) = "" Then
If Not File.Exists(f) Then
MsgBox("File not found!")
Exit Sub
End If
End If
If Not Trim(f) = "" Then
If Not File.Exists(f) Then
MsgBox("File not found!")
Exit Sub
End If
End If
If Not IHPCForm.Visible Then
IHPCForm.ClearIHPC()
......@@ -1759,4 +1766,6 @@ Public Class VehicleForm
End Try
End If
End Sub
End Class
\ No newline at end of file
......@@ -8,7 +8,7 @@
<OptionStrict>On</OptionStrict>
<UseWindowsForms>true</UseWindowsForms>
<MyType>WindowsForms</MyType>
<TargetFrameworks>net45;net48;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(Configuration)' == 'Deploy'">net45;net48;net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(Configuration)' == 'MockupDeploy'">net45;net48;net6.0-windows</TargetFrameworks>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment