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 5aed5cd6 authored by Martin Dippold's avatar Martin Dippold
Browse files

* New version number 

  * Bugfix for direct start option (now the VECTO input files ca be created)
  * Correction version number (now the version number is generated over the assambly number)
parent 99260cac
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
CHANGES.md
+ 7
− 0
View file @ 5aed5cd6
VECTO-AirDrag: Changes
===================
#### 2017-10-04: v3.1.1 ####
TUG improvements:
* New version number
* Bugfix for direct start option (now the VECTO input files ca be created)
* Correction version number (now the version number is generated over the assambly number)
#### 2017-07-14: v3.1.0 ####
TUG improvements:
......
CSE/Calculation/Signal_identification.vb
+ 14
− 4
View file @ 5aed5cd6
......@@ -931,17 +931,27 @@ Module Signal_identification
If i > 0 And i < CalcData(tCompCali.SecID).Count - 1 Then
If CalcData(tCompCali.SecID)(i - 1) <> CalcData(tCompCali.SecID)(i) Then
' First value
If (CalcData(tCompCali.dist_root)(i + 1) - CalcData(tCompCali.dist_root)(i)) = 0 Then
CalcData(tCompCali.slope_deg)(i) = 0
logme(8, False, "Standstill or loss of vehicle speed signal inside MS (at line " & i & ")! Gradient set to 0")
Else
CalcData(tCompCali.slope_deg)(i) = (Math.Atan((CalcData(tCompCali.alt)(i + 1) - CalcData(tCompCali.alt)(i)) / (CalcData(tCompCali.dist_root)(i + 1) - CalcData(tCompCali.dist_root)(i)))) * 180 / Math.PI
End If
'CalcData(tCompCali.slope_deg)(i) = (Math.Atan((CalcData(tCompCali.alt)(i + 1) - CalcData(tCompCali.alt)(i)) / (CalcData(tCompCali.dist_root)(i + 1) - CalcData(tCompCali.dist_root)(i)))) * 180 / Math.PI
ElseIf CalcData(tCompCali.SecID)(i + 1) <> CalcData(tCompCali.SecID)(i) Then
' Last value
If (CalcData(tCompCali.dist_root)(i) - CalcData(tCompCali.dist_root)(i - 1)) = 0 Then
CalcData(tCompCali.slope_deg)(i) = 0
logme(8, False, "Standstill or loss of vehicle speed signal inside MS (at line " & i & ")! Gradient set to 0")
Else
CalcData(tCompCali.slope_deg)(i) = (Math.Atan((CalcData(tCompCali.alt)(i) - CalcData(tCompCali.alt)(i - 1)) / (CalcData(tCompCali.dist_root)(i) - CalcData(tCompCali.dist_root)(i - 1)))) * 180 / Math.PI
End If
'CalcData(tCompCali.slope_deg)(i) = (Math.Atan((CalcData(tCompCali.alt)(i) - CalcData(tCompCali.alt)(i - 1)) / (CalcData(tCompCali.dist_root)(i) - CalcData(tCompCali.dist_root)(i - 1)))) * 180 / Math.PI
ElseIf CalcData(tCompCali.SecID)(i - 1) = CalcData(tCompCali.SecID)(i) And CalcData(tCompCali.SecID)(i + 1) = CalcData(tCompCali.SecID)(i) Then
' All other values inside MS
If (CalcData(tCompCali.dist_root)(i + 1) - CalcData(tCompCali.dist_root)(i - 1)) = 0 Then
CalcData(tCompCali.slope_deg)(i) = 0
logme(8, False, "Standstill or loss of vehicle speed signal inside MS (at line " & i & ")! Gradient set to 0")
'BWorker.CancelAsync()
' XXXX: What is absolutely neccessary to run afterwards, and cannot return immediately here??
Else
CalcData(tCompCali.slope_deg)(i) = (Math.Atan((CalcData(tCompCali.alt)(i + 1) - CalcData(tCompCali.alt)(i - 1)) / (CalcData(tCompCali.dist_root)(i + 1) - CalcData(tCompCali.dist_root)(i - 1)))) * 180 / Math.PI
End If
......
CSE/GUI/F_About.Designer.vb
+ 7
− 7
View file @ 5aed5cd6
......@@ -55,7 +55,7 @@ Partial Class F_About
Me.Label1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label1.Location = New System.Drawing.Point(27, 431)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(179, 13)
Me.Label1.Size = New System.Drawing.Size(178, 13)
Me.Label1.TabIndex = 2
Me.Label1.Text = "Graz University of Technology"
'
......@@ -126,9 +126,9 @@ Partial Class F_About
Me.Label8.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label8.Location = New System.Drawing.Point(27, 167)
Me.Label8.Name = "Label8"
Me.Label8.Size = New System.Drawing.Size(158, 65)
Me.Label8.Size = New System.Drawing.Size(157, 65)
Me.Label8.TabIndex = 3
Me.Label8.Text = "European Commission" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "DG CLIMA" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "and" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Joint Research Centre" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Sustainable Transport " & _
Me.Label8.Text = "European Commission" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "DG CLIMA" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "and" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Joint Research Centre" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Sustainable Transport " &
"Unit" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
'
'PictureBoxJRC
......@@ -167,7 +167,7 @@ Partial Class F_About
Me.Label4.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label4.Location = New System.Drawing.Point(12, 269)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(124, 13)
Me.Label4.Size = New System.Drawing.Size(123, 13)
Me.Label4.TabIndex = 8
Me.Label4.Text = "Georgios FONTARAS"
'
......@@ -217,10 +217,10 @@ Partial Class F_About
Me.LinkLabel1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LinkLabel1.Location = New System.Drawing.Point(11, 327)
Me.LinkLabel1.Name = "LinkLabel1"
Me.LinkLabel1.Size = New System.Drawing.Size(142, 13)
Me.LinkLabel1.Size = New System.Drawing.Size(143, 13)
Me.LinkLabel1.TabIndex = 19
Me.LinkLabel1.TabStop = True
Me.LinkLabel1.Text = "vecto@jrc.ec.europa.eu"
Me.LinkLabel1.Text = "jrc-vecto@ec.europa.eu"
'
'Label6
'
......@@ -268,7 +268,7 @@ Partial Class F_About
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(464, 557)
Me.ClientSize = New System.Drawing.Size(464, 552)
Me.Controls.Add(Me.LVersion)
Me.Controls.Add(Me.LinkLicensed)
Me.Controls.Add(Me.Label13)
......
CSE/GUI/F_Main.vb
+ 6
− 0
View file @ 5aed5cd6
......@@ -113,6 +113,12 @@ Public Class F_Main
Do While BWorker.IsBusy
Application.DoEvents()
Loop
' Write the VECTO output files
If SelMode = 1 Then
Me.ButtonGenVECTO.Enabled = True
F_VECTOInput.ShowDialog()
End If
Finally
' Close the form after calculation
Me.Close()
......
CSE/GUI/F_VECTOInput.Designer.vb
+ 3
− 0
View file @ 5aed5cd6
......@@ -166,6 +166,7 @@ Partial Class F_VECTOInput
'
'ButtonCancel
'
Me.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
Me.ButtonCancel.Location = New System.Drawing.Point(247, 181)
Me.ButtonCancel.Name = "ButtonCancel"
Me.ButtonCancel.Size = New System.Drawing.Size(75, 23)
......@@ -184,8 +185,10 @@ Partial Class F_VECTOInput
'
'F_VECTOInput
'
Me.AcceptButton = Me.ButtonOK
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButtonCancel
Me.ClientSize = New System.Drawing.Size(334, 216)
Me.Controls.Add(Me.ButtonOK)
Me.Controls.Add(Me.ButtonCancel)
......
CSE/IO/DirectStart.vb
+ 5
− 1
View file @ 5aed5cd6
......@@ -7,7 +7,11 @@
' Use the command lines to start the calculation
If Environment.GetCommandLineArgs().Length > 1 Then
JobFile = Environment.GetCommandLineArgs(1)
If Environment.GetCommandLineArgs().Length >= 3 Then OutFolder = Environment.GetCommandLineArgs(2)
If Environment.GetCommandLineArgs().Length >= 3 Then
OutFolder = Environment.GetCommandLineArgs(2)
Else
OutFolder = joinPaths(fPath(JobFile), "Results\")
End If
Return True
Else
Return False
......
CSE/My Project/AssemblyInfo.vb
+ 2
− 2
View file @ 5aed5cd6
......@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.0.0")>
<Assembly: AssemblyFileVersion("3.1.0.0")>
<Assembly: AssemblyVersion("3.1.1.0")>
<Assembly: AssemblyFileVersion("3.1.1.0")>
CSE/declaration_public.vb
+ 1
− 1
View file @ 5aed5cd6
......@@ -13,7 +13,7 @@ Module declaration_public
' Description of the form
Public Const AppName As String = "Air Drag" ' Name of the programm
Public Const AppVers As String = "3.1.0" ' Version of the Programm
Public AppVers As String = Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() '"3.1.0" ' Version of the Programm
Public AppDate As String ' Date of the compilation of the programm
' Control variables
......
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