Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into develop

HashingCmd/Program.cs

-using System;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -39,7 +70,7 @@ hashingcmd.exe
 
 		static Dictionary<string, HashingAction> actions = new Dictionary<string, HashingAction>();
 
-		static bool _validateXML = false;
+		static bool _validateXML;
 		private static bool xmlValid = true;
 
 		static int Main(string[] args)

HashingCmd/Properties/AssemblyInfo.cs

-using System.Reflection;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

HashingCmd/Properties/Version.cs

@@ -11,7 +11,7 @@
 * by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use VECTO except in compliance with the Licence.
 * You may obtain a copy of the Licence at:
-*	
+*
 * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
 *
 * Unless required by applicable law or agreed to in writing, VECTO

HashingTool/App.xaml.cs

-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
 
 namespace HashingTool
 {
 	/// <summary>
 	/// Interaction logic for App.xaml
 	/// </summary>
-	public partial class App : Application
+	public partial class App
 	{
 	}
 }

HashingTool/MainWindow.xaml.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
 
 namespace HashingTool
 {
 	/// <summary>
 	/// Interaction logic for MainWindow.xaml
 	/// </summary>
-	public partial class MainWindow : Window
+	public partial class MainWindow
 	{
 		public MainWindow()
 		{
 			InitializeComponent();
 		}
 	}
-}
+}
\ No newline at end of file

HashingTool/Properties/AssemblyInfo.cs

-using System.Reflection;
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

HashingTool/Properties/Resources.Designer.cs

