diff --git a/CHANGES.md b/CHANGES.md
index 4ce3dee429a2971dfa3b3ee1c205941dacd01636..e72f5e99b23dab1684812e536ffaaca4f74af8a3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,13 @@
VECTO-CSE: Changes
===================
-#### 2015-07-24: v2.0.2-beta6 ####
+#### 2015-07-20: v2.0.2-beta6 ####
+TUG improvements:
+
+ * Bugfix heading control
+ * Update user manual
+ * Input "Report bug" button (at the moment this does nothing)
+
+#### 2015-07-01: v2.0.2-beta6 ####
TUG improvements:
* New Version number.
diff --git a/CSE/CSE.vbproj b/CSE/CSE.vbproj
index 04396be2f758fe0a6df3dc16c73ecc3d844b6f8e..b7de5c1df2d04994b365228946c67cde016228dc 100644
--- a/CSE/CSE.vbproj
+++ b/CSE/CSE.vbproj
@@ -312,6 +312,7 @@
<None Include="Resources\Play-icon.png" />
</ItemGroup>
<ItemGroup>
+ <None Include="Resources\bug-edit-icon.png" />
<Content Include="Resources\Stop-icon.png" />
<None Include="Resources\Stop-icon1.png" />
</ItemGroup>
diff --git a/CSE/GUI/F_Main.Designer.vb b/CSE/GUI/F_Main.Designer.vb
index 539a56e9a0e59276a5ec22ef86c0a4c2a4ba1238..694bebfcc7f2397e602536afa29eeb10ee27c3ac 100644
--- a/CSE/GUI/F_Main.Designer.vb
+++ b/CSE/GUI/F_Main.Designer.vb
@@ -39,8 +39,11 @@ Partial Class F_Main
Me.ToolStripMenuItemOption = New System.Windows.Forms.ToolStripMenuItem()
Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItemManu = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ReleaseNotesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripMenuItemAbout = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ReportBugToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.BackgroundWorkerVECTO = New System.ComponentModel.BackgroundWorker()
Me.GroupBoxJob = New System.Windows.Forms.GroupBox()
Me.TextBoxWeather = New System.Windows.Forms.TextBox()
@@ -223,7 +226,6 @@ Partial Class F_Main
Me.Label20 = New System.Windows.Forms.Label()
Me.LRhoAirRef = New System.Windows.Forms.Label()
Me.TB_rho_air_ref = New System.Windows.Forms.TextBox()
- Me.ReleaseNotesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.MenuStrip1.SuspendLayout()
Me.GroupBoxJob.SuspendLayout()
Me.GB_hz_out.SuspendLayout()
@@ -350,7 +352,7 @@ Partial Class F_Main
'InfoToolStripMenuItem
'
Me.InfoToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- Me.InfoToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItemManu, Me.ReleaseNotesToolStripMenuItem, Me.ToolStripMenuItem1, Me.ToolStripMenuItemAbout})
+ Me.InfoToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItemManu, Me.ReleaseNotesToolStripMenuItem, Me.ToolStripMenuItem1, Me.ToolStripMenuItemAbout, Me.ToolStripSeparator1, Me.ReportBugToolStripMenuItem})
Me.InfoToolStripMenuItem.Image = Global.CSE.My.Resources.Resources.Help
Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem"
Me.InfoToolStripMenuItem.Size = New System.Drawing.Size(60, 20)
@@ -362,6 +364,12 @@ Partial Class F_Main
Me.ToolStripMenuItemManu.Size = New System.Drawing.Size(152, 22)
Me.ToolStripMenuItemManu.Text = "User Manual"
'
+ 'ReleaseNotesToolStripMenuItem
+ '
+ Me.ReleaseNotesToolStripMenuItem.Name = "ReleaseNotesToolStripMenuItem"
+ Me.ReleaseNotesToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.ReleaseNotesToolStripMenuItem.Text = "Release Notes"
+ '
'ToolStripMenuItem1
'
Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
@@ -374,6 +382,18 @@ Partial Class F_Main
Me.ToolStripMenuItemAbout.Size = New System.Drawing.Size(152, 22)
Me.ToolStripMenuItemAbout.Text = "About CSE"
'
+ 'ToolStripSeparator1
+ '
+ Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(149, 6)
+ '
+ 'ReportBugToolStripMenuItem
+ '
+ Me.ReportBugToolStripMenuItem.Image = Global.CSE.My.Resources.Resources.bug_edit_icon
+ Me.ReportBugToolStripMenuItem.Name = "ReportBugToolStripMenuItem"
+ Me.ReportBugToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.ReportBugToolStripMenuItem.Text = "Report Bug"
+ '
'BackgroundWorkerVECTO
'
Me.BackgroundWorkerVECTO.WorkerReportsProgress = True
@@ -2268,12 +2288,6 @@ Partial Class F_Main
Me.TB_rho_air_ref.TabIndex = 1
Me.TB_rho_air_ref.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
- 'ReleaseNotesToolStripMenuItem
- '
- Me.ReleaseNotesToolStripMenuItem.Name = "ReleaseNotesToolStripMenuItem"
- Me.ReleaseNotesToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
- Me.ReleaseNotesToolStripMenuItem.Text = "Release Notes"
- '
'F_Main
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2541,5 +2555,7 @@ Partial Class F_Main
Friend WithEvents TB_delta_n_ec_LS As System.Windows.Forms.TextBox
Friend WithEvents LB_delta_n_ec_LS As System.Windows.Forms.Label
Friend WithEvents ReleaseNotesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
+ Friend WithEvents ReportBugToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
End Class
diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb
index 3775e65fba2e338304cc7492ca321e8f21af6510..6fb9d619ad6bff693716ab5d02b045ae373e62bb 100644
--- a/CSE/GUI/F_Main.vb
+++ b/CSE/GUI/F_Main.vb
@@ -975,6 +975,11 @@ Public Class F_Main
logme(8, False, format("Failed opening User Manual({0}) due to: {1}", release_fname, ex.Message), ex)
End Try
End Sub
+
+ ' Menue report a bug
+ Private Sub ReportBugToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReportBugToolStripMenuItem.Click
+
+ End Sub
#End Region ' Infos menu
#End Region ' Main tab
diff --git a/CSE/IO/input.vb b/CSE/IO/input.vb
index 7a6018705501cf094745ba46cda61d0b92dfefe9..6d8577d61d0467a8892f02a2ad95bae640e7c460 100644
--- a/CSE/IO/input.vb
+++ b/CSE/IO/input.vb
@@ -14,8 +14,8 @@ Public Module input
' Read the measurement section config file
Sub ReadInputMSC(ByRef MSCX As cMSC, ByVal MSCfile As String, Optional ByVal calibration As Boolean = True)
' Declarations
- Dim i As Integer
- Dim RefDID As Integer
+ Dim i, j As Integer
+ Dim RefDID, RefID As Integer
Dim RefHead As Double
Dim Line() As String
Using FileInMSCSpez As New cFile_V3
@@ -89,14 +89,14 @@ Public Module input
Next i
Else
For i = 1 To MSCX.meID.Count - 1
- If i = 1 Then
- RefHead = MSCX.head(i)
- RefDID = MSCX.dID(i)
- Else
- If RefHead = MSCX.head(i) And Not RefDID = MSCX.dID(i) Then
+ RefID = MSCX.meID(i)
+ RefHead = MSCX.head(i)
+ RefDID = MSCX.dID(i)
+ For j = i + 1 To MSCX.meID.Count - 1
+ If RefID = MSCX.meID(j) And RefDID = MSCX.dID(j) And RefHead <> MSCX.head(j) Or RefID = MSCX.meID(j) And RefDID <> MSCX.dID(j) And RefHead = MSCX.head(j) Then
Throw New Exception("Two different directions for same heading given. Please correct your input in the File: " & MSCfile)
End If
- End If
+ Next j
MSCX.headID.Add(1)
Next i
End If
diff --git a/CSE/My Project/Resources.Designer.vb b/CSE/My Project/Resources.Designer.vb
index bfdf40b445ccaed684f0c74d460458dba5af71eb..b8279c33a073ba19f5b24bde280640b4abecdd96 100644
--- a/CSE/My Project/Resources.Designer.vb
+++ b/CSE/My Project/Resources.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
-' Runtime Version:4.0.30319.18063
+' Runtime Version:4.0.30319.34209
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -70,6 +70,16 @@ Namespace My.Resources
End Get
End Property
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend ReadOnly Property bug_edit_icon() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("bug_edit_icon", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''<summary>
''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
'''</summary>
diff --git a/CSE/My Project/Resources.resx b/CSE/My Project/Resources.resx
index 964990f637374c1da7846e0a6507de4e19e5b2db..d5fc7ea825f8e3994298c503869c6f0e81a31c8f 100644
--- a/CSE/My Project/Resources.resx
+++ b/CSE/My Project/Resources.resx
@@ -190,4 +190,7 @@
<data name="Stop-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Stop-icon1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="bug_edit_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bug-edit-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/CSE/Resources/bug-edit-icon.png b/CSE/Resources/bug-edit-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8568f1ed49c229d62a2b1504c1dd0885e58b28d
Binary files /dev/null and b/CSE/Resources/bug-edit-icon.png differ
diff --git a/DemoData/VECTO-CSE3.0_InputData_V2.0.2_DemoData.xlsm b/DemoData/VECTO-CSE3.0_InputData_V2.0.2_DemoData.xlsm
index 0871efe51f61f1cf3fb8a5f91e849181d37adf71..ce7842a7ef5b9df36b48a2cf000284196637dc0e 100644
Binary files a/DemoData/VECTO-CSE3.0_InputData_V2.0.2_DemoData.xlsm and b/DemoData/VECTO-CSE3.0_InputData_V2.0.2_DemoData.xlsm differ
diff --git a/Docs/VECTO_CSE-User Manual_2.0.2-beta6.docx b/Docs/VECTO_CSE-User Manual_2.0.2-beta6.docx
index 25bbfdace051d9ec77ec5340f1293eeec4d9e43d..c4aedca3e330e2eaeed35aae1bc61c3441aef41d 100644
Binary files a/Docs/VECTO_CSE-User Manual_2.0.2-beta6.docx and b/Docs/VECTO_CSE-User Manual_2.0.2-beta6.docx differ