diff --git a/CSE/Calculation/Signal_identification.vb b/CSE/Calculation/Signal_identification.vb
index 76a229d46659967c6a24e19df1e9c70c871c038f..7c36f93a66ec090a34d442d9b0acde6c7743ecab 100644
--- a/CSE/Calculation/Signal_identification.vb
+++ b/CSE/Calculation/Signal_identification.vb
@@ -117,8 +117,8 @@ Module Signal_identification
End If
Next i
' Exit the programm
- If LenDiff Then Throw New Exception(format("Length difference between given coordinates and spezified section length in *.csms file! Please correct the length!"))
- If HeadDiff Then Throw New Exception(format("Heading difference between given coordinates and spezified section heading in *.csms file! Please correct the heading!"))
+ If LenDiff Then Throw New Exception(format("Length difference between given coordinates and spezified section length in *.csms file! Please correct the length or coordinates!"))
+ If HeadDiff Then Throw New Exception(format("Heading difference between given coordinates and spezified section heading in *.csms file! Please correct the heading or coordinates!"))
Return True
End Function
@@ -582,7 +582,7 @@ Module Signal_identification
firstIn = True
For i = 1 To foundSec.Count - 1
If Not foundSec(i) Then
- If firstIn Then logme(8, False, "Not all defined sections in the *.csms were founded!. Please check your section definition(s)!")
+ If firstIn Then logme(8, False, "Not all defined sections in the *.csms were found! Please check your section definition(s)!")
logme(8, False, format("SecID ({0}), DID ({0})", MSCX.meID(i), MSCX.dID(i)))
firstIn = False
End If
diff --git a/CSE/Calculation/main_calculation_call.vb b/CSE/Calculation/main_calculation_call.vb
index 71f20cda7a132b8a87d53fc754919477780c7d14..ee76962f0162e65a2d5905de545bffff5e2c60ea 100644
--- a/CSE/Calculation/main_calculation_call.vb
+++ b/CSE/Calculation/main_calculation_call.vb
@@ -38,7 +38,7 @@ Public Module main_calculation_call
If BWorker.CancellationPending Then Return
' Output on the GUI
- logme(7, False, "Calculating the calibration run...")
+ logme(7, False, "Calculating the misalignment run...")
' Identify the signal measurement sections
fIdentifyMS(MSC, vMSC)
@@ -47,10 +47,10 @@ Public Module main_calculation_call
If BWorker.CancellationPending Then Return
' Output on the GUI
- logme(6, False, "Calculating the calibration run parameter")
+ logme(6, False, "Calculating the misalignment run parameter")
Try
- ' Calculate the results from the calibration test
+ ' Calculate the results from the misalignment test
fCalcCalib(MSC, vehicle)
Finally
@@ -110,7 +110,7 @@ Public Module main_calculation_call
If BWorker.CancellationPending Then Return
' Output on the GUI
- If i = 0 Then logme(6, False, "Calculating the HS parameter")
+ If i = 0 Then logme(6, False, "Calibration of vehicle speed and anemometer position correction")
' Calculate the run
fCalcRun(MSC, vehicle, i, r_dyn_ref)
diff --git a/CSE/GUI/F_Main.Designer.vb b/CSE/GUI/F_Main.Designer.vb
index fcb208a5ff6986bd8790f9bad664741dd94f18fd..a38d48783bb488206d3aade1ab1795789840d842 100644
--- a/CSE/GUI/F_Main.Designer.vb
+++ b/CSE/GUI/F_Main.Designer.vb
@@ -771,7 +771,7 @@ Partial Class F_Main
Me.GroupBox1.Size = New System.Drawing.Size(906, 79)
Me.GroupBox1.TabIndex = 33
Me.GroupBox1.TabStop = False
- Me.GroupBox1.Text = "Calibration test"
+ Me.GroupBox1.Text = "Misalignment test"
'
'TextBoxDataC
'
@@ -791,7 +791,7 @@ Partial Class F_Main
Me.ButtonDataC.Name = "ButtonDataC"
Me.ButtonDataC.Size = New System.Drawing.Size(135, 23)
Me.ButtonDataC.TabIndex = 34
- Me.ButtonDataC.Text = "Calibration data"
+ Me.ButtonDataC.Text = "Misaligment data"
Me.ButtonDataC.UseVisualStyleBackColor = True
'
'ButtonSelectDataC
@@ -849,7 +849,7 @@ Partial Class F_Main
Me.GroupBox3.Size = New System.Drawing.Size(135, 46)
Me.GroupBox3.TabIndex = 31
Me.GroupBox3.TabStop = False
- Me.GroupBox3.Text = "From calibration test"
+ Me.GroupBox3.Text = "From misalignment test"
'
'Label16
'
diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb
index 783abd49a41cb5d96ce3f1d7277fbd19bca32fa1..dc425b51bfa1f3ff166a642c8f4dae99687426ce 100644
--- a/CSE/GUI/F_Main.vb
+++ b/CSE/GUI/F_Main.vb
@@ -297,7 +297,7 @@ Public Class F_Main
If Not System.IO.Directory.Exists(OutFolder) Then
If OutFolder <> Nothing Then
' Generate the folder if it is desired
- logme(7, False, format("Output-folder({0}) doesn´t exist an is created!", OutFolder))
+ logme(7, False, format("Output-folder({0}) doesn´t exist and is created!", OutFolder))
IO.Directory.CreateDirectory(OutFolder)
Else
logme(9, False, "No outputfolder is given!")
@@ -310,7 +310,7 @@ Public Class F_Main
Me.ListBoxMSG.Items.Clear()
fClear_VECTO_Form(False, False)
- logme(7, False, format("Starting CALIBRATION: \n\i* Job: {0}\n* Out: {1}", JobFile, OutFolder))
+ logme(7, False, format("Starting MISALIGNMENT calculation: \n\i* Job: {0}\n* Out: {1}", JobFile, OutFolder))
' Start the calculation in the backgroundworker
Dim jobType = OpType.Calibration
@@ -381,7 +381,7 @@ Public Class F_Main
If Not System.IO.Directory.Exists(OutFolder) Then
If OutFolder <> Nothing Then
' Generate the folder if it is desired
- logme(7, False, format("Output-folder({0}) doesn´t exist an is created!", OutFolder))
+ logme(7, False, format("Output-folder({0}) doesn´t exist and is created!", OutFolder))
IO.Directory.CreateDirectory(OutFolder)
Else
logme(9, False, "No outputfolder is given!")
@@ -455,7 +455,7 @@ Public Class F_Main
newJob = New cJob(jobFileToLoad)
Else
newJob = New cJob(True)
- logme(9, False, format("The jobfile ending is not known ({0}). Please use the correct format", JobFile))
+ logme(9, False, format("The jobfile suffix is not known ({0}). Please use the correct format", JobFile))
End If
newJob.Validate()
@@ -963,14 +963,14 @@ Public Class F_Main
End Try
End Sub
- ' Menu open the release nodes
+ ' Menu open the release notes
Private Sub ReleaseNotesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReleaseNotesToolStripMenuItem.Click
Dim release_fname As String = (From fi As IO.FileInfo In (New IO.DirectoryInfo(joinPaths(MyPath, "Docs")).GetFiles("*VECTO-CSE_ReleaseNotes*.pdf", IO.SearchOption.TopDirectoryOnly)) Order By fi.LastAccessTime Select fi)(0).FullName
Try
System.Diagnostics.Process.Start(release_fname)
Catch ex As Exception
- logme(8, False, format("Failed opening User Manual({0}) due to: {1}", release_fname, ex.Message), ex)
+ logme(8, False, format("Failed opening release notes({0}) due to: {1}", release_fname, ex.Message), ex)
End Try
End Sub
diff --git a/CSE/GUI/F_Preferences.vb b/CSE/GUI/F_Preferences.vb
index 32b8adb7fcd8957cd0aa6a517ca627429f511d3b..911bf0dc09c14246cca3d7552c7560c3c164315c 100644
--- a/CSE/GUI/F_Preferences.vb
+++ b/CSE/GUI/F_Preferences.vb
@@ -122,7 +122,7 @@ Public Class F_Preferences
Try
' Look if List and Dec seperator are the same
If Me.decSep.Text = Me.listSep.Text Then
- logme(8, True, format("List and decimal seperator are the same ({0})! \n Both are set to default", Me.decSep.Text))
+ logme(8, True, format("List and decimal separator are the same ({0})! \n Both are set to default", Me.decSep.Text))
Me.decSep.Text = Prefs.PropDefault("decSep")
Me.listSep.Text = Prefs.PropDefault("listSep")
End If
diff --git a/CSE/GUI/F_Welcome.vb b/CSE/GUI/F_Welcome.vb
index 47a5f72467859523b243500694319e000a7bde96..7dabe5d48b211612de531e05ef9fcbdae30f6892 100644
--- a/CSE/GUI/F_Welcome.vb
+++ b/CSE/GUI/F_Welcome.vb
@@ -33,7 +33,7 @@ Public Class F_Welcome
Try
System.Diagnostics.Process.Start(release_fname)
Catch ex As Exception
- logme(8, False, format("Failed opening User Manual({0}) due to: {1}", release_fname, ex.Message), ex)
+ logme(8, False, format("Failed opening release notes({0}) due to: {1}", release_fname, ex.Message), ex)
End Try
End Sub
diff --git a/CSE/IO/input.vb b/CSE/IO/input.vb
index 43c5cfa6b33503aa8159093ef2f604700e61013d..32bfc54eeafbee4d4e26e4d06e8bb1c6aa1515d7 100644
--- a/CSE/IO/input.vb
+++ b/CSE/IO/input.vb
@@ -37,7 +37,7 @@ Public Module input
' Determine the trigger status
Line = FileInMSCSpez.ReadLine
If Line(0).Length <> 1 Then
- Throw New Exception(format("The configuration file does not fit the file format. Control the seperators under Tools/preferences and in the file. Readed value can not converted ({0})", Line(0)))
+ Throw New Exception(format("The configuration file does not fit the file format. Control the separators under Tools/preferences and in the file. Read value can not be converted ({0})", Line(0)))
Else
MSCX.tUse = Line(0)
End If
@@ -45,7 +45,7 @@ Public Module input
' Check the headers for the coordinate unit
Line = FileInMSCSpez.ReadLine
If IsNumeric(Line(0)) Then
- Throw New Exception(format("The header of the configuration file is missing. Please include it or comment it in the file ({0}).", MSCfile))
+ Throw New Exception(format("The header of the *.csms file is missing. Please include it or comment it in the file ({0}).", MSCfile))
Else
CoordID = 0
If Line(4).ToUpper.Contains("(D)") Then
@@ -90,14 +90,14 @@ Public Module input
Loop
Catch ex As Exception
' Falls kein gültiger Wert eingegeben wurde
- Throw New Exception(format("Invalid value in the trigger data file({0}) due to: {1})", fName(MSCfile, True), ex.Message, ex))
+ Throw New Exception(format("Invalid value in the *.csms data file({0}) due to: {1})", fName(MSCfile, True), ex.Message, ex))
End Try
End Using
' Minimum datacheck
If (MSCX.meID.Count - 1) < 2 Then
- Throw New Exception(format("Not eneough measurement sections definied in file ({0}). Minimum number of definitions are two.", fName(MSCfile, True)))
+ Throw New Exception(format("Not enough measurement sections definied in file ({0}). Minimum number of definitions are two.", fName(MSCfile, True)))
End If
' Checks for same definition
@@ -124,7 +124,7 @@ Public Module input
MSCX.headID.Add(2)
Continue For
Else
- Throw New Exception("Measurement section with invalid headings identified (test track not parallel) at line: " & i)
+ Throw New Exception(format("Measurement section with invalid headings identified (test track parallelism critera not met) at line: {0}", i))
End If
End If
Next i
@@ -200,7 +200,7 @@ Public Module input
' Datacheck
If Line.Length = 1 Then
- Throw New Exception(format("The weather file does not fit the file format. Control the seperators under Tools/preferences and in the file. Readed value can not converted ({0})", Line(0)))
+ Throw New Exception(format("The weather file does not fit the file format. Control the separators under Tools/preferences and in the file. Read value can not be converted ({0})", Line(0)))
End If
'Check Number of Columns/Components
@@ -331,7 +331,7 @@ Public Module input
' Datacheck
If Line.Length = 1 Then
- Throw New Exception(format("The data file does not fit the file format. Control the seperators under Tools/preferences and in the file. Readed value can not converted ({0})", Line(0)))
+ Throw New Exception(format("The data file does not fit the file format. Control the separators under Tools/preferences and in the file. Read value can not be converted ({0})", Line(0)))
End If
'Check Number of Columns/Components
@@ -486,7 +486,7 @@ Public Module input
CalcData(tCompCali.trigger_c).Add(CDbl(Line(sKV.Value)))
ElseIf sKV.Key = tComp.beta_ic Then
If InputData(sKV.Key)(tDim) > 360 Or InputData(sKV.Key)(tDim) < -360 Then
- Throw New Exception("The beta_ic angle is higher then +-360°! This is not a possible angle. Please correct.")
+ Throw New Exception("The beta_ic angle is higher then +-360°! This is not a valid angle. Please correct.")
End If
End If
Next sKV
@@ -527,7 +527,7 @@ Public Module input
CalcData(tCompCali.longi_UTM)(i) = UTMCoord.Easting
Next i
If Zone1CentralMeridian > 180 Then
- Throw New Exception("The adjustment is not possible because the data lie to far away from each other to fit into one UTM stripe")
+ Throw New Exception("The UTM zone adjustment is not possible because the data lie to far away from each other to fit into one UTM stripe")
End If
Loop
@@ -562,7 +562,7 @@ Public Module input
' Datacheck
If anz = 0 Then
- Throw New Exception(format("The GenShape file does not fit the file format. Control the seperators in the file this must be list seperator ("","") and decimal seperator (""."")"))
+ Throw New Exception(format("The GenShape file does not fit the file format. Control the separators in the file, this must be list saperator ("","") and decimal separator (""."")"))
End If
' Initialise
@@ -577,7 +577,7 @@ Public Module input
If GenShape.veh_class.Contains(Line(pos)) Then
For j = 0 To GenShape.veh_class.Count - 1
If GenShape.veh_class(j) = Line(pos) And GenShape.veh_conf(j) = Line2(pos) Then
- Throw New ArgumentException("Invalid The vehicle-class({0}) with this configuration({0}) is already defined. Please control your generic ShapeFile({0})!")
+ Throw New ArgumentException("The vehicle-class({0}) with this configuration({0}) is already defined. Please control your generic ShapeFile({0})!")
End If
Next
End If