-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
 
 namespace HashingTool.Properties
 {

HashingTool/Properties/Settings.Designer.cs

-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
 
 namespace HashingTool.Properties
 {

HashingTool/Properties/Version.cs

@@ -11,7 +11,7 @@
 * by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use VECTO except in compliance with the Licence.
 * You may obtain a copy of the Licence at:
-*	
+*
 * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
 *
 * Unless required by applicable law or agreed to in writing, VECTO

VECTO.sln.DotSettings

@@ -24,6 +24,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AT/@EntryIndexedValue">AT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CSV/@EntryIndexedValue">CSV</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HVAC/@EntryIndexedValue">HVAC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JSON/@EntryIndexedValue">JSON</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MT/@EntryIndexedValue">MT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PT/@EntryIndexedValue">PT</s:String>
@@ -32,6 +33,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SI/@EntryIndexedValue">SI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WHTC/@EntryIndexedValue">WHTC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XML/@EntryIndexedValue">XML</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XSD/@EntryIndexedValue">XSD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>

VECTO/ApplicationEvents.vb

@@ -112,12 +112,6 @@ Namespace My
 
 			'Restart log if log file too large
 			LogFile.SizeCheck()
-
-
-			'License initialization
-			Lic = New vectolic.cLicense
-			Lic.AppVersion = "2.2"	 'VECTOvers
-			Lic.FilePath = MyAppPath & "license.dat"
 		End Sub
 
 		Private Sub MyApplication_UnhandledException(ByVal sender As Object,

VECTO/Configuration.vb

@@ -91,7 +91,6 @@ Public Class Configuration
 	Public Sub Save()
 
 		Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
-		header.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")")
 		header.Add("Date", Now.ToUniversalTime().ToString("o"))
 		header.Add("AppVersion", VECTOvers)
 		header.Add("FileVersion", FormatVersion)

VECTO/GUI/AboutBox.Designer.vb

@@ -36,59 +36,23 @@ Partial Class AboutBox
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-		Me.Label10 = New System.Windows.Forms.Label()
-		Me.LabelLic = New System.Windows.Forms.Label()
-		Me.LabelLicDate = New System.Windows.Forms.Label()
 		Me.Label2 = New System.Windows.Forms.Label()
 		Me.Label8 = New System.Windows.Forms.Label()
-		Me.Panel1 = New System.Windows.Forms.Panel()
 		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
 		Me.Label1 = New System.Windows.Forms.Label()
 		Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
 		Me.LinkLabel2 = New System.Windows.Forms.LinkLabel()
 		Me.Label3 = New System.Windows.Forms.Label()
 		Me.PictureBoxJRC = New System.Windows.Forms.PictureBox()
-		Me.Panel1.SuspendLayout()
 		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
 		CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).BeginInit()
 		Me.SuspendLayout()
 		'
-		'Label10
-		'
-		Me.Label10.AutoSize = True
-		Me.Label10.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-		Me.Label10.Location = New System.Drawing.Point(9, 250)
-		Me.Label10.Name = "Label10"
-		Me.Label10.Size = New System.Drawing.Size(75, 13)
-		Me.Label10.TabIndex = 11
-		Me.Label10.Text = "License file:"
-		'
-		'LabelLic
-		'
-		Me.LabelLic.AutoSize = True
-		Me.LabelLic.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-		Me.LabelLic.Location = New System.Drawing.Point(3, 0)
-		Me.LabelLic.Name = "LabelLic"
-		Me.LabelLic.Size = New System.Drawing.Size(22, 13)
-		Me.LabelLic.TabIndex = 12
-		Me.LabelLic.Text = "Lic"
-		'
-		'LabelLicDate
-		'
-		Me.LabelLicDate.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.LabelLicDate.AutoSize = True
-		Me.LabelLicDate.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-		Me.LabelLicDate.Location = New System.Drawing.Point(3, 26)
-		Me.LabelLicDate.Name = "LabelLicDate"
-		Me.LabelLicDate.Size = New System.Drawing.Size(12, 13)
-		Me.LabelLicDate.TabIndex = 13
-		Me.LabelLicDate.Text = "-"
-		'
 		'Label2
 		'
 		Me.Label2.AutoSize = True
 		Me.Label2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-		Me.Label2.Location = New System.Drawing.Point(9, 346)
+		Me.Label2.Location = New System.Drawing.Point(12, 241)
 		Me.Label2.Name = "Label2"
 		Me.Label2.Size = New System.Drawing.Size(162, 13)
 		Me.Label2.TabIndex = 7
@@ -98,22 +62,12 @@ Partial Class AboutBox
 		'
 		Me.Label8.AutoSize = True
 		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(24, 368)
+		Me.Label8.Location = New System.Drawing.Point(27, 263)
 		Me.Label8.Name = "Label8"
 		Me.Label8.Size = New System.Drawing.Size(158, 39)
 		Me.Label8.TabIndex = 3
 		Me.Label8.Text = "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) & "European Commission"
 		'
-		'Panel1
-		'
-		Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-		Me.Panel1.Controls.Add(Me.LabelLic)
-		Me.Panel1.Controls.Add(Me.LabelLicDate)
-		Me.Panel1.Location = New System.Drawing.Point(12, 266)
-		Me.Panel1.Name = "Panel1"
-		Me.Panel1.Size = New System.Drawing.Size(464, 52)
-		Me.Panel1.TabIndex = 16
-		'
 		'PictureBox1
 		'
 		Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_About
@@ -127,7 +81,7 @@ Partial Class AboutBox
 		'
 		Me.Label1.AutoSize = True
 		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(9, 436)
+		Me.Label1.Location = New System.Drawing.Point(12, 331)
 		Me.Label1.Name = "Label1"
 		Me.Label1.Size = New System.Drawing.Size(105, 13)
 		Me.Label1.TabIndex = 7
@@ -136,7 +90,7 @@ Partial Class AboutBox
 		'LinkLabel1
 		'
 		Me.LinkLabel1.AutoSize = True
-		Me.LinkLabel1.Location = New System.Drawing.Point(120, 436)
+		Me.LinkLabel1.Location = New System.Drawing.Point(123, 331)
 		Me.LinkLabel1.Name = "LinkLabel1"
 		Me.LinkLabel1.Size = New System.Drawing.Size(122, 13)
 		Me.LinkLabel1.TabIndex = 17
@@ -168,7 +122,7 @@ Partial Class AboutBox
 		'
 		Me.PictureBoxJRC.Cursor = System.Windows.Forms.Cursors.Hand
 		Me.PictureBoxJRC.Image = Global.TUGraz.VECTO.My.Resources.Resources.JRC_About
-		Me.PictureBoxJRC.Location = New System.Drawing.Point(216, 353)
+		Me.PictureBoxJRC.Location = New System.Drawing.Point(219, 248)
 		Me.PictureBoxJRC.Name = "PictureBoxJRC"
 		Me.PictureBoxJRC.Size = New System.Drawing.Size(260, 54)
 		Me.PictureBoxJRC.TabIndex = 15
@@ -177,14 +131,12 @@ Partial Class AboutBox
 		'AboutBox
 		'
 		Me.BackColor = System.Drawing.Color.White
-		Me.ClientSize = New System.Drawing.Size(491, 474)
+		Me.ClientSize = New System.Drawing.Size(491, 356)
 		Me.Controls.Add(Me.Label3)
 		Me.Controls.Add(Me.LinkLabel2)
 		Me.Controls.Add(Me.LinkLabel1)
-		Me.Controls.Add(Me.Panel1)
 		Me.Controls.Add(Me.PictureBoxJRC)
 		Me.Controls.Add(Me.PictureBox1)
-		Me.Controls.Add(Me.Label10)
 		Me.Controls.Add(Me.Label1)
 		Me.Controls.Add(Me.Label2)
 		Me.Controls.Add(Me.Label8)
@@ -192,21 +144,15 @@ Partial Class AboutBox
 		Me.Name = "AboutBox"
 		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "About VECTO"
-		Me.Panel1.ResumeLayout(False)
-		Me.Panel1.PerformLayout()
 		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
 		CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).EndInit()
 		Me.ResumeLayout(False)
 		Me.PerformLayout()
 
 	End Sub
-	Friend WithEvents Label10 As Label
-	Friend WithEvents LabelLic As Label
-	Friend WithEvents LabelLicDate As Label
 	Friend WithEvents PictureBox1 As PictureBox
 	Friend WithEvents Label2 As Label
 	Friend WithEvents Label8 As Label
-	Friend WithEvents Panel1 As Panel
 	Friend WithEvents Label1 As Label
 	Friend WithEvents LinkLabel1 As LinkLabel
 	Friend WithEvents LinkLabel2 As LinkLabel

VECTO/GUI/AboutBox.vb

@@ -18,8 +18,6 @@ Public Class AboutBox
 	'Initialize
 	Private Sub F10_AboutBox_Load(ByVal sender As Object, ByVal e As EventArgs) Handles MyBase.Load
 		Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers
