diff --git a/CSE.sln b/AirDrag.sln
similarity index 68%
rename from CSE.sln
rename to AirDrag.sln
index 9bfab49f5f32950b261d1a477183e0272e010a24..1305387275fc0b4a8c24bc5e160d5b75c02a22b2 100644
--- a/CSE.sln
+++ b/AirDrag.sln
@@ -1,7 +1,9 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSE", "CSE\CSE.vbproj", "{6845E24A-D1E7-4B28-92E7-2EBF850F044B}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AirDrag", "CSE\AirDrag.vbproj", "{6845E24A-D1E7-4B28-92E7-2EBF850F044B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/CHANGES.md b/CHANGES.md
index 65f3b32a6fbbd4d7c24eb56d275dbc7797b4e1a6..3ecce0d44c684e8c8f873cd26c6757b4322dc6ba 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,15 @@
VECTO-CSE: Changes
===================
+#### 2015-11-25: v2.0.5-beta6 ####
+TUG improvements:
+
+ * New version number
+ * Renaiming of VECTO-CSE into VECTO-Air Drag
+ * Bugfix dist calculation
+ * Bugfix calculation of a_veh_avg and omega_p_wh_acc
+ * Update of the ending message if an error during the calculation detected
+ * Update user manual and release notes
+
#### 2015-10-13: v2.0.4-beta6 ####
TUG improvements:
diff --git a/CSE/CSE.vbproj b/CSE/AirDrag.vbproj
similarity index 96%
rename from CSE/CSE.vbproj
rename to CSE/AirDrag.vbproj
index ca44ae61b277d4e1610ad986831d442abcf25b12..ced21de4f31cb3c2eb56a219d4b7927bdee6b099 100644
--- a/CSE/CSE.vbproj
+++ b/CSE/AirDrag.vbproj
@@ -9,9 +9,9 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6845E24A-D1E7-4B28-92E7-2EBF850F044B}</ProjectGuid>
<OutputType>WinExe</OutputType>
- <StartupObject>CSE.My.MyApplication</StartupObject>
- <RootNamespace>CSE</RootNamespace>
- <AssemblyName>CSE</AssemblyName>
+ <StartupObject>AirDrag.My.MyApplication</StartupObject>
+ <RootNamespace>AirDrag</RootNamespace>
+ <AssemblyName>AirDrag</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -39,7 +39,7 @@
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<OutputPath>bin\Debug\</OutputPath>
- <DocumentationFile>CSE.xml</DocumentationFile>
+ <DocumentationFile>AirDrag.xml</DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
<WarningsAsErrors>
</WarningsAsErrors>
@@ -51,7 +51,7 @@
<DefineTrace>true</DefineTrace>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
- <DocumentationFile>CSE.xml</DocumentationFile>
+ <DocumentationFile>AirDrag.xml</DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
<WarningsAsErrors>
</WarningsAsErrors>
@@ -69,7 +69,7 @@
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<PropertyGroup>
- <ApplicationIcon>Resources\CSE.ico</ApplicationIcon>
+ <ApplicationIcon>Resources\AirDrag.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -186,7 +186,7 @@
<Compile Include="ApplicationEvents.vb" />
<Compile Include="utils.vb" />
<Compile Include="Classes\cFile_v3.vb" />
- <Compile Include="CSE_Globals.vb" />
+ <Compile Include="AirDrag_Globals.vb" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="GUI\F_JIRA.resx">
@@ -212,9 +212,9 @@
</EmbeddedResource>
<EmbeddedResource Include="My Project\Resources.resx">
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.vb</LastGenOutput>
<CustomToolNamespace>My.Resources</CustomToolNamespace>
<SubType>Designer</SubType>
+ <LastGenOutput>Resources.Designer.vb</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
@@ -322,8 +322,8 @@
</ItemGroup>
<ItemGroup>
<None Include="Resources\bug-edit-icon.png" />
+ <None Include="Resources\AirDrag.ico" />
<Content Include="Resources\Stop-icon.png" />
- <None Include="Resources\Stop-icon1.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/CSE/CSE_Globals.vb b/CSE/AirDrag_Globals.vb
similarity index 99%
rename from CSE/CSE_Globals.vb
rename to CSE/AirDrag_Globals.vb
index e41e9dbbeb34a7acfbe0af687c598555bf2be5d1..41803f68c8ff960befe1506e55a4e9978159db06 100644
--- a/CSE/CSE_Globals.vb
+++ b/CSE/AirDrag_Globals.vb
@@ -8,7 +8,7 @@
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
-Module CSE_Globals
+Module AirDrag_Globals
Public Enum tComp
t
lati
diff --git a/CSE/App.config b/CSE/App.config
index 6a5baf876d17bd733a10ad6393f02dda1ecaf1b5..7793e247e013bedc457004a828aa3bd687d69108 100644
--- a/CSE/App.config
+++ b/CSE/App.config
@@ -2,7 +2,7 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
- <section name="CSE.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+ <section name="AirDrag.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<runtime>
@@ -18,10 +18,10 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
</startup>
<userSettings>
- <CSE.My.MySettings>
+ <AirDrag.My.MySettings>
<setting name="F_Main_location" serializeAs="String">
<value>0, 0</value>
</setting>
- </CSE.My.MySettings>
+ </AirDrag.My.MySettings>
</userSettings>
</configuration>
\ No newline at end of file
diff --git a/CSE/ApplicationEvents.vb b/CSE/ApplicationEvents.vb
index e81abe7270614d732ed6b7d7daa3d18ade332954..dfa34931fe3e6e2ac0d76bbb524f700a7a32a480 100644
--- a/CSE/ApplicationEvents.vb
+++ b/CSE/ApplicationEvents.vb
@@ -29,7 +29,7 @@ Namespace My
fbVEL.Close()
fbMSC.Close()
- ' Restart VECTO CSE (Only by changes on the Confic)
+ ' Restart VECTO Air Drag (Only by changes on the Confic)
If RestartN Then
' Start the *.exe
PSI.FileName = My.Application.Info.AssemblyName & ".exe"
@@ -72,7 +72,7 @@ Namespace My
Lic.AppVersion = AppVers
' Declaration from the filebrowser optionen
- fbVECTO = New cFileBrowser("CSE")
+ fbVECTO = New cFileBrowser("AirDrag")
fbVECTO.Extensions = New String() {"csjob.json", "csjob"}
fbCRT = New cFileBrowser("CRT.json")
diff --git a/CSE/Calculation/Signal_identification.vb b/CSE/Calculation/Signal_identification.vb
index bb7a703a7f4ef2207a026babb0401449a9a30281..9e48ad79c56aa8daf114b92bcfea2c33979c203a 100644
--- a/CSE/Calculation/Signal_identification.vb
+++ b/CSE/Calculation/Signal_identification.vb
@@ -9,7 +9,7 @@
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports CSE.cCriteria
+Imports AirDrag.cCriteria
Module Signal_identification
' Divide the signal into there directions
@@ -800,7 +800,7 @@ Module Signal_identification
' Temprature, Pressure, Humidity
If j = -1 Then
- Throw New Exception(format("The test time({0}) is outside the range of the data from the stationary weather station.", InputData(tComp.t)(i)))
+ Throw New Exception(format("The test time({0}) is outside the range of the data from the stationary weather station. Please check weather file and if data time is correct (day crossings correct included?)", InputData(tComp.t)(i)))
Else
CalcData(tCompCali.t_amp_stat)(i) = InterpLinear(InputWeatherData(tCompWeat.t)(j - 1), InputWeatherData(tCompWeat.t)(j), InputWeatherData(tCompWeat.t_amb_stat)(j - 1), InputWeatherData(tCompWeat.t_amb_stat)(j), CalcData(tCompCali.t)(i))
CalcData(tCompCali.p_amp_stat)(i) = InterpLinear(InputWeatherData(tCompWeat.t)(j - 1), InputWeatherData(tCompWeat.t)(j), InputWeatherData(tCompWeat.p_amp_stat)(j - 1), InputWeatherData(tCompWeat.p_amp_stat)(j), CalcData(tCompCali.t)(i))
diff --git a/CSE/Calculation/main_calculation_call.vb b/CSE/Calculation/main_calculation_call.vb
index e397914b762205a5784ab6f7fe95e1848e63a120..902d5efe6c1d4e3da1c2ec414019b7f92b2ebff5 100644
--- a/CSE/Calculation/main_calculation_call.vb
+++ b/CSE/Calculation/main_calculation_call.vb
@@ -15,6 +15,8 @@ Public Module main_calculation_call
Sub calculation(ByVal isCalibrate As Boolean)
' Declaration
Dim i As Integer
+ Dim Starttime As Long() = New Long(2) {0, 0, 0}
+ Dim Endtime As Long() = New Long(2) {0, 0, 0}
' Initialisation
InputData = Nothing
@@ -99,6 +101,8 @@ Public Module main_calculation_call
' Output on the GUI
logme(6, False, "Reading the data file...")
ReadDataFile(Job.coasting_fpaths(i), MSC, vehicle)
+ Starttime(i) = CalcData(tCompCali.t).First
+ Endtime(i) = CalcData(tCompCali.t).Last
' Exit function if error is detected
If BWorker.CancellationPending Then Return
@@ -139,6 +143,11 @@ Public Module main_calculation_call
Next i
Try
+ ' Control the measurement sequence
+ If Not Endtime(1) < Starttime(0) Or Not Endtime(0) < Starttime(2) Then
+ logme(9, False, format("The given measurement times are not in the right sequence! Ending LS1:({0}), Start HS:({1}), Ending HS:({2}), Start LS2:({3})", Endtime(1), Starttime(0), Endtime(0), Starttime(2)))
+ End If
+
' Check if the LS/HS test run is valid
fCheckLSHS()
diff --git a/CSE/GUI/F_About.Designer.vb b/CSE/GUI/F_About.Designer.vb
index 2cc70bb5154f4e4e7ada537abf36e780182dc453..5ea4a6f2becce169e99471caba5a3f29fdce3ffd 100644
--- a/CSE/GUI/F_About.Designer.vb
+++ b/CSE/GUI/F_About.Designer.vb
@@ -129,12 +129,12 @@ Partial Class F_About
Me.Label8.Size = New System.Drawing.Size(158, 65)
Me.Label8.TabIndex = 3
Me.Label8.Text = "European Commission" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "DG CLIMA" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "and" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Joint Research Centre" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Sustainable Transport " & _
- "Unit" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
+ "Unit" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
'
'PictureBoxJRC
'
Me.PictureBoxJRC.Cursor = System.Windows.Forms.Cursors.Hand
- Me.PictureBoxJRC.Image = Global.CSE.My.Resources.Resources.JRC_About
+ Me.PictureBoxJRC.Image = Global.AirDrag.My.Resources.Resources.JRC_About
Me.PictureBoxJRC.Location = New System.Drawing.Point(239, 145)
Me.PictureBoxJRC.Name = "PictureBoxJRC"
Me.PictureBoxJRC.Size = New System.Drawing.Size(195, 40)
@@ -144,7 +144,7 @@ Partial Class F_About
'PictureBoxTUG
'
Me.PictureBoxTUG.Cursor = System.Windows.Forms.Cursors.Hand
- Me.PictureBoxTUG.Image = Global.CSE.My.Resources.Resources.TUG_91x34
+ Me.PictureBoxTUG.Image = Global.AirDrag.My.Resources.Resources.TUG_91x34
Me.PictureBoxTUG.Location = New System.Drawing.Point(363, 398)
Me.PictureBoxTUG.Name = "PictureBoxTUG"
Me.PictureBoxTUG.Size = New System.Drawing.Size(96, 36)
@@ -154,7 +154,7 @@ Partial Class F_About
'PictureBoxFVT
'
Me.PictureBoxFVT.Cursor = System.Windows.Forms.Cursors.Hand
- Me.PictureBoxFVT.Image = Global.CSE.My.Resources.Resources.IVT_About
+ Me.PictureBoxFVT.Image = Global.AirDrag.My.Resources.Resources.IVT_About
Me.PictureBoxFVT.Location = New System.Drawing.Point(245, 398)
Me.PictureBoxFVT.Name = "PictureBoxFVT"
Me.PictureBoxFVT.Size = New System.Drawing.Size(75, 36)
@@ -187,9 +187,9 @@ Partial Class F_About
Me.Label10.Font = New System.Drawing.Font("Verdana", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label10.Location = New System.Drawing.Point(12, 9)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(368, 32)
+ Me.Label10.Size = New System.Drawing.Size(128, 32)
Me.Label10.TabIndex = 16
- Me.Label10.Text = "Constant Speed Evaluator"
+ Me.Label10.Text = "Air Drag"
'
'Label14
'
@@ -197,9 +197,9 @@ Partial Class F_About
Me.Label14.Font = New System.Drawing.Font("Verdana", 20.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label14.Location = New System.Drawing.Point(10, 44)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(203, 32)
+ Me.Label14.Size = New System.Drawing.Size(252, 32)
Me.Label14.TabIndex = 17
- Me.Label14.Text = "VECTO - CSE"
+ Me.Label14.Text = "VECTO-Air Drag"
'
'Label12
'
@@ -257,7 +257,7 @@ Partial Class F_About
'
Me.LVersion.AutoSize = True
Me.LVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.LVersion.Location = New System.Drawing.Point(207, 56)
+ Me.LVersion.Location = New System.Drawing.Point(277, 56)
Me.LVersion.Name = "LVersion"
Me.LVersion.Size = New System.Drawing.Size(65, 18)
Me.LVersion.TabIndex = 22
@@ -268,7 +268,7 @@ Partial Class F_About
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
- Me.ClientSize = New System.Drawing.Size(474, 567)
+ Me.ClientSize = New System.Drawing.Size(464, 557)
Me.Controls.Add(Me.LVersion)
Me.Controls.Add(Me.LinkLicensed)
Me.Controls.Add(Me.Label13)
@@ -296,7 +296,7 @@ Partial Class F_About
Me.MinimumSize = New System.Drawing.Size(480, 591)
Me.Name = "F_About"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
- Me.Text = "About CSE"
+ Me.Text = "About Air Drag"
CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBoxTUG, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBoxFVT, System.ComponentModel.ISupportInitialize).EndInit()
diff --git a/CSE/GUI/F_About.vb b/CSE/GUI/F_About.vb
index 5e094b74298d8a725861922fa433104c9eb73cfd..ed13f0fa5ed54c6b1388188945c61d11067bcb93 100644
--- a/CSE/GUI/F_About.vb
+++ b/CSE/GUI/F_About.vb
@@ -14,7 +14,7 @@ Public Class F_About
'Initialisation
Private Sub F10_AboutBox_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
- Me.Text = "VECTO CSE"
+ Me.Text = "VECTO-Air Drag"
Me.LVersion.Text = format("v{0}", AppVers)
End Sub
diff --git a/CSE/GUI/F_Main.Designer.vb b/CSE/GUI/F_Main.Designer.vb
index a38d48783bb488206d3aade1ab1795789840d842..9aa39aa40e45860a30f4ab0670359716e212774c 100644
--- a/CSE/GUI/F_Main.Designer.vb
+++ b/CSE/GUI/F_Main.Designer.vb
@@ -263,42 +263,42 @@ Partial Class F_Main
'
'MenuItemExit
'
- Me.MenuItemExit.Image = Global.CSE.My.Resources.Resources.Beenden
+ Me.MenuItemExit.Image = Global.AirDrag.My.Resources.Resources.Beenden
Me.MenuItemExit.Name = "MenuItemExit"
Me.MenuItemExit.Size = New System.Drawing.Size(53, 20)
Me.MenuItemExit.Text = "Exit"
'
'MenuItemNewJob
'
- Me.MenuItemNewJob.Image = Global.CSE.My.Resources.Resources.Neu
+ Me.MenuItemNewJob.Image = Global.AirDrag.My.Resources.Resources.Neu
Me.MenuItemNewJob.Name = "MenuItemNewJob"
Me.MenuItemNewJob.Size = New System.Drawing.Size(80, 20)
Me.MenuItemNewJob.Text = "New Job"
'
'MenuItemLoadJob
'
- Me.MenuItemLoadJob.Image = Global.CSE.My.Resources.Resources.Öffnen
+ Me.MenuItemLoadJob.Image = Global.AirDrag.My.Resources.Resources.Öffnen
Me.MenuItemLoadJob.Name = "MenuItemLoadJob"
Me.MenuItemLoadJob.Size = New System.Drawing.Size(82, 20)
Me.MenuItemLoadJob.Text = "Load Job"
'
'MenuItemReloadJob
'
- Me.MenuItemReloadJob.Image = Global.CSE.My.Resources.Resources.Refresh_icon
+ Me.MenuItemReloadJob.Image = Global.AirDrag.My.Resources.Resources.Refresh
Me.MenuItemReloadJob.Name = "MenuItemReloadJob"
Me.MenuItemReloadJob.Size = New System.Drawing.Size(92, 20)
Me.MenuItemReloadJob.Text = "Reload Job"
'
'MenuItemSaveJob
'
- Me.MenuItemSaveJob.Image = Global.CSE.My.Resources.Resources.Speichern
+ Me.MenuItemSaveJob.Image = Global.AirDrag.My.Resources.Resources.Speichern
Me.MenuItemSaveJob.Name = "MenuItemSaveJob"
Me.MenuItemSaveJob.Size = New System.Drawing.Size(80, 20)
Me.MenuItemSaveJob.Text = "Save Job"
'
'MenuItemSaveAsJob
'
- Me.MenuItemSaveAsJob.Image = Global.CSE.My.Resources.Resources.Speichern_unter
+ Me.MenuItemSaveAsJob.Image = Global.AirDrag.My.Resources.Resources.Speichern_unter
Me.MenuItemSaveAsJob.Name = "MenuItemSaveAsJob"
Me.MenuItemSaveAsJob.Size = New System.Drawing.Size(75, 20)
Me.MenuItemSaveAsJob.Text = "Save As"
@@ -318,7 +318,7 @@ Partial Class F_Main
'
'ToolStripMenuItemLog
'
- Me.ToolStripMenuItemLog.Image = Global.CSE.My.Resources.Resources.Log_File
+ Me.ToolStripMenuItemLog.Image = Global.AirDrag.My.Resources.Resources.Log_File
Me.ToolStripMenuItemLog.Name = "ToolStripMenuItemLog"
Me.ToolStripMenuItemLog.Size = New System.Drawing.Size(186, 22)
Me.ToolStripMenuItemLog.Text = "Open LogFile"
@@ -341,7 +341,7 @@ Partial Class F_Main
'
'ToolStripMenuItemOption
'
- Me.ToolStripMenuItemOption.Image = Global.CSE.My.Resources.Resources.Optionen
+ Me.ToolStripMenuItemOption.Image = Global.AirDrag.My.Resources.Resources.Optionen
Me.ToolStripMenuItemOption.Name = "ToolStripMenuItemOption"
Me.ToolStripMenuItemOption.Size = New System.Drawing.Size(186, 22)
Me.ToolStripMenuItemOption.Text = "Preferences"
@@ -350,7 +350,7 @@ Partial Class F_Main
'
Me.InfoToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.InfoToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItemManu, Me.ReleaseNotesToolStripMenuItem, Me.ToolStripSeparator1, Me.ReportBugToolStripMenuItem, Me.ToolStripMenuItem1, Me.ToolStripMenuItemAbout})
- Me.InfoToolStripMenuItem.Image = Global.CSE.My.Resources.Resources.Help
+ Me.InfoToolStripMenuItem.Image = Global.AirDrag.My.Resources.Resources.Help
Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem"
Me.InfoToolStripMenuItem.Size = New System.Drawing.Size(60, 20)
Me.InfoToolStripMenuItem.Text = "Help"
@@ -374,7 +374,7 @@ Partial Class F_Main
'
'ReportBugToolStripMenuItem
'
- Me.ReportBugToolStripMenuItem.Image = Global.CSE.My.Resources.Resources.bug_edit_icon
+ Me.ReportBugToolStripMenuItem.Image = Global.AirDrag.My.Resources.Resources.bug_edit_icon
Me.ReportBugToolStripMenuItem.Name = "ReportBugToolStripMenuItem"
Me.ReportBugToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
Me.ReportBugToolStripMenuItem.Text = "Report Bug via CITnet"
@@ -386,10 +386,10 @@ Partial Class F_Main
'
'ToolStripMenuItemAbout
'
- Me.ToolStripMenuItemAbout.Image = Global.CSE.My.Resources.Resources.Info
+ Me.ToolStripMenuItemAbout.Image = Global.AirDrag.My.Resources.Resources.Info
Me.ToolStripMenuItemAbout.Name = "ToolStripMenuItemAbout"
Me.ToolStripMenuItemAbout.Size = New System.Drawing.Size(189, 22)
- Me.ToolStripMenuItemAbout.Text = "About CSE"
+ Me.ToolStripMenuItemAbout.Text = "About Air Drag"
'
'BackgroundWorkerVECTO
'
@@ -665,7 +665,7 @@ Partial Class F_Main
Me.ButtonEval.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButtonEval.Enabled = False
Me.ButtonEval.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.ButtonEval.Image = Global.CSE.My.Resources.Resources.Play_icon
+ Me.ButtonEval.Image = Global.AirDrag.My.Resources.Resources.Play
Me.ButtonEval.Location = New System.Drawing.Point(838, 17)
Me.ButtonEval.Margin = New System.Windows.Forms.Padding(2)
Me.ButtonEval.Name = "ButtonEval"
@@ -711,7 +711,7 @@ Partial Class F_Main
'
'PictureBox2
'
- Me.PictureBox2.Image = Global.CSE.My.Resources.Resources.JRC_About
+ Me.PictureBox2.Image = Global.AirDrag.My.Resources.Resources.JRC_About
Me.PictureBox2.Location = New System.Drawing.Point(463, 26)
Me.PictureBox2.Margin = New System.Windows.Forms.Padding(2)
Me.PictureBox2.Name = "PictureBox2"
@@ -726,13 +726,13 @@ Partial Class F_Main
Me.Label1.Location = New System.Drawing.Point(156, 26)
Me.Label1.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(287, 25)
+ Me.Label1.Size = New System.Drawing.Size(98, 25)
Me.Label1.TabIndex = 28
- Me.Label1.Text = "Constant Speed Evaluator"
+ Me.Label1.Text = "Air Drag"
'
'PictureBox1
'
- Me.PictureBox1.Image = Global.CSE.My.Resources.Resources.VECTO_LOGO
+ Me.PictureBox1.Image = Global.AirDrag.My.Resources.Resources.VECTO_LOGO
Me.PictureBox1.Location = New System.Drawing.Point(8, 26)
Me.PictureBox1.Margin = New System.Windows.Forms.Padding(2)
Me.PictureBox1.Name = "PictureBox1"
@@ -744,7 +744,7 @@ Partial Class F_Main
'
Me.ButtonCalC.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButtonCalC.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.ButtonCalC.Image = Global.CSE.My.Resources.Resources.Play_icon
+ Me.ButtonCalC.Image = Global.AirDrag.My.Resources.Resources.Play
Me.ButtonCalC.Location = New System.Drawing.Point(837, 18)
Me.ButtonCalC.Margin = New System.Windows.Forms.Padding(2)
Me.ButtonCalC.Name = "ButtonCalC"
@@ -1312,7 +1312,7 @@ Partial Class F_Main
'
'ButtonCrtImport
'
- Me.ButtonCrtImport.Image = Global.CSE.My.Resources.Resources.Öffnen
+ Me.ButtonCrtImport.Image = Global.AirDrag.My.Resources.Resources.Öffnen
Me.ButtonCrtImport.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.ButtonCrtImport.Location = New System.Drawing.Point(305, 62)
Me.ButtonCrtImport.Name = "ButtonCrtImport"
@@ -1323,7 +1323,7 @@ Partial Class F_Main
'
'ButtonCrtExport
'
- Me.ButtonCrtExport.Image = Global.CSE.My.Resources.Resources.Speichern_unter
+ Me.ButtonCrtExport.Image = Global.AirDrag.My.Resources.Resources.Speichern_unter
Me.ButtonCrtExport.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.ButtonCrtExport.Location = New System.Drawing.Point(306, 111)
Me.ButtonCrtExport.Name = "ButtonCrtExport"
@@ -1938,7 +1938,7 @@ Partial Class F_Main
'
'PBInfoIconCrt
'
- Me.PBInfoIconCrt.Image = Global.CSE.My.Resources.Resources.Info
+ Me.PBInfoIconCrt.Image = Global.AirDrag.My.Resources.Resources.Info
Me.PBInfoIconCrt.Location = New System.Drawing.Point(6, 363)
Me.PBInfoIconCrt.Name = "PBInfoIconCrt"
Me.PBInfoIconCrt.Size = New System.Drawing.Size(25, 30)
@@ -2267,13 +2267,13 @@ Partial Class F_Main
Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.PictureBox1)
Me.Controls.Add(Me.MenuStrip1)
- Me.DataBindings.Add(New System.Windows.Forms.Binding("Location", Global.CSE.My.MySettings.Default, "F_Main_location", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
+ Me.DataBindings.Add(New System.Windows.Forms.Binding("Location", Global.AirDrag.My.MySettings.Default, "F_Main_location", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.Location = Global.CSE.My.MySettings.Default.F_Main_location
+ Me.Location = Global.AirDrag.My.MySettings.Default.F_Main_location
Me.MainMenuStrip = Me.MenuStrip1
Me.MinimumSize = New System.Drawing.Size(960, 750)
Me.Name = "F_Main"
- Me.Text = "VECTO Constant Speed Evaluator"
+ Me.Text = "VECTO Air Drag"
Me.MenuStrip1.ResumeLayout(False)
Me.MenuStrip1.PerformLayout()
Me.GroupBoxJob.ResumeLayout(False)
diff --git a/CSE/GUI/F_Main.resx b/CSE/GUI/F_Main.resx
index 2f7dc683cfb54a19fdc34434f3d0b84d69429225..56638831d4a7400566252980fa4efa8f9077d647 100644
--- a/CSE/GUI/F_Main.resx
+++ b/CSE/GUI/F_Main.resx
@@ -129,41 +129,78 @@
<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>
- AAABAAEAIA8AAAEAIADkBwAAFgAAACgAAAAgAAAAHgAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAD+/v6v////////////////v7/U/3Z2yP9OTsv/Tk7L/2Zmx/+qqs/////4////////////2NjY/7W1
- tf+srKz/rKys/62trf+/v7//9PT0//////////////////X1+f+Ojsf/hYXK/4iIzP+IiMz/iIjM/4iI
- zP+Cgsf/wsLj//7+/qP/////6eni/0lJuv8AANz/AAD+/wAA//8AAP//AAD//wAA7f8lJbn/6Ojo/7y8
- uv+bm5v/u7u7/76+vv+7u7v/wMDA/7CwsP+Xl5f/0NDQ////////////iIi4/wAA4f8AAPf/AAD//wAA
- //8AAP//AAD//wAA/v8zM8T//v7+o///+v8/P7j/AAD7/wAA//8AAOv/JCS+/zs7tP8tLbz/AADe/wAA
- 2v+3t8j/ra2m/6ampv+ampr/m5ub/6CgoP+ampr/vLy8/8XFxf+Wlpb/5+fn//////+Cgrv/AADx/wAA
- //8WFsL/MzO7/zMzu/8zM7v/NDS7/4aGxv/+/v6juLjV/wAA4/8AAP//AADl/4qKvP/39+P////y//7+
- 6f/Dw8//XV2p/93d5//IyMb/q6ur/+Pj4//8/Pz//////+jo6P+ampr/xMTE/6Wlpf+4uLj//////4SE
- u/8AAPD/AAD6/3BwrP////D////w////8P////D////9//7+9aNfX8j/AAD//wAA/f9MTLb////4////
- ////////////////////////////////////////////////////////+vr6/5iYmP/AwMD/rq6u/62t
- rf//////hIS7/wAA8P8AAPr/b2+6////////////////////////////8vLZozY20f8AAP//AADo/5yc
- vv///////////////////////////////////////////////////////Pz8/83Nzf+goKD/s7Oz/8fH
- x/+jo6P/vLy8//////+EhLv/AADw/wAA+v9wcK3////x////8v////H////6///////c3MujIiLY/wAA
- //8AANr/vr7H/////////////////////////////////////////////////9LS0v+bm5v/nJyc/7q6
- uv/Jycn/ubm5/5qamv/y8vL//////4SEu/8AAO//AAD+/xsbwv9CQrj/Pz+9/zs7uv9VVa//+/v3/97e
- zaMkJNf/AAD//wAA3f+2tsb////////////////////////////////////////////Dw8P/mZmZ/7u7
- u//Kysr/vr6+/6Kiov+dnZ3/5eXl////////////hIS7/wAA7v8AAP//AAD//wAA+f8AAPn/AAD6/wAA
- vf/z8+v/9fXcozk50P8AAP//AADp/5eXvv//////////////////////////////////////4eHh/5WV
- lf/FxcX/w8PD/6Ojo/+ampr/v7+///j4+P////////////////+EhLv/AADv/wAA/f8zM67/d3e2/3Z2
- uv9zc7j/kZG+/////f/+/vijamrI/wAA/f8AAPv/WFi2////+///////////////////////////////
- //+3t7j/pqam/8bGxv+ioqL/wsLC//n5+f///////////////////////////4SEu/8AAPD/AAD6/3V1
- tv////////////////////////////7+/qPJydr/AADc/wAA//8EBNv/sLDC////9//////////7/+Li
- 3v+Dg7L/7+/z/7y8u/+oqKj/wsLC/5WVlf/////////////////m5ub/5ubm////////////hIS7/wAA
- 8P8AAPr/dna2/////////////////////////////v7+o////f9QULj/AAD4/wAA//8DA9n/Vla1/3p6
- uP9cXLX/ExPN/wAAy//Hx9L/4uLe/5iYmP/Ly8v/qamp/6qqqv+5ubn/p6en/5SUlP+YmJj/////////
- //+Dg7v/AADw/wAA/f80NK//eXm4/3l5uP95ebj/eXm4/7W10f/+/v6j//////Dw5v9ISLv/AADi/wAA
- //8AAP//AAD//wAA//8AAP//CgrA/93d2v//////ra2t/6Ghof/Dw8P/tra2/6ysrP+3t7f/tbW1/5ub
- m//+/v7//////4CAt/8AAPD/AAD//wAA//8AAP3/AAD9/wAA/f8AAP3/OzvA//7+/q//////////////
- //+ystP/WVnI/y4u1P8hIdv/NjbR/29vx//d3eb/////////////////z8/P/62trf+tra3/r6+v/6ys
- rP+wsLD/8PDw////////////4ODr/1JSxf9DQ87/RkbR/0ZG0f9GRtH/RkbR/0FBzP+goNz//v7+aP7+
- /qP+/v6j/v7+o/7+/qP+/vGj6enTo9nZy6Px8dij/v77o/7+/qP+/v6j/v7+o/7+/qP+/v6j8vLyo9DQ
- 0KPKysqj3t7eo/7+/qP+/v6j/v7+o/7+/qP+/v6j/v7to/7+4aP+/uOj/v7jo/7+46P+/uOj/v7ho/7+
- /qMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAA
- AAA=
+ AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAD+/v7////////////////////////////////////////////5+/n//f39//39/f/9/f3//f39//39
+ /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//3+/f/9/f3//f39//7+/v/6+vr/////////
+ //////////////7+/v///////////////////////////////////////v/+/5W6lf/8/fz//f39//39
+ /f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3/vb29/w0N
+ Df/AwMD////////////////////////////////////////////////////////////x9vH/H2sf//H2
+ 8f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39/f/9/f3//f39//39
+ /f+9vr3/Ghsa/0hISP///////////////////////////////////////////////////////////67K
+ rv8SYRL/scux//39/f/9/f3/+/v7/319ff+QkJD/paWl//z8/P/9/f3/i4uL/97e3v/9/f3/qqqq/4uL
+ i/+goKD//f39/+jo6P+Ojo7/GRkZ//7+/v//////////////////////////////////////////////
+ ////////Zppm/xJhEv9pnGn//f39//39/f/5+fn/AAAA/zIyMv8BAQH/p6en//39/f8bGxv/v7+//9zc
+ 3P8FBQX/LS0t/0ZGRv/9/f3/Ozs7/ysrK/8PDw//////////////////////////////////////////
+ //////////////v8+/8ibSL/EmES/yVuJf/5+/n//f39//n5+f8AAAD/Y2Nj/xISEv8/Pz///f39/xsb
+ G/+/v7//m5ub/xwcHP9nZ2f/RkZG/+np6f8CAgL/Wlpa/w8PD///////////////////////////////
+ ////////////////////////w9fD/xJiEv8SYRL/EmIS/8TYxP/9/f3/+fn5/wAAAP/Dw8P/l5eX/xIS
+ Ev/8/Pz/HBwc/6Ojo/+RkZH/NjY2/319ff9KSkr/3Nzc/wICAv+4uLj/ExMT////////////////////
+ //////////////////////////////////97qHv/EmES/xJhEv8SYRL/fKl8//39/f/5+fn/AAAA/8PD
+ w/+srKz/CgoK//z8/P80NDT/Ozs6/7q6uv8BAQH/AgIB/21tbf/39/f/Dg4O/w0NDf8yMjL/////////
+ /////////////////////////////////////////v7+/zR4NP8SYRL/EmES/xJhEv81eTX//Pz8//n5
+ +f8AAAD/kZGR/0lJSf8kJCT//Pz8/5iYmP89PT3/+/v7/0JCQv8TExP/09PT//39/f+Hh4f/CAgI/6Oj
+ o//////////////////////////////////////////////////X5df/E2IT/xJhEv8SYRL/EmES/xNi
+ E//X5df/+fn5/wAAAP8AAAD/AAAA/3Jycv/9/f3//Pz8//n5+f/9/f3//f39//n5+f/9/f3//f39//7+
+ /v/6+vr//////////////////////////////////////////////////////5C2kP8SYRL/EmES/xJh
+ Ev8SYRL/EmES/4+1j//6+vr/GBgY/xkZGf9QUFD/7u7u//39/f/9/f3//f39//39/f/9/f3//f39//39
+ /f/9/f3//v7+///////////////////////////////////////////////////////+//7/SYZJ/xJh
+ Ev8SYRL/EmES/xJhEv8SYRL/SIZI//z8/P/8/Pz//Pz8//z8/P/9/f3//f39//39/f/9/f3//f39//39
+ /f/9/f3//f39//39/f/+/v7//////////////////////////////////////////////////////+rx
+ 6v8VYxX/EmES/xJhEv8SYRL/EmES/xJhEv8VYxX/6PDo//39/f/9/f3/y8vL/6Kiov/l5eX/oqKi/8rK
+ yv/9/f3/v7+//6+wr//9/f3/29vb/6Ojo//w8PD/////////////////////////////////////////
+ ////////pcSl/xJhEv8SYRL/EmES/xJhEv8SYRL/EmES/xJhEv+jwqP//f39//39/f90dHT/AAAA/729
+ vf8AAAD/cHBw//39/f9RUVH/JSUl//39/f+dnZ3/AgIC/9XV1f//////////////////////////////
+ //////////////////9dlF7/EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/EmES/1uTW//8/Pz//f39/3R0
+ dP8AAAD/dXV1/wAAAP9wcHD//f39/1FRUf8lJSX//f39/52dnf8CAgL/1dXV////////////////////
+ ////////////////////////9/r3/x1pHf8SYRL/EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/HGgc//T3
+ 9P/9/f3/dHR0/wAAAP9DQ0P/AAAA/3BwcP/9/f3/UVFR/yUlJf/9/f3/nZ2d/wICAv/IyMj/////////
+ //////////////////////////////////+60rr/EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/EmES/xJh
+ Ev8SYRL/ts+2//39/f90dHT/AAAA/5CQkP8AAAD/cHBw//39/f9RUVH/JSUl//39/f+2trb/AgIC/yQk
+ JP///////////////////////////////////////////3Kicv8SYRL/EmES/xJhEv8SYRL/EmES/xJh
+ Ev8SYRL/EmES/xJhEv9un27//f39/3Z2dv8AAAD/rKys/wAAAP9xcXH//f39/1FRUf8lJSX//f39//f3
+ 9/8wMDD/IiIi///////////////////////////////////////9/v3/K3Mr/xJhEv8SYRL/EmES/xJh
+ Ev8SYRL/EmES/xJhEv8SYRL/EmES/ylxKf/6+/v/l5eX/wAAAP8DAwP/AAAA/4iIiP/9/f3/xsbG/66u
+ rv/9/f3//f39//f39//b29v//////////////////////////////////////8/fz/8SYhL/EmES/xJh
+ Ev8SYRL/EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/EmIS/8nbyf/t7e3/JCQk/wAAAP8PDw//29vb//39
+ /f9aWlr/LCws//39/f/9/f3//v7+////////////////////////////////////////////h7CH/xJh
+ Ev8SYRL/EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/gayB//39/f/z8/P/xMTE/+jo
+ 6P/9/f3//f39/9DQ0P+6urr//f39//39/f/+/v7///////////////////////////////////////7+
+ /v8/gD//EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/EmES/xJhEv86fTr//Pz8//z8
+ /P/8/Pz//P39//39/f/9/v3//f39//39/f/9/f3//f39//7+/v/+//7/////////////////////////
+ ////////4+3j/xNiE/8SYRL/EmES/xJhEv8SYRL/EmES/ydxJ/8SYRL/EmES/xJhEv8SYRL/EmES/xNi
+ E/8fah//JW8l/zN5M/9Fikb/YaFh/322fv+Ux5X/qdWq/7zgvf/N6c3/2+/b/+f15//x+fH/+f36//7+
+ /v////////////////+cvpz/EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/irOL/xJiEv8SYRL/EmES/xJh
+ Ev8SYRL/EmES/xNiE/8ZZxn/J3In/zuEPP9YnFj/drJ2/47Ej/+l0qX/ud65/8rny//Z79n/5fTm//D5
+ 8P/5/Pr//v7+/////////////v///1SOVP8SYRL/EmES/xJhEv8SYRL/EmES/xNiE//m7+b/Imwi/xJh
+ Ev8SYRL/EmES/xJhEv8SYRL/E2IT/xlnGf8ncij/O4M8/1icWP92s3f/jsSP/6XSpf+53rn/yufL/9nv
+ 2f/l9Ob/8Pnw//n9+f/+/v7////////////y9/L/GWYZ/xJhEv8SYRL/EmES/xJhEv8SYRL/Mncy//z8
+ /P9YkFj/EmES/xJhEv8SYRL/EmES/xJhEv8TYhP/GWcZ/ydyKP87gzz/WJxY/3aydv+OxI//pdKl/7ne
+ uf/K58v/2e/Z/+X05v/w+fD/+f35//7+/v///////////6/Kr/8SYRL/EmES/xJhEv8SYRL/EmES/xJh
+ Ev9lmWX//f39/5C2kP8SYRL/EmES/xJhEv8SYRL/EmES/xNiE/8ZZxn/J3Io/zuEPP9YnFn/drJ3/47E
+ j/+l06X/ud65/8rny//Z79n/5fTm//D58P/5/Pn//v7+///////9/f3/ZJlk/xJhEv8SYRL/EmES/xJh
+ Ev8SYRL/EmES/5i7mP/9/f3/ydvJ/xJiEv8SYRL/EmES/xJhEv8SYRL/E2IT/xlnGf8ncij/O4Q8/1ic
+ Wf92snf/jsSP/6XSpf+53rn/yufL/9nv2f/l9Ob/8Pnw//n8+f/+/v7///////j6+P8ibCL/EmES/xJh
+ Ev8SYRL/EmES/xJhEv8SYhL/y93L//39/f/3+ff/HGkc/xJhEv8SYRL/EmES/xJhEv8TYhP/GWcZ/ydy
+ J/87gzz/WJxY/3ayd/+OxI//pdOl/7neuf/K58v/2e/Z/+X05v/w+fD/+f35//7+/v//////wNbA/xJh
+ Ev8SYRL/EmES/xJhEv8SYRL/EmES/xpnGv/3+ff//f39//39/f9Pi0//EmES/xJhEv8SYRL/EmES/xNi
+ E/8ZZxn/J3Io/zuEPP9Ym1j/drN3/47Ej/+l06b/ud65/8rny//Z79n/5fTm//D58P/5/fn//v7+////
+ //95pnn/EmES/xJhEv8SYRL/EmES/xJhEv8SYRL/R4ZH//z8/P/9/f3//f39/4ewh/8SYRL/EmES/xJh
+ Ev8SYRL/E2IT/xlnGf8ncij/O4M7/1icWf92s3f/jsSP/6XTpv+53rn/yufL/9nv2f/l9Ob/8Pnw//n8
+ +v/+/v7//////9Df0P/B1cH/wdXB/8HVwf/B1cH/wdXB/8HVwf/W5Nb//f39//39/f/9/f3/6O/o/8HV
+ wf/B1cH/wdXB/8HVwf/B1cH/w9fD/8bZxv/L3sz/0+XU/9vq2//h7+L/5/Pn/+z27P/w+PH/9fr1//j8
+ +P/7/fv//f79//7+/v//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
</value>
</data>
</root>
\ No newline at end of file
diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb
index 4a8bd261dd3c0701e795ca0be237981d176dc1da..1bc5a8d71891bdb33994f90e4c0ef6c037a4a667 100644
--- a/CSE/GUI/F_Main.vb
+++ b/CSE/GUI/F_Main.vb
@@ -249,7 +249,7 @@ Public Class F_Main
'####################################################################
Private _CalibrationState As Boolean = False
Private ReadOnly _CalibrationTxts = {"Calibrate", "Cancel"}
- Private ReadOnly _CalibrationImgs = {My.Resources.Resources.Play_icon, My.Resources.Resources.Stop_icon}
+ Private ReadOnly _CalibrationImgs = {My.Resources.Resources.Play, My.Resources.Resources.Stop_calc}
Private Property CalibrationState As Boolean
Get
Return _CalibrationState
@@ -333,7 +333,7 @@ Public Class F_Main
'####################################################################
Private _EvaluationState As Boolean = False
Private ReadOnly _EvaluationTxts = {"Evaluate", "Cancel"}
- Private ReadOnly _EvaluationImgs = {My.Resources.Resources.Play_icon, My.Resources.Resources.Stop_icon}
+ Private ReadOnly _EvaluationImgs = {My.Resources.Resources.Play, My.Resources.Resources.Stop_calc}
Private Property EvaluationState As Boolean
Get
Return _EvaluationState
@@ -959,7 +959,7 @@ Public Class F_Main
' Menu open the user manual
Private Sub ToolStripMenuItemManu_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripMenuItemManu.Click
- Dim manual_fname As String = (From fi As IO.FileInfo In (New IO.DirectoryInfo(joinPaths(MyPath, "Docs")).GetFiles("*VECTO_CSE-User Manual*.pdf", IO.SearchOption.TopDirectoryOnly)) Order By fi.LastAccessTime Select fi)(0).FullName
+ Dim manual_fname As String = (From fi As IO.FileInfo In (New IO.DirectoryInfo(joinPaths(MyPath, "Docs")).GetFiles("*VECTO_Air Drag-User Manual*.pdf", IO.SearchOption.TopDirectoryOnly)) Order By fi.LastAccessTime Select fi)(0).FullName
Try
System.Diagnostics.Process.Start(manual_fname)
@@ -970,7 +970,7 @@ Public Class F_Main
' 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
+ Dim release_fname As String = (From fi As IO.FileInfo In (New IO.DirectoryInfo(joinPaths(MyPath, "Docs")).GetFiles("*VECTO-Air Drag_ReleaseNotes*.pdf", IO.SearchOption.TopDirectoryOnly)) Order By fi.LastAccessTime Select fi)(0).FullName
Try
System.Diagnostics.Process.Start(release_fname)
diff --git a/CSE/GUI/F_Welcome.vb b/CSE/GUI/F_Welcome.vb
index 7dabe5d48b211612de531e05ef9fcbdae30f6892..edc5c89a97ec180cc1c8f99c1a7ed818d00d543b 100644
--- a/CSE/GUI/F_Welcome.vb
+++ b/CSE/GUI/F_Welcome.vb
@@ -29,7 +29,7 @@ Public Class F_Welcome
'Open Release Notes
Private Sub B_Release_Click(sender As System.Object, e As System.EventArgs) Handles B_Release.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
+ Dim release_fname As String = (From fi As IO.FileInfo In (New IO.DirectoryInfo(joinPaths(MyPath, "Docs")).GetFiles("*VECTO-Air Drag_ReleaseNotes*.pdf", IO.SearchOption.TopDirectoryOnly)) Order By fi.LastAccessTime Select fi)(0).FullName
Try
System.Diagnostics.Process.Start(release_fname)
Catch ex As Exception
@@ -39,7 +39,7 @@ Public Class F_Welcome
'Open Quick Start Guide
Private Sub B_UserM_Click(sender As System.Object, e As System.EventArgs) Handles B_UserM.Click
- Dim manual_fname As String = (From fi As IO.FileInfo In (New IO.DirectoryInfo(joinPaths(MyPath, "Docs")).GetFiles("*VECTO_CSE-User Manual*.pdf", IO.SearchOption.TopDirectoryOnly)) Order By fi.LastAccessTime Select fi)(0).FullName
+ Dim manual_fname As String = (From fi As IO.FileInfo In (New IO.DirectoryInfo(joinPaths(MyPath, "Docs")).GetFiles("*VECTO_Air Drag-User Manual*.pdf", IO.SearchOption.TopDirectoryOnly)) Order By fi.LastAccessTime Select fi)(0).FullName
Try
System.Diagnostics.Process.Start(manual_fname)
Catch ex As Exception
diff --git a/CSE/IO/cCriteria.vb b/CSE/IO/cCriteria.vb
index e748b3715cde9fb57c5a3079c358082bc3984749..4b7ac2db4ceda8ccb5e94817483940c39826696d 100644
--- a/CSE/IO/cCriteria.vb
+++ b/CSE/IO/cCriteria.vb
@@ -17,7 +17,7 @@ Public Class cCriteria
Protected Overrides Function HeaderOverlay() As JObject
Return JObject.Parse(<json>{
- "Title": "vecto-cse CRITERIA",
+ "Title": "VECTO-Air Drag CRITERIA",
"FileVersion": "1.0.0",
}</json>.Value)
End Function
@@ -86,7 +86,7 @@ Public Class cCriteria
Public Shared Function JSchemaStr(Optional ByVal isStrictBody As Boolean = False) As String
Dim allowAdditionalProps_str As String = (Not isStrictBody).ToString.ToLower
Return <json>{
- "title": "Schema for vecto-cse CRITERIA",
+ "title": "Schema for VECTO-Air Drag CRITERIA",
"type": "object", "additionalProperties": <%= allowAdditionalProps_str %>,
"required": true,
"properties": {
diff --git a/CSE/IO/cJob.vb b/CSE/IO/cJob.vb
index ca5d1b9e47893441c22f6a90d3bd15dff1133b1b..782a2d892381d9e78d392d1d6dc4dce7aae8f6c3 100644
--- a/CSE/IO/cJob.vb
+++ b/CSE/IO/cJob.vb
@@ -17,7 +17,7 @@ Public Class cJob
Protected Overrides Function HeaderOverlay() As JObject
Return JObject.Parse(<json>{
- "Title": "vecto-cse JOB",
+ "Title": "VECTO-Air Drag JOB",
"FileVersion": "1.0.0",
}</json>.Value)
End Function
@@ -57,7 +57,7 @@ Public Class cJob
Dim allowAdditionalProps_str As String = (Not isStrictBody).ToString.ToLower
Dim requireFPathExts = isStrictBody
Return <json>{
- 'title': "Schema for vecto-cse VEHICLE",
+ 'title': "Schema for VECTO-Air Drag VEHICLE",
"type": "object", "additionalProperties": <%= allowAdditionalProps_str %>,
"required": true,
"properties": {
diff --git a/CSE/IO/cJsonFile.vb b/CSE/IO/cJsonFile.vb
index 24f49717540b9cb110e33789acb79818a4247bae..e218ade37c15e3355691c56f2b4d27c1a6522573 100644
--- a/CSE/IO/cJsonFile.vb
+++ b/CSE/IO/cJsonFile.vb
@@ -207,7 +207,7 @@ When False, it overrides Application's choice and is not replaced ever.",
''' <param name="prefs">It is there to be used when storing cPreferences themselfs.</param>
''' <remarks>Note that it is invoked early enough, before the new file has acquired a Body and before AppPreferences exist(!).</remarks>
Sub UpdateHeader(Optional ByVal prefs As cPreferences = Nothing)
- If prefs Is Nothing Then prefs = CSE.Prefs
+ If prefs Is Nothing Then prefs = AirDrag.Prefs
Dim h As JObject = Me.Header
h("ModifiedDate") = DateTime.Now.ToString(dateFrmt)
@@ -223,7 +223,7 @@ When False, it overrides Application's choice and is not replaced ever.",
h("AppVersion") = AppVers
'' Ensure StrictBody element always there.
-
+
If h("StrictBody") Is Nothing Then
h("StrictBody") = Nothing
End If
@@ -260,7 +260,7 @@ When False, it overrides Application's choice and is not replaced ever.",
''' <param name="strictHeader">when false, relaxes Header's schema (used on Loading to be more accepting)</param>
''' <param name="prefs">It is there just to be used when storing cPreferences themselfs.</param>
Friend Sub Validate(Optional ByVal strictHeader As Boolean = False, Optional ByVal prefs As cPreferences = Nothing)
- If prefs Is Nothing Then prefs = CSE.Prefs
+ If prefs Is Nothing Then prefs = AirDrag.Prefs
Dim validateMsgs As IList(Of String) = New List(Of String)
Dim fileSchema = JsonSchema.Parse(JSchemaStr_Header(strictHeader))
diff --git a/CSE/IO/cPreferences.vb b/CSE/IO/cPreferences.vb
index 7d9f75811d3fac1fcb20308949863407b528086d..1d9e0c0914bf752dac32481db1b238a811b4d73b 100644
--- a/CSE/IO/cPreferences.vb
+++ b/CSE/IO/cPreferences.vb
@@ -19,7 +19,7 @@ Public Class cPreferences
Protected Overrides Function HeaderOverlay() As JObject
Return JObject.Parse(<json>{
- "Title": "vecto-cse PREFERENCES",
+ "Title": "VECTO-Air Drag PREFERENCES",
"FileVersion": "1.0.0",
}</json>.Value)
End Function
@@ -42,7 +42,7 @@ Public Class cPreferences
Public Shared Function JSchemaStr(Optional ByVal isStrictBody As Boolean = False) As String
Dim allowAdditionalProps_str As String = (Not isStrictBody).ToString.ToLower
Return <json>{
- "title": "Schema for vecto-cse PREFERENCES",
+ "title": "Schema for VECTO-Air Drag PREFERENCES",
"type": "object", "additionalProperties": <%= allowAdditionalProps_str %>,
"required": true,
"properties": {
diff --git a/CSE/IO/cVehicle.vb b/CSE/IO/cVehicle.vb
index e5950c0fa137ec05ccda19bd2e77985b57ddf9eb..ab279c1190e19250ed72f976a7f2f76fd2fcd113 100644
--- a/CSE/IO/cVehicle.vb
+++ b/CSE/IO/cVehicle.vb
@@ -27,7 +27,7 @@ Public Class cVehicle
Protected Overrides Function HeaderOverlay() As JObject
Return JObject.Parse(<json>{
- "Title": "vecto-cse VEHICLE",
+ "Title": "VECTO-Air Drag VEHICLE",
"FileVersion": "1.0.0",
}</json>.Value)
End Function
@@ -54,7 +54,7 @@ Public Class cVehicle
Public Shared Function JSchemaStr(Optional ByVal isStrictBody As Boolean = False) As String
Dim allowAdditionalProps_str As String = (Not isStrictBody).ToString.ToLower
Return <json>{
- "title": "Schema for vecto-cse VEHICLE",
+ "title": "Schema for VECTO-Air Drag VEHICLE",
"type": "object", "additionalProperties": <%= allowAdditionalProps_str %>,
"required": true,
"properties": {
diff --git a/CSE/IO/output.vb b/CSE/IO/output.vb
index 58b05cfb1e180ff72233cc1679c6e14f174c3db0..93699569c86b4d508ca6fbe544f6413c575e32d0 100644
--- a/CSE/IO/output.vb
+++ b/CSE/IO/output.vb
@@ -216,7 +216,7 @@ Module output
logme(5, False, "Writing result-file (*.csv)")
' Generate the file name
- NameOutFile = OutFolder & fName(JobFile, False) & "_CSE.csv"
+ NameOutFile = OutFolder & fName(JobFile, False) & "_AirDrag.csv"
' Anlegen der Datei
FileOut.OpenWrite(NameOutFile, , False)
diff --git a/CSE/My Project/Application.Designer.vb b/CSE/My Project/Application.Designer.vb
index f72be664ffb15fdba9c503bb58aa2f004be614a2..0ccf748aecf5c9e889bfed98a04eff4574448867 100644
--- a/CSE/My Project/Application.Designer.vb
+++ b/CSE/My Project/Application.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.
@@ -32,7 +32,7 @@ Namespace My
<Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
Protected Overrides Sub OnCreateMainForm()
- Me.MainForm = Global.CSE.F_Main
+ Me.MainForm = Global.AirDrag.F_Main
End Sub
End Class
End Namespace
diff --git a/CSE/My Project/AssemblyInfo.vb b/CSE/My Project/AssemblyInfo.vb
index 52704295a093fa5fc3e3cb64ec1fd0f544135e02..2cd22c0e8a42caad21d5481773dffdf645a3893d 100644
--- a/CSE/My Project/AssemblyInfo.vb
+++ b/CSE/My Project/AssemblyInfo.vb
@@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices
' Die Werte der Assemblyattribute überprüfen
-<Assembly: AssemblyTitle("CSE")>
-<Assembly: AssemblyDescription("Constant Speed Evaluation Tool for VECTO")>
+<Assembly: AssemblyTitle("Air Drag")>
+<Assembly: AssemblyDescription("Air Drag Tool for VECTO")>
<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("CSE")>
+<Assembly: AssemblyProduct("Air Drag")>
<Assembly: AssemblyCopyright("Copyright © 2014 European Commission")>
<Assembly: AssemblyTrademark("")>
diff --git a/CSE/My Project/Resources.Designer.vb b/CSE/My Project/Resources.Designer.vb
index b8279c33a073ba19f5b24bde280640b4abecdd96..4295f7142395598de0e3e1d5849df528b4e86ce9 100644
--- a/CSE/My Project/Resources.Designer.vb
+++ b/CSE/My Project/Resources.Designer.vb
@@ -39,7 +39,7 @@ Namespace My.Resources
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
Get
If Object.ReferenceEquals(resourceMan, Nothing) Then
- Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("CSE.Resources", GetType(Resources).Assembly)
+ Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("AirDrag.Resources", GetType(Resources).Assembly)
resourceMan = temp
End If
Return resourceMan
@@ -61,32 +61,32 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
'''</summary>
- Friend ReadOnly Property Beenden() As System.Drawing.Bitmap
+ Friend ReadOnly Property AirDrag() As System.Drawing.Icon
Get
- Dim obj As Object = ResourceManager.GetObject("Beenden", resourceCulture)
- Return CType(obj,System.Drawing.Bitmap)
+ Dim obj As Object = ResourceManager.GetObject("AirDrag", resourceCulture)
+ Return CType(obj,System.Drawing.Icon)
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
+ Friend ReadOnly Property Beenden() As System.Drawing.Bitmap
Get
- Dim obj As Object = ResourceManager.GetObject("bug_edit_icon", resourceCulture)
+ Dim obj As Object = ResourceManager.GetObject("Beenden", 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).
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
- Friend ReadOnly Property CSE() As System.Drawing.Icon
+ Friend ReadOnly Property bug_edit_icon() As System.Drawing.Bitmap
Get
- Dim obj As Object = ResourceManager.GetObject("CSE", resourceCulture)
- Return CType(obj,System.Drawing.Icon)
+ Dim obj As Object = ResourceManager.GetObject("bug_edit_icon", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
@@ -223,9 +223,9 @@ Namespace My.Resources
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
- Friend ReadOnly Property Play_icon() As System.Drawing.Bitmap
+ Friend ReadOnly Property Play() As System.Drawing.Bitmap
Get
- Dim obj As Object = ResourceManager.GetObject("Play-icon", resourceCulture)
+ Dim obj As Object = ResourceManager.GetObject("Play", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
@@ -243,9 +243,9 @@ Namespace My.Resources
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
- Friend ReadOnly Property Refresh_icon() As System.Drawing.Bitmap
+ Friend ReadOnly Property Refresh() As System.Drawing.Bitmap
Get
- Dim obj As Object = ResourceManager.GetObject("Refresh-icon", resourceCulture)
+ Dim obj As Object = ResourceManager.GetObject("Refresh", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
@@ -273,9 +273,9 @@ Namespace My.Resources
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
- Friend ReadOnly Property Stop_icon() As System.Drawing.Bitmap
+ Friend ReadOnly Property Stop_calc() As System.Drawing.Bitmap
Get
- Dim obj As Object = ResourceManager.GetObject("Stop-icon", resourceCulture)
+ Dim obj As Object = ResourceManager.GetObject("Stop_calc", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
diff --git a/CSE/My Project/Resources.resx b/CSE/My Project/Resources.resx
index d5fc7ea825f8e3994298c503869c6f0e81a31c8f..67f8ac40e8626c52c8d7cd34246cd179ad3b02de 100644
--- a/CSE/My Project/Resources.resx
+++ b/CSE/My Project/Resources.resx
@@ -133,7 +133,7 @@
<data name="Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Refresh-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <data name="Refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Refresh-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Beenden" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -154,7 +154,7 @@
<data name="Neu" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Neu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Play-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Play-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="VECTO_LOGO" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -175,9 +175,6 @@
<data name="IVT_About" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\IVT_About.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="CSE" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\CSE.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="minus_circle_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\minus-circle-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -187,10 +184,13 @@
<data name="Öffnen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Öffnen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <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>
+ <data name="AirDrag" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\AirDrag.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="Stop_calc" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Stop-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/My Project/Settings.Designer.vb b/CSE/My Project/Settings.Designer.vb
index 7dad854a95ce9e6dd90d61705bfc0e3264b0e730..052f3167d40397ac9d5e95d7b866281de9e03f04 100644
--- a/CSE/My Project/Settings.Designer.vb
+++ b/CSE/My Project/Settings.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.
@@ -13,35 +13,35 @@ 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.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+
+ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+ 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
-
- Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-
+
+ Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
+
#Region "My.Settings Auto-Save Functionality"
#If _MyType = "WindowsForms" Then
- Private Shared addedHandler As Boolean
+ Private Shared addedHandler As Boolean
- Private Shared addedHandlerLockObject As New Object
+ Private Shared addedHandlerLockObject As New Object
- <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
- Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
- If My.Application.SaveMySettingsOnExit Then
- My.Settings.Save()
- End If
- End Sub
+ <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+ Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+ If My.Application.SaveMySettingsOnExit Then
+ My.Settings.Save()
+ End If
+ End Sub
#End If
#End Region
-
+
Public Shared ReadOnly Property [Default]() As MySettings
Get
-
+
#If _MyType = "WindowsForms" Then
- If Not addedHandler Then
+ If Not addedHandler Then
SyncLock addedHandlerLockObject
If Not addedHandler Then
AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
@@ -53,15 +53,15 @@ Namespace My
Return defaultInstance
End Get
End Property
-
- <Global.System.Configuration.UserScopedSettingAttribute(), _
- Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
- Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
+
+ <Global.System.Configuration.UserScopedSettingAttribute(), _
+ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+ Global.System.Configuration.DefaultSettingValueAttribute("0, 0")> _
Public Property F_Main_location() As Global.System.Drawing.Point
Get
- Return CType(Me("F_Main_location"),Global.System.Drawing.Point)
+ Return CType(Me("F_Main_location"), Global.System.Drawing.Point)
End Get
- Set
+ Set(value As Global.System.Drawing.Point)
Me("F_Main_location") = value
End Set
End Property
@@ -69,16 +69,16 @@ Namespace My
End Namespace
Namespace My
-
- <Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
- Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
- Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
+
+ <Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
+ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+ Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
Friend Module MySettingsProperty
-
- <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
- Friend ReadOnly Property Settings() As Global.CSE.My.MySettings
+
+ <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
+ Friend ReadOnly Property Settings() As Global.AirDrag.My.MySettings
Get
- Return Global.CSE.My.MySettings.Default
+ Return Global.AirDrag.My.MySettings.Default
End Get
End Property
End Module
diff --git a/CSE/Resources/AirDrag.ico b/CSE/Resources/AirDrag.ico
new file mode 100644
index 0000000000000000000000000000000000000000..50d351c228e4c1764e30669100da86dde4b5481e
Binary files /dev/null and b/CSE/Resources/AirDrag.ico differ
diff --git a/CSE/Resources/Stop-icon1.png b/CSE/Resources/Stop-icon1.png
deleted file mode 100644
index d6badde84674c2fa9c4e8760a2f79d694981ef7f..0000000000000000000000000000000000000000
Binary files a/CSE/Resources/Stop-icon1.png and /dev/null differ
diff --git a/CSE/cSemanticVersion.vb b/CSE/cSemanticVersion.vb
index c1944642fd76f2afa3cfcc2c353feb5a63252ce1..78192565cdc5a144b9ec02e0a8dc93a40fc5edf4 100644
--- a/CSE/cSemanticVersion.vb
+++ b/CSE/cSemanticVersion.vb
@@ -354,7 +354,7 @@ Public NotInheritable Class cSemanticVersion
''' </item>
''' </list>
''' </returns>
- Public Function CompareTo(ByVal other As cSemanticVersion) As Integer Implements IComparable(Of CSE.cSemanticVersion).CompareTo
+ Public Function CompareTo(ByVal other As cSemanticVersion) As Integer Implements IComparable(Of AirDrag.cSemanticVersion).CompareTo
If (other Is Nothing) Then Throw New ArgumentNullException("other")
If (other Is Me) Then Return 0
@@ -403,7 +403,7 @@ Public NotInheritable Class cSemanticVersion
''' <b>True</b> if the objects are equal, or false if the objects are
''' not equal.
''' </returns>
- Public Overloads Function Equals(ByVal other As cSemanticVersion) As Boolean Implements IEquatable(Of CSE.cSemanticVersion).Equals
+ Public Overloads Function Equals(ByVal other As cSemanticVersion) As Boolean Implements IEquatable(Of AirDrag.cSemanticVersion).Equals
If (other Is Me) Then Return True
If (other Is Nothing) Then Return False
diff --git a/CSE/declaration_public.vb b/CSE/declaration_public.vb
index 5de32b5044c9111a3432424bb7696c26781383ef..edd645c474d080a1329cf5e1369a143368775063 100644
--- a/CSE/declaration_public.vb
+++ b/CSE/declaration_public.vb
@@ -12,8 +12,8 @@
Module declaration_public
' Description of the form
- Public Const AppName As String = "VECTO_CSE" ' Name of the programm
- Public Const AppVers As String = "2.0.4-beta6" ' Version of the Programm
+ Public Const AppName As String = "Air Drag" ' Name of the programm
+ Public Const AppVers As String = "2.0.5-beta6" ' Version of the Programm
Public AppDate As String ' Date of the compilation of the programm
' Control variables
diff --git a/DemoData/EvaluationDemo.csjob.json b/DemoData/EvaluationDemo.csjob.json
index 8e0918aafc44dc3845ab583083a2598fd691dc4a..bd04f486932c3bff6dfb4455e566f8b3cd512f13 100644
--- a/DemoData/EvaluationDemo.csjob.json
+++ b/DemoData/EvaluationDemo.csjob.json
@@ -1,9 +1,9 @@
{
"Header": {
- "Title": "vecto-cse JOB",
+ "Title": "VECTO-Air Drag JOB",
"FileVersion": "1.0.0",
- "AppVersion": "2.0.3-beta6",
- "ModifiedDate": "2015.07.23 13:10:27 +02:00",
+ "AppVersion": "2.0.5-beta6",
+ "ModifiedDate": "2015.11.25 13:10:59 +01:00",
"CreatedBy": "VKMTHD\\martindippold@Dippold(lic: 88070b7c-1b69-4d65-a112-10c57f86f5ad)",
"StrictBody": null,
"BodySchema": null
@@ -66,11 +66,11 @@
"fa_pe": 1.0,
"fv_pe": 1.123,
"beta_ame": -0.02,
- "CdxAß": 5.17138,
+ "CdxAß": 5.16922,
"beta": 0.95404,
"delta_CdxA": 0.0292,
- "CdxA0": 5.14219,
- "CdxA0_opt2": 5.13966,
+ "CdxA0": 5.14002,
+ "CdxA0_opt2": 5.1375,
"valid_t_amb": true,
"valid_RRC": false,
"valid_t_ground": true
diff --git a/DemoData/StandardCriteria.cscrt.json b/DemoData/StandardCriteria.cscrt.json
index 4b1508db5eb5768b118aaac1ffcd11211c663511..5381b87d825f8c16616034ecb5320463844710c5 100644
--- a/DemoData/StandardCriteria.cscrt.json
+++ b/DemoData/StandardCriteria.cscrt.json
@@ -1,9 +1,9 @@
{
"Header": {
- "Title": "vecto-cse CRITERIA",
+ "Title": "VECTO-Air Drag CRITERIA",
"FileVersion": "1.0.0",
- "AppVersion": "2.0.3-beta6",
- "ModifiedDate": "2015.07.22 09:50:03 +02:00",
+ "AppVersion": "2.0.5-beta6",
+ "ModifiedDate": "2015.11.25 13:26:40 +01:00",
"CreatedBy": "VKMTHD\\martindippold@Dippold(lic: 88070b7c-1b69-4d65-a112-10c57f86f5ad)",
"StrictBody": null,
"BodySchema": null
diff --git a/DemoData/VECTO-CSE3.0_InputData_V2.0.4_DemoData.xlsm b/DemoData/VECTO-Air Drag_InputData_V2.0.5_DemoData.xlsm
similarity index 99%
rename from DemoData/VECTO-CSE3.0_InputData_V2.0.4_DemoData.xlsm
rename to DemoData/VECTO-Air Drag_InputData_V2.0.5_DemoData.xlsm
index 8c4508958d161ba603abf4a637434a79a06f7085..8a871d03a306ee2177cd1537fdbc738020de3fdd 100644
Binary files a/DemoData/VECTO-CSE3.0_InputData_V2.0.4_DemoData.xlsm and b/DemoData/VECTO-Air Drag_InputData_V2.0.5_DemoData.xlsm differ
diff --git a/DemoData/VehicleDemo.csveh.json b/DemoData/VehicleDemo.csveh.json
index 206d5b73b9042f37cb2b456321ab06f174d6b6f1..cd8edeb6b2d8fc246150e19aab91c88977a95161 100644
--- a/DemoData/VehicleDemo.csveh.json
+++ b/DemoData/VehicleDemo.csveh.json
@@ -1,6 +1,6 @@
{
"Header": {
- "Title": "vecto-cse VEHICLE",
+ "Title": "VECTO-Air Drag VEHICLE",
"FileVersion": "1.0.0",
"AppVersion": "2.0.1-pre1",
"ModifiedDate": "2014/05/28 00:33:50 +02:00",
diff --git a/Docs/JIRA Quick Start Guide.docx b/Docs/JIRA Quick Start Guide.docx
index b869a6a4e10e349f972d32adb10ba5f0a4c28088..878b46ac0c4511f4aa5424645916f35abf468527 100644
Binary files a/Docs/JIRA Quick Start Guide.docx and b/Docs/JIRA Quick Start Guide.docx differ
diff --git a/Docs/JIRA Quick Start Guide.pdf b/Docs/JIRA Quick Start Guide.pdf
index 02329fe5b8baf19006d2faced11fe65a1605f3e8..5dc350a20f20f723a6871a8127aaddd777e463ec 100644
Binary files a/Docs/JIRA Quick Start Guide.pdf and b/Docs/JIRA Quick Start Guide.pdf differ
diff --git a/Docs/VECTO-CSE_ReleaseNotes_2.0.4-beta6.pdf b/Docs/VECTO-Air Drag_ReleaseNotes_2.0.5-beta6.pdf
similarity index 54%
rename from Docs/VECTO-CSE_ReleaseNotes_2.0.4-beta6.pdf
rename to Docs/VECTO-Air Drag_ReleaseNotes_2.0.5-beta6.pdf
index ef1c14ecb5b36de7ed2e0fdf0099700ced64eb8f..bcab256135aebf386ee4da6cffd2ccaf4641f9bb 100644
Binary files a/Docs/VECTO-CSE_ReleaseNotes_2.0.4-beta6.pdf and b/Docs/VECTO-Air Drag_ReleaseNotes_2.0.5-beta6.pdf differ
diff --git a/Docs/VECTO_CSE-User Manual_2.0.4-beta6.pdf b/Docs/VECTO_Air Drag-User Manual_2.0.5-beta6.pdf
similarity index 53%
rename from Docs/VECTO_CSE-User Manual_2.0.4-beta6.pdf
rename to Docs/VECTO_Air Drag-User Manual_2.0.5-beta6.pdf
index 96c489f985a613916b24424e8503906f793ef662..fe7dc1092cc026ca2aca9380b343099932bbc911 100644
Binary files a/Docs/VECTO_CSE-User Manual_2.0.4-beta6.pdf and b/Docs/VECTO_Air Drag-User Manual_2.0.5-beta6.pdf differ