diff --git a/VECTO/GUI/F_ENG.Designer.vb b/VECTO/GUI/F_ENG.Designer.vb
index a3d5ec7295f232bcd61fa682de69dc8b53009e12..492631b8b5bb825f040fa12c47d5cabc0cb19976 100644
--- a/VECTO/GUI/F_ENG.Designer.vb
+++ b/VECTO/GUI/F_ENG.Designer.vb
@@ -1,37 +1,37 @@
-' 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.
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_ENG
- Inherits System.Windows.Forms.Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- <System.Diagnostics.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 System.ComponentModel.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.
- <System.Diagnostics.DebuggerStepThrough()> _
- Private Sub InitializeComponent()
+' 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.
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class F_ENG
+ Inherits System.Windows.Forms.Form
+
+ 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+ <System.Diagnostics.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 System.ComponentModel.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.
+ <System.Diagnostics.DebuggerStepThrough()> _
+ Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_ENG))
Me.TbNleerl = New System.Windows.Forms.TextBox()
@@ -68,6 +68,7 @@ Partial Class F_ENG
Me.BtMAPopen = New System.Windows.Forms.Button()
Me.PnInertia = New System.Windows.Forms.Panel()
Me.GrWHTC = New System.Windows.Forms.GroupBox()
+ Me.BtWHTCimport = New System.Windows.Forms.Button()
Me.Label13 = New System.Windows.Forms.Label()
Me.TbWHTCmw = New System.Windows.Forms.TextBox()
Me.TbWHTCrural = New System.Windows.Forms.TextBox()
@@ -372,6 +373,7 @@ Partial Class F_ENG
'
'GrWHTC
'
+ Me.GrWHTC.Controls.Add(Me.BtWHTCimport)
Me.GrWHTC.Controls.Add(Me.Label13)
Me.GrWHTC.Controls.Add(Me.TbWHTCmw)
Me.GrWHTC.Controls.Add(Me.TbWHTCrural)
@@ -387,6 +389,15 @@ Partial Class F_ENG
Me.GrWHTC.TabStop = False
Me.GrWHTC.Text = "WHTC Correction"
'
+ 'BtWHTCimport
+ '
+ Me.BtWHTCimport.Location = New System.Drawing.Point(305, 19)
+ Me.BtWHTCimport.Name = "BtWHTCimport"
+ Me.BtWHTCimport.Size = New System.Drawing.Size(170, 28)
+ Me.BtWHTCimport.TabIndex = 4
+ Me.BtWHTCimport.Text = "Import from VECTO-Engine"
+ Me.BtWHTCimport.UseVisualStyleBackColor = True
+ '
'Label13
'
Me.Label13.AutoSize = True
@@ -540,51 +551,52 @@ Partial Class F_ENG
Me.ResumeLayout(False)
Me.PerformLayout()
- End Sub
- Friend WithEvents TbNleerl As System.Windows.Forms.TextBox
- Friend WithEvents Label11 As System.Windows.Forms.Label
- Friend WithEvents TbInertia As System.Windows.Forms.TextBox
- Friend WithEvents Label41 As System.Windows.Forms.Label
- Friend WithEvents Label40 As System.Windows.Forms.Label
- Friend WithEvents Label5 As System.Windows.Forms.Label
- Friend WithEvents ButCancel As System.Windows.Forms.Button
- Friend WithEvents ButOK As System.Windows.Forms.Button
- Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
- Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
- Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton
- Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
- Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel
- Friend WithEvents Label1 As System.Windows.Forms.Label
- Friend WithEvents Label2 As System.Windows.Forms.Label
- Friend WithEvents TbDispl As System.Windows.Forms.TextBox
- Friend WithEvents TbName As System.Windows.Forms.TextBox
- Friend WithEvents Label3 As System.Windows.Forms.Label
- Friend WithEvents TbMAP As System.Windows.Forms.TextBox
- Friend WithEvents Label6 As System.Windows.Forms.Label
- Friend WithEvents BtMAP As System.Windows.Forms.Button
- Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
- Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
- Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
- Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
- Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents BtMAPopen As System.Windows.Forms.Button
- Friend WithEvents PnInertia As System.Windows.Forms.Panel
- Friend WithEvents GrWHTC As System.Windows.Forms.GroupBox
- Friend WithEvents TbWHTCmw As System.Windows.Forms.TextBox
- Friend WithEvents TbWHTCrural As System.Windows.Forms.TextBox
- Friend WithEvents TbWHTCurban As System.Windows.Forms.TextBox
- Friend WithEvents Label8 As System.Windows.Forms.Label
- Friend WithEvents Label7 As System.Windows.Forms.Label
- Friend WithEvents Label4 As System.Windows.Forms.Label
- Friend WithEvents PicBox As System.Windows.Forms.PictureBox
- Friend WithEvents Label13 As System.Windows.Forms.Label
- Friend WithEvents TbFLD As System.Windows.Forms.TextBox
- Friend WithEvents Label14 As System.Windows.Forms.Label
- Friend WithEvents BtFLD As System.Windows.Forms.Button
- Friend WithEvents BtFLDopen As System.Windows.Forms.Button
-End Class
+ End Sub
+ Friend WithEvents TbNleerl As System.Windows.Forms.TextBox
+ Friend WithEvents Label11 As System.Windows.Forms.Label
+ Friend WithEvents TbInertia As System.Windows.Forms.TextBox
+ Friend WithEvents Label41 As System.Windows.Forms.Label
+ Friend WithEvents Label40 As System.Windows.Forms.Label
+ Friend WithEvents Label5 As System.Windows.Forms.Label
+ Friend WithEvents ButCancel As System.Windows.Forms.Button
+ Friend WithEvents ButOK As System.Windows.Forms.Button
+ Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
+ Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
+ Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
+ Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton
+ Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton
+ Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
+ Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton
+ Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
+ Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel
+ Friend WithEvents Label1 As System.Windows.Forms.Label
+ Friend WithEvents Label2 As System.Windows.Forms.Label
+ Friend WithEvents TbDispl As System.Windows.Forms.TextBox
+ Friend WithEvents TbName As System.Windows.Forms.TextBox
+ Friend WithEvents Label3 As System.Windows.Forms.Label
+ Friend WithEvents TbMAP As System.Windows.Forms.TextBox
+ Friend WithEvents Label6 As System.Windows.Forms.Label
+ Friend WithEvents BtMAP As System.Windows.Forms.Button
+ Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
+ Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
+ Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
+ Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
+ Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents BtMAPopen As System.Windows.Forms.Button
+ Friend WithEvents PnInertia As System.Windows.Forms.Panel
+ Friend WithEvents GrWHTC As System.Windows.Forms.GroupBox
+ Friend WithEvents TbWHTCmw As System.Windows.Forms.TextBox
+ Friend WithEvents TbWHTCrural As System.Windows.Forms.TextBox
+ Friend WithEvents TbWHTCurban As System.Windows.Forms.TextBox
+ Friend WithEvents Label8 As System.Windows.Forms.Label
+ Friend WithEvents Label7 As System.Windows.Forms.Label
+ Friend WithEvents Label4 As System.Windows.Forms.Label
+ Friend WithEvents PicBox As System.Windows.Forms.PictureBox
+ Friend WithEvents Label13 As System.Windows.Forms.Label
+ Friend WithEvents TbFLD As System.Windows.Forms.TextBox
+ Friend WithEvents Label14 As System.Windows.Forms.Label
+ Friend WithEvents BtFLD As System.Windows.Forms.Button
+ Friend WithEvents BtFLDopen As System.Windows.Forms.Button
+ Friend WithEvents BtWHTCimport As System.Windows.Forms.Button
+End Class
diff --git a/VECTO/GUI/F_ENG.vb b/VECTO/GUI/F_ENG.vb
index b7017cee13b7a7f44346686333112b0502b64494..2292e878cd2dc36c7db25b579f07dfebd90cc485 100644
--- a/VECTO/GUI/F_ENG.vb
+++ b/VECTO/GUI/F_ENG.vb
@@ -1,3 +1,4 @@
+Imports System.Xml.Linq
' Copyright 2014 European Union.
' Licensed under the EUPL (the 'Licence');
'
@@ -507,4 +508,25 @@ Public Class F_ENG
End If
End Sub
+
+ Private Sub BtWHTCimport_Click(sender As Object, e As EventArgs) Handles BtWHTCimport.Click
+ Dim xml As XDocument
+
+ Dim dlog As New cFileBrowser("XML", False, True)
+ dlog.Extensions = New String() {"xml"}
+
+ If Not dlog.OpenDialog("") Then Exit Sub
+
+ Try
+ xml = XDocument.Load(dlog.Files(0))
+
+ Me.TbWHTCurban.Text = xml.<VECTO-Engine-TransferFile>.<WHTCCorrectionFactors>.<Urban>.Value
+ Me.TbWHTCrural.Text = xml.<VECTO-Engine-TransferFile>.<WHTCCorrectionFactors>.<Rural>.Value
+ Me.TbWHTCmw.Text = xml.<VECTO-Engine-TransferFile>.<WHTCCorrectionFactors>.<Motorway>.Value
+
+ Catch ex As Exception
+ MsgBox("Failed to load file! " & ex.Message, MsgBoxStyle.Critical)
+ End Try
+
+ End Sub
End Class
diff --git a/VECTO/My Project/Application.Designer.vb b/VECTO/My Project/Application.Designer.vb
index ed8fef65ff34f4dafeb0298fd6e71a265acb1b77..68a7fb9f517905e6e8cd26de6bbac9c8bed9807a 100644
--- a/VECTO/My Project/Application.Designer.vb
+++ b/VECTO/My Project/Application.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.269
+' Laufzeitversion:4.0.30319.34209
'
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
' der Code erneut generiert wird.
diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb
index ed73f1dbe9488d6f4f2bb58dd9591799fd7f71c0..630bdb31f2c8d3c858cb0e94d402921698388961 100644
--- a/VECTO/My Project/Resources.Designer.vb
+++ b/VECTO/My Project/Resources.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.18444
+' Laufzeitversion:4.0.30319.34209
'
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
' der Code erneut generiert wird.
diff --git a/VECTO/My Project/Settings.Designer.vb b/VECTO/My Project/Settings.Designer.vb
index 8749ac9e93badb44abe2d0e083c2c98abff64128..f7968ba2e15cf3104390931aeba5a5699b213dac 100644
--- a/VECTO/My Project/Settings.Designer.vb
+++ b/VECTO/My Project/Settings.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.269
+' Laufzeitversion:4.0.30319.34209
'
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
' der Code erneut generiert wird.
@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0"), _
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 68e1b733ebc54ddd7f9b349b7f68636296ea0150..550ea9bba742828c63d643333457f8fa9f631cc8 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -12,7 +12,7 @@
<AssemblyName>VECTO</AssemblyName>
<MyType>WindowsForms</MyType>
<ApplicationIcon>Resources\Icon2.ico</ApplicationIcon>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
@@ -42,6 +42,7 @@
<OutputPath>bin\Debug\</OutputPath>
<DocumentationFile>VECTO.xml</DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>None</DebugType>
@@ -53,6 +54,7 @@
<NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<PlatformTarget>AnyCPU</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
@@ -69,6 +71,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<DefineTrace>true</DefineTrace>
@@ -80,6 +83,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="itextsharp">
@@ -97,6 +101,7 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Forms.DataVisualization" />
<Reference Include="System.Xml" />
+ <Reference Include="System.Xml.Linq" />
<Reference Include="vectolic, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\vectolic.dll</HintPath>
@@ -432,6 +437,9 @@
<ItemGroup>
<None Include="Resources\F_VECTO.png" />
</ItemGroup>
+ <ItemGroup>
+ <WCFMetadata Include="Service References\" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/VECTO/app.config b/VECTO/app.config
index 60e9869a96a0ecd0350798b258e11f3149ac985f..bc998e04595162d8fa1ac4735343ceb66984dc8a 100644
--- a/VECTO/app.config
+++ b/VECTO/app.config
@@ -22,4 +22,4 @@
<!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
</sharedListeners>
</system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>