-		LabelLic.Text = Lic.LicString
-		LabelLicDate.Text = "Expiring date (y/m/d):   " & Lic.ExpTime
 	End Sub
 
 	'e-mail links----------------------------------------------------------------

VECTO/GUI/EngineForm.Designer.vb

@@ -72,6 +72,10 @@ Partial Class EngineForm
 		Me.PnInertia = New System.Windows.Forms.Panel()
 		Me.GrWHTC = New System.Windows.Forms.GroupBox()
 		Me.PnWhtcDeclaration = New System.Windows.Forms.Panel()
+		Me.Label20 = New System.Windows.Forms.Label()
+		Me.tbRegPerCorrFactor = New System.Windows.Forms.TextBox()
+		Me.Label19 = New System.Windows.Forms.Label()
+		Me.tbNCVCorrFactor = New System.Windows.Forms.TextBox()
 		Me.lblColdHotFactor = New System.Windows.Forms.Label()
 		Me.TbColdHotFactor = New System.Windows.Forms.TextBox()
 		Me.BtWHTCimport = New System.Windows.Forms.Button()
@@ -101,10 +105,6 @@ Partial Class EngineForm
 		Me.Label17 = New System.Windows.Forms.Label()
 		Me.Label18 = New System.Windows.Forms.Label()
 		Me.cbFuelType = New System.Windows.Forms.ComboBox()
-		Me.Label19 = New System.Windows.Forms.Label()
-		Me.tbNCVCorrFactor = New System.Windows.Forms.TextBox()
-		Me.Label20 = New System.Windows.Forms.Label()
-		Me.tbRegPerCorrFactor = New System.Windows.Forms.TextBox()
 		Me.ToolStrip1.SuspendLayout()
 		Me.StatusStrip1.SuspendLayout()
 		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -429,6 +429,38 @@ Partial Class EngineForm
 		Me.PnWhtcDeclaration.Size = New System.Drawing.Size(472, 95)
 		Me.PnWhtcDeclaration.TabIndex = 8
 		'
+		'Label20
+		'
+		Me.Label20.AutoSize = True
+		Me.Label20.Location = New System.Drawing.Point(99, 76)
+		Me.Label20.Name = "Label20"
+		Me.Label20.Size = New System.Drawing.Size(89, 13)
+		Me.Label20.TabIndex = 9
+		Me.Label20.Text = "Reg. Per. Corr. F."
+		'
+		'tbRegPerCorrFactor
+		'
+		Me.tbRegPerCorrFactor.Location = New System.Drawing.Point(194, 73)
+		Me.tbRegPerCorrFactor.Name = "tbRegPerCorrFactor"
+		Me.tbRegPerCorrFactor.Size = New System.Drawing.Size(57, 20)
+		Me.tbRegPerCorrFactor.TabIndex = 10
+		'
+		'Label19
+		'
+		Me.Label19.AutoSize = True
+		Me.Label19.Location = New System.Drawing.Point(274, 53)
+		Me.Label19.Name = "Label19"
+		Me.Label19.Size = New System.Drawing.Size(66, 13)
+		Me.Label19.TabIndex = 7
+		Me.Label19.Text = "NCV Corr. F."
+		'
+		'tbNCVCorrFactor
+		'
+		Me.tbNCVCorrFactor.Location = New System.Drawing.Point(343, 50)
+		Me.tbNCVCorrFactor.Name = "tbNCVCorrFactor"
+		Me.tbNCVCorrFactor.Size = New System.Drawing.Size(57, 20)
+		Me.tbNCVCorrFactor.TabIndex = 8
+		'
 		'lblColdHotFactor
 		'
 		Me.lblColdHotFactor.AutoSize = True
@@ -675,38 +707,6 @@ Partial Class EngineForm
 		Me.cbFuelType.Size = New System.Drawing.Size(143, 21)
 		Me.cbFuelType.TabIndex = 51
 		'
-		'Label19
-		'
-		Me.Label19.AutoSize = True
-		Me.Label19.Location = New System.Drawing.Point(274, 53)
-		Me.Label19.Name = "Label19"
-		Me.Label19.Size = New System.Drawing.Size(66, 13)
-		Me.Label19.TabIndex = 7
-		Me.Label19.Text = "NCV Corr. F."
-		'
-		'tbNCVCorrFactor
-		'
-		Me.tbNCVCorrFactor.Location = New System.Drawing.Point(343, 50)
-		Me.tbNCVCorrFactor.Name = "tbNCVCorrFactor"
-		Me.tbNCVCorrFactor.Size = New System.Drawing.Size(57, 20)
-		Me.tbNCVCorrFactor.TabIndex = 8
-		'
-		'Label20
-		'
-		Me.Label20.AutoSize = True
-		Me.Label20.Location = New System.Drawing.Point(99, 76)
-		Me.Label20.Name = "Label20"
-		Me.Label20.Size = New System.Drawing.Size(89, 13)
-		Me.Label20.TabIndex = 9
-		Me.Label20.Text = "Reg. Per. Corr. F."
-		'
-		'tbRegPerCorrFactor
-		'
-		Me.tbRegPerCorrFactor.Location = New System.Drawing.Point(194, 73)
-		Me.tbRegPerCorrFactor.Name = "tbRegPerCorrFactor"
-		Me.tbRegPerCorrFactor.Size = New System.Drawing.Size(57, 20)
-		Me.tbRegPerCorrFactor.TabIndex = 10
-		'
 		'EngineForm
 		'
 		Me.AcceptButton = Me.ButOK

VECTO/GUI/EngineForm.vb

@@ -385,7 +385,7 @@ Public Class EngineForm
 	End Sub
 
 	Private Sub UpdatePic()
-		Dim fullLoadCurve As FullLoadCurve = Nothing
+		Dim fullLoadCurve As EngineFullLoadCurve = Nothing
 		Dim fcMap As FuelConsumptionMap = Nothing
 
 
@@ -397,7 +397,7 @@ Public Class EngineForm
 			Dim fldFile As String =
 					If(Not String.IsNullOrWhiteSpace(_engFile), Path.Combine(Path.GetDirectoryName(_engFile), TbFLD.Text), TbFLD.Text)
 			If File.Exists(fldFile) Then _
-				fullLoadCurve = FullLoadCurveReader.Create(VectoCSVFile.Read(fldFile), engineFld:=True)
+				fullLoadCurve = FullLoadCurveReader.Create(VectoCSVFile.Read(fldFile))
 		Catch ex As Exception
 		End Try
 

VECTO/GUI/FileSignDialog.Designer.vb

-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports System.ComponentModel
-Imports Microsoft.VisualBasic.CompilerServices
-
-<DesignerGenerated()> _
-Partial Class FileSignDialog
-	Inherits Form
-
-	'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-	<DebuggerNonUserCode()> _
-	Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-		Try
-			If disposing AndAlso components IsNot Nothing Then
-				components.Dispose()
-			End If
-		Finally
-			MyBase.Dispose(disposing)
-		End Try
-	End Sub
-
-	'Wird vom Windows Form-Designer benötigt.
-	Private components As IContainer
-
-	'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-	'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-	<DebuggerStepThrough()> _
-	Private Sub InitializeComponent()
-		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FileSignDialog))
-		Me.TbSigFile = New System.Windows.Forms.TextBox()
-		Me.Label1 = New System.Windows.Forms.Label()
-		Me.BtBrowse = New System.Windows.Forms.Button()
-		Me.lvFiles = New System.Windows.Forms.ListView()
-		Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.BtSign = New System.Windows.Forms.Button()
-		Me.BtClose = New System.Windows.Forms.Button()
-		Me.BtRemFLD = New System.Windows.Forms.Button()
-		Me.BtAddFLD = New System.Windows.Forms.Button()
-		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-		Me.BtClearList = New System.Windows.Forms.Button()
-		Me.BtReload = New System.Windows.Forms.Button()
-		Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-		Me.LbStatus = New System.Windows.Forms.Label()
-		Me.LbMode = New System.Windows.Forms.Label()
-		Me.LbDateStr = New System.Windows.Forms.Label()
-		Me.TbPubKey = New System.Windows.Forms.TextBox()
-		Me.TbLicStr = New System.Windows.Forms.TextBox()
-		Me.Label5 = New System.Windows.Forms.Label()
-		Me.Label6 = New System.Windows.Forms.Label()
-		Me.Label3 = New System.Windows.Forms.Label()
-		Me.Label4 = New System.Windows.Forms.Label()
-		Me.Label2 = New System.Windows.Forms.Label()
-		Me.GroupBox1.SuspendLayout()
-		Me.GroupBox2.SuspendLayout()
-		Me.SuspendLayout()
-		'
-		'TbSigFile
-		'
-		Me.TbSigFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbSigFile.Location = New System.Drawing.Point(12, 29)
-		Me.TbSigFile.Name = "TbSigFile"
-		Me.TbSigFile.Size = New System.Drawing.Size(528, 20)
-		Me.TbSigFile.TabIndex = 0
-		'
-		'Label1
-		'
-		Me.Label1.AutoSize = True
-		Me.Label1.Location = New System.Drawing.Point(12, 13)
-		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New System.Drawing.Size(99, 13)
-		Me.Label1.TabIndex = 4
-		Me.Label1.Text = "Signature file (.vsig)"
-		'
-		'BtBrowse
-		'
-		Me.BtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-		Me.BtBrowse.Location = New System.Drawing.Point(541, 27)
-		Me.BtBrowse.Name = "BtBrowse"
-		Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.BtBrowse.TabIndex = 1
-		Me.BtBrowse.UseVisualStyleBackColor = True
-		'
-		'lvFiles
-		'
-		Me.lvFiles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-			Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.lvFiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2})
-		Me.lvFiles.FullRowSelect = True
-		Me.lvFiles.GridLines = True
-		Me.lvFiles.LabelEdit = True
-		Me.lvFiles.Location = New System.Drawing.Point(6, 19)
-		Me.lvFiles.MultiSelect = False
-		Me.lvFiles.Name = "lvFiles"
-		Me.lvFiles.Size = New System.Drawing.Size(565, 217)
-		Me.lvFiles.TabIndex = 0
-		Me.lvFiles.UseCompatibleStateImageBehavior = False
-		Me.lvFiles.View = System.Windows.Forms.View.Details
-		'
-		'ColumnHeader1
-		'
-		Me.ColumnHeader1.Text = "File"
-		Me.ColumnHeader1.Width = 408
-		'
-		'ColumnHeader2
-		'
-		Me.ColumnHeader2.Text = "Status"
-		Me.ColumnHeader2.Width = 141
-		'
-		'BtSign
-		'
-		Me.BtSign.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.BtSign.Location = New System.Drawing.Point(12, 487)
-		Me.BtSign.Name = "BtSign"
-		Me.BtSign.Size = New System.Drawing.Size(126, 23)
-		Me.BtSign.TabIndex = 5
-		Me.BtSign.Text = "Create Signature File"
-		Me.BtSign.UseVisualStyleBackColor = True
-		'
-		'BtClose
-		'
-		Me.BtClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtClose.Location = New System.Drawing.Point(522, 487)
-		Me.BtClose.Name = "BtClose"
-		Me.BtClose.Size = New System.Drawing.Size(67, 23)
-		Me.BtClose.TabIndex = 6
-		Me.BtClose.Text = "Close"
-		Me.BtClose.UseVisualStyleBackColor = True
-		'
-		'BtRemFLD
-		'
-		Me.BtRemFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.BtRemFLD.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-		Me.BtRemFLD.Location = New System.Drawing.Point(29, 236)
-		Me.BtRemFLD.Name = "BtRemFLD"
-		Me.BtRemFLD.Size = New System.Drawing.Size(24, 24)
-		Me.BtRemFLD.TabIndex = 2
-		Me.BtRemFLD.UseVisualStyleBackColor = True
-		'
-		'BtAddFLD
-		'
-		Me.BtAddFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.BtAddFLD.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-		Me.BtAddFLD.Location = New System.Drawing.Point(5, 236)
-		Me.BtAddFLD.Name = "BtAddFLD"
-		Me.BtAddFLD.Size = New System.Drawing.Size(24, 24)
-		Me.BtAddFLD.TabIndex = 1
-		Me.BtAddFLD.UseVisualStyleBackColor = True
-		'
-		'GroupBox1
-		'
-		Me.GroupBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-			Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.GroupBox1.Controls.Add(Me.lvFiles)
-		Me.GroupBox1.Controls.Add(Me.BtClearList)
-		Me.GroupBox1.Controls.Add(Me.BtRemFLD)
-		Me.GroupBox1.Controls.Add(Me.BtAddFLD)
-		Me.GroupBox1.Location = New System.Drawing.Point(12, 210)
-		Me.GroupBox1.Name = "GroupBox1"
-		Me.GroupBox1.Size = New System.Drawing.Size(577, 271)
-		Me.GroupBox1.TabIndex = 4
-		Me.GroupBox1.TabStop = False
-		Me.GroupBox1.Text = "Files"
-		'
-		'BtClearList
-		'
-		Me.BtClearList.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.BtClearList.Location = New System.Drawing.Point(508, 236)
-		Me.BtClearList.Name = "BtClearList"
-		Me.BtClearList.Size = New System.Drawing.Size(63, 24)
-		Me.BtClearList.TabIndex = 3
-		Me.BtClearList.Text = "Clear List"
-		Me.BtClearList.UseVisualStyleBackColor = True
-		'
-		'BtReload
-		'
-		Me.BtReload.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtReload.Image = Global.TUGraz.VECTO.My.Resources.Resources.Refresh_icon
-		Me.BtReload.Location = New System.Drawing.Point(565, 27)
-		Me.BtReload.Name = "BtReload"
-		Me.BtReload.Size = New System.Drawing.Size(24, 24)
-		Me.BtReload.TabIndex = 2
-		Me.BtReload.UseVisualStyleBackColor = True
-		'
-		'GroupBox2
-		'
-		Me.GroupBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.GroupBox2.Controls.Add(Me.LbStatus)
-		Me.GroupBox2.Controls.Add(Me.LbMode)
-		Me.GroupBox2.Controls.Add(Me.LbDateStr)
-		Me.GroupBox2.Controls.Add(Me.TbPubKey)
-		Me.GroupBox2.Controls.Add(Me.TbLicStr)
-		Me.GroupBox2.Controls.Add(Me.Label5)
-		Me.GroupBox2.Controls.Add(Me.Label6)
-		Me.GroupBox2.Controls.Add(Me.Label3)
-		Me.GroupBox2.Controls.Add(Me.Label4)
-		Me.GroupBox2.Controls.Add(Me.Label2)
-		Me.GroupBox2.Location = New System.Drawing.Point(12, 55)
-		Me.GroupBox2.Name = "GroupBox2"
-		Me.GroupBox2.Size = New System.Drawing.Size(577, 149)
-		Me.GroupBox2.TabIndex = 3
-		Me.GroupBox2.TabStop = False
-		Me.GroupBox2.Text = "File Information"
-		'
-		'LbStatus
-		'
-		Me.LbStatus.AutoSize = True
-		Me.LbStatus.Location = New System.Drawing.Point(99, 116)
-		Me.LbStatus.Name = "LbStatus"
-		Me.LbStatus.Size = New System.Drawing.Size(0, 13)
-		Me.LbStatus.TabIndex = 4
-		'
-		'LbMode
-		'
-		Me.LbMode.AutoSize = True
-		Me.LbMode.Location = New System.Drawing.Point(99, 87)
-		Me.LbMode.Name = "LbMode"
-		Me.LbMode.Size = New System.Drawing.Size(0, 13)
-		Me.LbMode.TabIndex = 3
-		'
-		'LbDateStr
-		'
-		Me.LbDateStr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.LbDateStr.AutoSize = True
-		Me.LbDateStr.Location = New System.Drawing.Point(421, 87)
-		Me.LbDateStr.Name = "LbDateStr"
-		Me.LbDateStr.Size = New System.Drawing.Size(0, 13)
-		Me.LbDateStr.TabIndex = 2
-		'
-		'TbPubKey
-		'
-		Me.TbPubKey.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbPubKey.Location = New System.Drawing.Point(99, 48)
-		Me.TbPubKey.Name = "TbPubKey"
-		Me.TbPubKey.ReadOnly = True
-		Me.TbPubKey.Size = New System.Drawing.Size(472, 20)
-		Me.TbPubKey.TabIndex = 1
-		'
-		'TbLicStr
-		'
-		Me.TbLicStr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbLicStr.Location = New System.Drawing.Point(99, 22)
-		Me.TbLicStr.Name = "TbLicStr"
-		Me.TbLicStr.ReadOnly = True
-		Me.TbLicStr.Size = New System.Drawing.Size(472, 20)
-		Me.TbLicStr.TabIndex = 0
-		'
-		'Label5
-		'
-		Me.Label5.AutoSize = True
-		Me.Label5.Location = New System.Drawing.Point(33, 51)
-		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New System.Drawing.Size(60, 13)
-		Me.Label5.TabIndex = 0
-		Me.Label5.Text = "Public Key:"
-		'
-		'Label6
-		'
-		Me.Label6.AutoSize = True
-		Me.Label6.Location = New System.Drawing.Point(53, 116)
-		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New System.Drawing.Size(40, 13)
-		Me.Label6.TabIndex = 0
-		Me.Label6.Text = "Status:"
-		'
-		'Label3
-		'
-		Me.Label3.AutoSize = True
-		Me.Label3.Location = New System.Drawing.Point(56, 87)
-		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New System.Drawing.Size(37, 13)
-		Me.Label3.TabIndex = 0
-		Me.Label3.Text = "Mode:"
-		'
-		'Label4
-		'
-		Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.Label4.AutoSize = True
-		Me.Label4.Location = New System.Drawing.Point(340, 87)
-		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New System.Drawing.Size(75, 13)
-		Me.Label4.TabIndex = 0
-		Me.Label4.Text = "Creation Time:"
-		'
-		'Label2
-		'
-		Me.Label2.AutoSize = True
-		Me.Label2.Location = New System.Drawing.Point(12, 25)
-		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New System.Drawing.Size(81, 13)
-		Me.Label2.TabIndex = 0
-		Me.Label2.Text = "License Owner:"
-		'
-		'FileSignDialog
-		'
-		Me.ClientSize = New System.Drawing.Size(601, 522)
-		Me.Controls.Add(Me.GroupBox2)
-		Me.Controls.Add(Me.BtReload)
-		Me.Controls.Add(Me.GroupBox1)
-		Me.Controls.Add(Me.BtClose)
-		Me.Controls.Add(Me.BtSign)
-		Me.Controls.Add(Me.BtBrowse)
-		Me.Controls.Add(Me.Label1)
-		Me.Controls.Add(Me.TbSigFile)
-		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
-		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-		Me.MaximizeBox = False
-		Me.MinimizeBox = False
-		Me.MinimumSize = New System.Drawing.Size(480, 400)
-		Me.Name = "FileSignDialog"
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-		Me.Text = "Sign & Verify Files"
-		Me.GroupBox1.ResumeLayout(False)
-		Me.GroupBox2.ResumeLayout(False)
-		Me.GroupBox2.PerformLayout()
-		Me.ResumeLayout(False)
-		Me.PerformLayout()
-
-	End Sub
-	Friend WithEvents TbSigFile As TextBox
-	Friend WithEvents Label1 As Label
-	Friend WithEvents BtBrowse As Button
-	Friend WithEvents lvFiles As ListView
-	Friend WithEvents ColumnHeader1 As ColumnHeader
-	Friend WithEvents ColumnHeader2 As ColumnHeader
-	Friend WithEvents BtSign As Button
-	Friend WithEvents BtClose As Button
-	Friend WithEvents BtRemFLD As Button
-	Friend WithEvents BtAddFLD As Button
-	Friend WithEvents GroupBox1 As GroupBox
-	Friend WithEvents BtClearList As Button
-	Friend WithEvents BtReload As Button
-	Friend WithEvents GroupBox2 As GroupBox
-	Friend WithEvents Label3 As Label
-	Friend WithEvents Label4 As Label
-	Friend WithEvents Label2 As Label
-	Friend WithEvents LbMode As Label
-	Friend WithEvents LbDateStr As Label
-	Friend WithEvents TbPubKey As TextBox
-	Friend WithEvents TbLicStr As TextBox
-	Friend WithEvents Label5 As Label
-	Friend WithEvents LbStatus As Label
-	Friend WithEvents Label6 As Label
-
-End Class

VECTO/GUI/FileSignDialog.resx

-<?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">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAAZBAQEMwYGBjIAAAAVAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAA4zMzNxpaWl3dPT0/7R0dH+nZ2d4DExMXIAAAAJAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAdDQ0N/2dnZ/dzc3P/i4uL/5+fn/+vr6//Y2Nj+PT09ggAAAAMAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAEBAQsv7+/8NfX1//c3Nz/3t7e/+fn5//r6+v/7Ozs/8TExPcJCQknAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAMTExaMvLy//Z2dn/3Nzc/9zc3P/h4eH/6enp/+zs7P/r6+v/ODg4awAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEtLS327u7vrampqLWhoaFvb29v+39/f/+Li4v/r6+v/6urq/0pK
-        SnMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABLS0tmra2t9BQUFFsmJiZz1dXV/OTk5P/g4OD/5OTk/+jo
-        6P9sbGzHAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIiHs7Ozvetra3/xMTE/97e3v/k5OT/5ubm/+fn
-        5//g4OD/4uLi/2pqasMAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAACSkpJ22NjY/uHh4f/j4+P/5OTk/+Xl
-        5f/h4eH/xsbG/+bm5v/o6Oj/bm5uvwAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAL+/v1/Z2dnd3t7e/t7e
-        3vzJycn2uru6/9fY1//Y2dj/6enp/+rq6v9wcHC8AAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAc3NzAZGR
-        kRaNjY0Sf4B/Mn5+fnXDxMPq29vb/9zc3P/r6+v/7Ozs/3FxcbkAAAAdAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAQEBADoKCgsN3d3fze3t7/4OHg/+7u7v/u7u7/cnJytgAAABoAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAADc3NwK/v7+DxcXF1+Li4v/l5eX/8PDw//Hx8f9WVlaFAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC0tLTrn5+f/5+fn/+np6f/z8/P/gYGBogAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAmJiYKt7e3suTk5PXs7Oz/7e7t/39/
-        f50AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACoqKhc2tras9vb
-        27xeXl48//8AAOH/AADAfwAAgH8AAIB/AACwfwAAsD8AAIAfAADADwAA4AcAAP8DAAD/AQAA/4AAAP/g
-        AAD/4AAA//kAAA==
-</value>
-  </data>
-</root>
\ No newline at end of file

VECTO/GUI/FileSignDialog.vb

-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports System.IO
-Imports System.Windows.Forms
-Imports vectolic
-
-''' <summary>
-''' Create/Verify signature files (.vsig).
-''' </summary>
-''' <remarks></remarks>
-Public Class FileSignDialog
-	'Create signature file
-	Private Sub BtSign_Click(sender As Object, e As EventArgs) Handles BtSign.Click
-		Dim listViewItem As ListViewItem
-		Dim mainDirectory As String
-
-		If lvFiles.Items.Count = 0 Then
-			MsgBox("No files selected!", MsgBoxStyle.Critical)
-			Exit Sub
-		End If
-
-		If Trim(TbSigFile.Text) = "" Then
-			MsgBox("No signature file path defined!", MsgBoxStyle.Critical)
-			Exit Sub
-		End If
-
-		If File.Exists(TbSigFile.Text) Then
-			If MsgBox("Overwrite existing signature file?", MsgBoxStyle.YesNo) = MsgBoxResult.No Then Exit Sub
-		End If
-
-		ClearForm(False)
-
-
-		mainDirectory = GetPath(TbSigFile.Text)
-
-
-		Lic.FileSigning.NewFile()
-		Lic.FileSigning.Mode = cFileSigning.tMode.Manual
-
-
-		For Each listViewItem In lvFiles.Items
-			Lic.FileSigning.AddFile(FileRepl(listViewItem.SubItems(0).Text, mainDirectory))
-			listViewItem.SubItems(1).Text = ""
-			listViewItem.ForeColor = Color.Black
-		Next
-
-		If Lic.FileSigning.WriteSigFile(TbSigFile.Text, LicSigAppCode) Then
-			LbStatus.Text = "Signature file created successfully"
-			LbStatus.ForeColor = Color.DarkGreen
-		Else
-			LbStatus.Text = "Fail to create signature file! " & Lic.FileSigning.ErrorMsg
-			LbStatus.ForeColor = Color.Red
-		End If
-
-		TbLicStr.Text = Lic.FileSigning.CreatorLicStr
-		TbPubKey.Text = Lic.FileSigning.PubKey
-		LbMode.Text = Lic.FileSigning.ModeConv(Lic.FileSigning.Mode)
-		LbDateStr.Text = Lic.FileSigning.DateStr
-
-		If Lic.FileSigning.FilesOK.Count > 0 Then
-			For Each listViewItem In lvFiles.Items
-				listViewItem.SubItems(1).Text = Lic.FileSigning.FilesMsg(listViewItem.Index)
-				If Lic.FileSigning.FilesOK(listViewItem.Index) Then
-					listViewItem.ForeColor = Color.DarkGreen
-				Else
-					listViewItem.ForeColor = Color.Red
-					Exit For
-				End If
-			Next
-		End If
-	End Sub
-
-	'Verify existing signature file
-	Public Sub VerifySigFile()
-		Dim lv0 As ListViewItem
-		Dim i As Integer
-
-		If Not File.Exists(TbSigFile.Text) Then
-			MsgBox("Signature file not found!", MsgBoxStyle.Critical)
-			Exit Sub
-		End If
-
-		ClearForm(True)
-
-		If Lic.FileSigning.ReadSigFile(TbSigFile.Text, LicSigAppCode) Then
-			LbStatus.Text = "File signature verified"
-			LbStatus.ForeColor = Color.DarkGreen
-		Else
-			LbStatus.Text = "ERROR! " & Lic.FileSigning.ErrorMsg
-			LbStatus.ForeColor = Color.Red
-		End If
-
-		TbLicStr.Text = Lic.FileSigning.CreatorLicStr
-		TbPubKey.Text = Lic.FileSigning.PubKey
-		LbMode.Text = Lic.FileSigning.ModeConv(Lic.FileSigning.Mode)
-		If Lic.FileSigning.Mode = cFileSigning.tMode.Auto Then
-			LbMode.ForeColor = Color.DarkGreen
-		Else
-			LbMode.ForeColor = Color.Red
-		End If
-		LbDateStr.Text = Lic.FileSigning.DateStr
-
-		For i = 0 To Lic.FileSigning.FilesOK.Count - 1
-			lv0 = New ListViewItem(Lic.FileSigning.Files(i))
-			lv0.SubItems.Add(Lic.FileSigning.FilesMsg(i))
-			If Lic.FileSigning.FilesOK(i) Then
-				lv0.ForeColor = Color.DarkGreen
-			Else
-				lv0.ForeColor = Color.Red
-			End If
-			lvFiles.Items.Add(lv0)
-		Next
-	End Sub
-
-	'Clear form
-	Private Sub ClearForm(clearFileList As Boolean)
-		If ClearFileList Then lvFiles.Items.Clear()
-		TbLicStr.Text = ""
-		TbPubKey.Text = ""
-		LbMode.Text = ""
-		LbDateStr.Text = ""
-		LbStatus.Text = ""
-		LbMode.ForeColor = DefaultForeColor
-		LbMode.BackColor = DefaultBackColor
-		LbStatus.ForeColor = DefaultForeColor
-		LbStatus.BackColor = DefaultBackColor
-	End Sub
-
-
-#Region "GUI Controls"
-
-	Private Sub BtBrowse_Click(sender As Object, e As EventArgs) Handles BtBrowse.Click
-		Dim fb As New FileBrowser("sig", False, True)
-		fb.Extensions = New String() {"vsig"}
-
-		If fb.CustomDialog(TbSigFile.Text, False, False, FileBrowserFileExtensionMode.ForceExt, False, "vsig") Then
-			TbSigFile.Text = fb.Files(0)
-		End If
-
-		If File.Exists(TbSigFile.Text) Then
-			VerifySigFile()
-		End If
-	End Sub
-
-	Private Sub BtAddFLD_Click(sender As Object, e As EventArgs) Handles BtAddFLD.Click
-		AddFile()
-	End Sub
-
-	Private Sub BtRemFLD_Click(sender As Object, e As EventArgs) Handles BtRemFLD.Click
-		RemoveFile()
-	End Sub
-
-	Private Sub BtClose_Click(sender As Object, e As EventArgs) Handles BtClose.Click
-		Close()
-	End Sub
-
-	Private Sub BtClearList_Click(sender As Object, e As EventArgs) Handles BtClearList.Click
-		lvFiles.Items.Clear()
-	End Sub
-
-	Private Sub BtReload_Click(sender As Object, e As EventArgs) Handles BtReload.Click
-		VerifySigFile()
-	End Sub
-
-	Private Sub lvFiles_KeyDown(sender As Object, e As KeyEventArgs) Handles lvFiles.KeyDown
-		Select Case e.KeyCode
-			Case Keys.Delete, Keys.Back
-				RemoveFile()
-		End Select
-	End Sub
-
-#End Region
-
-	'Add File
-	Private Sub AddFile()
-		Dim lvi As ListViewItem
-		Dim fb As New FileBrowser("xxx", False, True)
-		Dim str As String
-
-		If fb.OpenDialog("", True) Then
-
-			For Each str In fb.Files
-
-				lvi = New ListViewItem(str)
-				lvi.SubItems.Add("")
-				lvi.ForeColor = Color.Black
-
-				lvFiles.Items.Add(lvi)
-				lvi.EnsureVisible()
-
-				lvFiles.Focus()
-
-			Next
-
-		End If
-	End Sub
-
-	'Remove File
-	Private Sub RemoveFile()
-		Dim i0 As Integer
-
-		If lvFiles.Items.Count = 0 Then Exit Sub
-
-		If lvFiles.SelectedItems.Count = 0 Then lvFiles.Items(lvFiles.Items.Count - 1).Selected = True
-
-		i0 = lvFiles.SelectedItems(0).Index
-
-		lvFiles.SelectedItems(0).Remove()
-
-		If i0 < lvFiles.Items.Count Then
-			lvFiles.Items(i0).Selected = True
-			lvFiles.Items(i0).EnsureVisible()
-		End If
-
-		lvFiles.Focus()
-	End Sub
-End Class

VECTO/GUI/GearboxForm.vb

@@ -808,7 +808,7 @@ Public Class GearboxForm
 			Dim vehicle As IVehicleEngineeringInputData = inputData.VehicleInputData
 			'inputData = TryCast(JSONInputDataFactory.ReadComponentData(vectoJob.PathEng(False)), IEngineeringInputDataProvider)
 			Dim engine As IEngineEngineeringInputData = inputData.EngineInputData
-			Dim engineFld As EngineFullLoadCurve = EngineFullLoadCurve.Create(engine.FullLoadCurve)
+			Dim engineFld As EngineFullLoadCurve = FullLoadCurveReader.Create(engine.FullLoadCurve)
 
 
 			s = New Series