From cc6a8107355e4cb9da47d20069228858966d1d27 Mon Sep 17 00:00:00 2001
From: "ankostis@host:STUW025" <ankostis@gmail.com>
Date: Tue, 27 May 2014 13:03:11 +0200
Subject: [PATCH] Rename GUI classes: CSE_XXX-->F_Main to conform to a single
naming-scheme for both VECTO and CSE.
---
CSE/CSE.vbproj | 30 +--
...SE_Info.Designer.vb => F_Info.Designer.vb} | 4 +-
CSE/GUI/{CSE_Info.resx => F_Info.resx} | 0
CSE/GUI/{CSE_Info.vb => F_Info.vb} | 10 +-
...CSEMain.Designer.vb => F_Main.Designer.vb} | 4 +-
CSE/GUI/{CSEMain.resx => F_Main.resx} | 0
CSE/GUI/{CSEMain.vb => F_Main.vb} | 8 +-
....designer.vb => F_Preferences.designer.vb} | 10 +-
...SE_Preferences.resx => F_Preferences.resx} | 0
.../{CSE_Preferences.vb => F_Preferences.vb} | 6 +-
CSE/GUI/minor_routines_GUI.vb | 250 +++++++++---------
CSE/My Project/Application.Designer.vb | 2 +-
CSE/My Project/Application.myapp | 4 +-
CSE/Tools/Minor_routines.vb | 38 +--
14 files changed, 185 insertions(+), 181 deletions(-)
rename CSE/GUI/{CSE_Info.Designer.vb => F_Info.Designer.vb} (99%)
rename CSE/GUI/{CSE_Info.resx => F_Info.resx} (100%)
rename CSE/GUI/{CSE_Info.vb => F_Info.vb} (73%)
rename CSE/GUI/{CSEMain.Designer.vb => F_Main.Designer.vb} (99%)
rename CSE/GUI/{CSEMain.resx => F_Main.resx} (100%)
rename CSE/GUI/{CSEMain.vb => F_Main.vb} (99%)
rename CSE/GUI/{CSE_Preferences.designer.vb => F_Preferences.designer.vb} (98%)
rename CSE/GUI/{CSE_Preferences.resx => F_Preferences.resx} (100%)
rename CSE/GUI/{CSE_Preferences.vb => F_Preferences.vb} (96%)
diff --git a/CSE/CSE.vbproj b/CSE/CSE.vbproj
index 1c4bfe7..c6d254e 100644
--- a/CSE/CSE.vbproj
+++ b/CSE/CSE.vbproj
@@ -123,16 +123,16 @@
<Compile Include="GUI\Export_GUI.vb" />
<Compile Include="GUI\minor_routines_GUI.vb" />
<Compile Include="GUI\cFileBrowser.vb" />
- <Compile Include="GUI\CSE_Preferences.designer.vb">
- <DependentUpon>CSE_Preferences.vb</DependentUpon>
+ <Compile Include="GUI\F_Preferences.designer.vb">
+ <DependentUpon>F_Preferences.vb</DependentUpon>
</Compile>
- <Compile Include="GUI\CSE_Preferences.vb">
+ <Compile Include="GUI\F_Preferences.vb">
<SubType>Form</SubType>
</Compile>
- <Compile Include="GUI\CSE_Info.Designer.vb">
- <DependentUpon>CSE_Info.vb</DependentUpon>
+ <Compile Include="GUI\F_Info.Designer.vb">
+ <DependentUpon>F_Info.vb</DependentUpon>
</Compile>
- <Compile Include="GUI\CSE_Info.vb">
+ <Compile Include="GUI\F_Info.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="declaration_public.vb" />
@@ -148,10 +148,10 @@
<Compile Include="GUI\FB_FavDlog.vb">
<SubType>Form</SubType>
</Compile>
- <Compile Include="GUI\CSEMain.Designer.vb">
- <DependentUpon>CSEMain.vb</DependentUpon>
+ <Compile Include="GUI\F_Main.Designer.vb">
+ <DependentUpon>F_Main.vb</DependentUpon>
</Compile>
- <Compile Include="GUI\CSEMain.vb">
+ <Compile Include="GUI\F_Main.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="My Project\AssemblyInfo.vb" />
@@ -176,11 +176,11 @@
<Compile Include="CSE_Types.vb" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="GUI\CSE_Preferences.resx">
- <DependentUpon>CSE_Preferences.vb</DependentUpon>
+ <EmbeddedResource Include="GUI\F_Preferences.resx">
+ <DependentUpon>F_Preferences.vb</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="GUI\CSE_Info.resx">
- <DependentUpon>CSE_Info.vb</DependentUpon>
+ <EmbeddedResource Include="GUI\F_Info.resx">
+ <DependentUpon>F_Info.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\FB_Dialog.resx">
<DependentUpon>FB_Dialog.vb</DependentUpon>
@@ -188,8 +188,8 @@
<EmbeddedResource Include="GUI\FB_FavDlog.resx">
<DependentUpon>FB_FavDlog.vb</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="GUI\CSEMain.resx">
- <DependentUpon>CSEMain.vb</DependentUpon>
+ <EmbeddedResource Include="GUI\F_Main.resx">
+ <DependentUpon>F_Main.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="My Project\Resources.resx">
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
diff --git a/CSE/GUI/CSE_Info.Designer.vb b/CSE/GUI/F_Info.Designer.vb
similarity index 99%
rename from CSE/GUI/CSE_Info.Designer.vb
rename to CSE/GUI/F_Info.Designer.vb
index 62f19cc..5fff9bf 100644
--- a/CSE/GUI/CSE_Info.Designer.vb
+++ b/CSE/GUI/F_Info.Designer.vb
@@ -1,5 +1,5 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class CSE_Info
+Partial Class F_Info
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -22,7 +22,7 @@ Partial Class CSE_Info
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(CSE_Info))
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_Info))
Me.Label1 = New System.Windows.Forms.Label()
Me.Label3 = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
diff --git a/CSE/GUI/CSE_Info.resx b/CSE/GUI/F_Info.resx
similarity index 100%
rename from CSE/GUI/CSE_Info.resx
rename to CSE/GUI/F_Info.resx
diff --git a/CSE/GUI/CSE_Info.vb b/CSE/GUI/F_Info.vb
similarity index 73%
rename from CSE/GUI/CSE_Info.vb
rename to CSE/GUI/F_Info.vb
index 450d49b..1a96ab4 100644
--- a/CSE/GUI/CSE_Info.vb
+++ b/CSE/GUI/F_Info.vb
@@ -1,4 +1,4 @@
-Public Class CSE_Info
+Public Class F_Info
'Initialisation
@@ -11,15 +11,15 @@ Public Class CSE_Info
System.Diagnostics.Process.Start("mailto:rexeis@ivt.tugraz.at")
End Sub
- Private Sub LinkJRC1_LinkClicked(sender As Object, e As System.Windows.Forms.LinkLabelLinkClickedEventArgs)
+ Private Sub LinkJRC1_LinkClicked(ByVal sender As Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs)
System.Diagnostics.Process.Start("mailto:georgios.fontaras@jrc.ec.europa.eu")
End Sub
- Private Sub LinkJRC2_LinkClicked(sender As Object, e As System.Windows.Forms.LinkLabelLinkClickedEventArgs)
+ Private Sub LinkJRC2_LinkClicked(ByVal sender As Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs)
System.Diagnostics.Process.Start("mailto:panagiota.dilara@jrc.ec.europa.eu")
End Sub
'----------------------------------------------------------------------------
- Private Sub LinkLicensed_LinkClicked(sender As System.Object, e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles LinkLicensed.LinkClicked
+ Private Sub LinkLicensed_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles LinkLicensed.LinkClicked
System.Diagnostics.Process.Start("https://joinup.ec.europa.eu/software/page/eupl")
End Sub
@@ -31,7 +31,7 @@ Public Class CSE_Info
System.Diagnostics.Process.Start("http://www.tugraz.at/")
End Sub
'----------------------------------------------------------------------------
- Private Sub PictureBoxJRC_Click(sender As System.Object, e As System.EventArgs) Handles PictureBoxJRC.Click
+ Private Sub PictureBoxJRC_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles PictureBoxJRC.Click
System.Diagnostics.Process.Start("http://ec.europa.eu/dgs/jrc/index.cfm")
End Sub
End Class
\ No newline at end of file
diff --git a/CSE/GUI/CSEMain.Designer.vb b/CSE/GUI/F_Main.Designer.vb
similarity index 99%
rename from CSE/GUI/CSEMain.Designer.vb
rename to CSE/GUI/F_Main.Designer.vb
index c8b8544..fafda31 100644
--- a/CSE/GUI/CSEMain.Designer.vb
+++ b/CSE/GUI/F_Main.Designer.vb
@@ -1,5 +1,5 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class CSEMain
+Partial Class F_Main
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -22,7 +22,7 @@ Partial Class CSEMain
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(CSEMain))
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_Main))
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
Me.DataToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItemNew = New System.Windows.Forms.ToolStripMenuItem()
diff --git a/CSE/GUI/CSEMain.resx b/CSE/GUI/F_Main.resx
similarity index 100%
rename from CSE/GUI/CSEMain.resx
rename to CSE/GUI/F_Main.resx
diff --git a/CSE/GUI/CSEMain.vb b/CSE/GUI/F_Main.vb
similarity index 99%
rename from CSE/GUI/CSEMain.vb
rename to CSE/GUI/F_Main.vb
index 680d123..2171c05 100644
--- a/CSE/GUI/CSEMain.vb
+++ b/CSE/GUI/F_Main.vb
@@ -1,6 +1,6 @@
Imports System.IO
-Public Class CSEMain
+Public Class F_Main
' Declarations
Private ToolstripSave As Boolean = False
Private ToolstripSaveAs As Boolean = False
@@ -9,7 +9,7 @@ Public Class CSEMain
Private Cali As Boolean = True
' Load the GUI
- Private Sub CSEMain_Load(sender As System.Object, e As System.EventArgs) Handles Me.Load
+ Private Sub CSEMain_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Me.Load
' Declarations
Dim configL As Boolean = True
Dim NoLegFile As Boolean = False
@@ -462,7 +462,7 @@ Public Class CSEMain
' Menu open the config file
Private Sub ToolStripMenuItemOption_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripMenuItemOption.Click
' Show the confic GUI
- CSE_Preferences.Show()
+ F_Preferences.Show()
End Sub
#End Region
@@ -477,7 +477,7 @@ Public Class CSEMain
' Menu open the Infobox
Private Sub ToolStripMenuItemAbout_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripMenuItemAbout.Click
' Show the info GUI
- CSE_Info.Show()
+ F_Info.Show()
End Sub
' Menu open the user manual
diff --git a/CSE/GUI/CSE_Preferences.designer.vb b/CSE/GUI/F_Preferences.designer.vb
similarity index 98%
rename from CSE/GUI/CSE_Preferences.designer.vb
rename to CSE/GUI/F_Preferences.designer.vb
index 71654dd..c9a9c7b 100644
--- a/CSE/GUI/CSE_Preferences.designer.vb
+++ b/CSE/GUI/F_Preferences.designer.vb
@@ -1,5 +1,5 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class CSE_Preferences
+Partial Class F_Preferences
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -22,7 +22,7 @@ Partial Class CSE_Preferences
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(CSE_Preferences))
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_Preferences))
Me.TextBoxWorDir = New System.Windows.Forms.TextBox()
Me.ButtonSelectWorDir = New System.Windows.Forms.Button()
Me.GroupBoxWorDir = New System.Windows.Forms.GroupBox()
@@ -73,7 +73,7 @@ Partial Class CSE_Preferences
Me.GroupBoxWorDir.Size = New System.Drawing.Size(490, 51)
Me.GroupBoxWorDir.TabIndex = 2
Me.GroupBoxWorDir.TabStop = False
- Me.GroupBoxWorDir.Text = "Standard Working Directory"
+ Me.GroupBoxWorDir.Text = "Working Directory"
'
'ButtonOK
'
@@ -215,7 +215,7 @@ Partial Class CSE_Preferences
Me.TextBoxNotepad.Size = New System.Drawing.Size(444, 20)
Me.TextBoxNotepad.TabIndex = 1
'
- 'CSE_Config
+ 'CSE_Preferences
'
Me.AcceptButton = Me.ButtonOK
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -230,7 +230,7 @@ Partial Class CSE_Preferences
Me.MaximizeBox = False
Me.MinimizeBox = False
Me.MinimumSize = New System.Drawing.Size(521, 294)
- Me.Name = "CSE_Config"
+ Me.Name = "CSE_Preferences"
Me.Text = "Preferences"
Me.GroupBoxWorDir.ResumeLayout(False)
Me.GroupBoxWorDir.PerformLayout()
diff --git a/CSE/GUI/CSE_Preferences.resx b/CSE/GUI/F_Preferences.resx
similarity index 100%
rename from CSE/GUI/CSE_Preferences.resx
rename to CSE/GUI/F_Preferences.resx
diff --git a/CSE/GUI/CSE_Preferences.vb b/CSE/GUI/F_Preferences.vb
similarity index 96%
rename from CSE/GUI/CSE_Preferences.vb
rename to CSE/GUI/F_Preferences.vb
index fc5480f..1019d92 100644
--- a/CSE/GUI/CSE_Preferences.vb
+++ b/CSE/GUI/F_Preferences.vb
@@ -1,4 +1,4 @@
-Public Class CSE_Preferences
+Public Class F_Preferences
' Load confic
Private Sub F03_Options_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
@@ -122,5 +122,9 @@ Public Class CSE_Preferences
Private Sub TextBoxLogSize_Leave(ByVal sender As Object, ByVal e As System.EventArgs) Handles TextBoxLogSize.Leave
If Me.TextBoxLogSize.Text = Nothing Then Me.TextBoxLogSize.Text = 2
End Sub
+
+ Private Sub GroupBoxWorDir_Enter(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles GroupBoxWorDir.Enter
+
+ End Sub
End Class
diff --git a/CSE/GUI/minor_routines_GUI.vb b/CSE/GUI/minor_routines_GUI.vb
index cb62d79..35fb5bf 100644
--- a/CSE/GUI/minor_routines_GUI.vb
+++ b/CSE/GUI/minor_routines_GUI.vb
@@ -10,27 +10,27 @@
If Fields Then
' Clear the Textboxes or set them to default
- CSEMain.TextBoxVeh1.Clear()
- CSEMain.TextBoxWeather.Clear()
- CSEMain.TextBoxAirf.Text = 1
- CSEMain.TextBoxAird.Text = 0
- CSEMain.TextBoxbetaf.Text = 1
- CSEMain.TextBoxbetad.Text = 0
- CSEMain.CheckBoxAcc.Checked = True
- CSEMain.CheckBoxGrd.Checked = False
+ F_Main.TextBoxVeh1.Clear()
+ F_Main.TextBoxWeather.Clear()
+ F_Main.TextBoxAirf.Text = 1
+ F_Main.TextBoxAird.Text = 0
+ F_Main.TextBoxbetaf.Text = 1
+ F_Main.TextBoxbetad.Text = 0
+ F_Main.CheckBoxAcc.Checked = True
+ F_Main.CheckBoxGrd.Checked = False
' Calibration fields
- CSEMain.TextBoxDataC.Clear()
- CSEMain.TextBoxMSCC.Clear()
- CSEMain.TextBoxRRC.Text = 1.0
+ F_Main.TextBoxDataC.Clear()
+ F_Main.TextBoxMSCC.Clear()
+ F_Main.TextBoxRRC.Text = 1.0
' Test run fields
- CSEMain.TextBoxMSCT.Clear()
- CSEMain.TextBoxDataLS1.Clear()
- CSEMain.TextBoxDataHS.Clear()
- CSEMain.TextBoxDataLS2.Clear()
+ F_Main.TextBoxMSCT.Clear()
+ F_Main.TextBoxDataLS1.Clear()
+ F_Main.TextBoxDataHS.Clear()
+ F_Main.TextBoxDataLS2.Clear()
- CSEMain.ButtonEval.Enabled = False
+ F_Main.ButtonEval.Enabled = False
' Option parameters to standard
StdParameter()
@@ -38,11 +38,11 @@
End If
' Clear the Warning and Error box
- CSEMain.ListBoxWar.Items.Clear()
- CSEMain.ListBoxErr.Items.Clear()
- CSEMain.TabControlOutMsg.SelectTab(0)
- CSEMain.TabPageErr.Text = "Errors (0)"
- CSEMain.TabPageWar.Text = "Warnings (0)"
+ F_Main.ListBoxWar.Items.Clear()
+ F_Main.ListBoxErr.Items.Clear()
+ F_Main.TabControlOutMsg.SelectTab(0)
+ F_Main.TabPageErr.Text = "Errors (0)"
+ F_Main.TabPageWar.Text = "Warnings (0)"
Return True
End Function
@@ -245,21 +245,21 @@
' Transfer the data to the GUI
' General
- CSEMain.TextBoxVeh1.Text = Vehspez
- CSEMain.TextBoxAirf.Text = AnemIC(1)
- CSEMain.TextBoxAird.Text = AnemIC(2)
- CSEMain.TextBoxbetaf.Text = AnemIC(3)
- CSEMain.TextBoxbetad.Text = AnemIC(4)
- CSEMain.TextBoxWeather.Text = Ambspez
+ F_Main.TextBoxVeh1.Text = Vehspez
+ F_Main.TextBoxAirf.Text = AnemIC(1)
+ F_Main.TextBoxAird.Text = AnemIC(2)
+ F_Main.TextBoxbetaf.Text = AnemIC(3)
+ F_Main.TextBoxbetad.Text = AnemIC(4)
+ F_Main.TextBoxWeather.Text = Ambspez
' Calibration
- CSEMain.TextBoxMSCC.Text = MSCCSpez
- CSEMain.TextBoxDataC.Text = DataSpez(1)
+ F_Main.TextBoxMSCC.Text = MSCCSpez
+ F_Main.TextBoxDataC.Text = DataSpez(1)
' Test
- CSEMain.TextBoxMSCT.Text = MSCTSpez
- CSEMain.TextBoxRRC.Text = RRC
- CSEMain.TextBoxDataLS1.Text = DataSpez(2)
- CSEMain.TextBoxDataHS.Text = DataSpez(3)
- CSEMain.TextBoxDataLS2.Text = DataSpez(4)
+ F_Main.TextBoxMSCT.Text = MSCTSpez
+ F_Main.TextBoxRRC.Text = RRC
+ F_Main.TextBoxDataLS1.Text = DataSpez(2)
+ F_Main.TextBoxDataHS.Text = DataSpez(3)
+ F_Main.TextBoxDataLS2.Text = DataSpez(4)
' Options
WriteParToTB()
@@ -383,23 +383,23 @@
Dim i As Integer
' Read the data from the textboxes (General)
- Vehspez = CSEMain.TextBoxVeh1.Text
- Ambspez = CSEMain.TextBoxWeather.Text
- AnemIC(1) = CSEMain.TextBoxAirf.Text
- AnemIC(2) = CSEMain.TextBoxAird.Text
- AnemIC(3) = CSEMain.TextBoxbetaf.Text
- AnemIC(4) = CSEMain.TextBoxbetad.Text
+ Vehspez = F_Main.TextBoxVeh1.Text
+ Ambspez = F_Main.TextBoxWeather.Text
+ AnemIC(1) = F_Main.TextBoxAirf.Text
+ AnemIC(2) = F_Main.TextBoxAird.Text
+ AnemIC(3) = F_Main.TextBoxbetaf.Text
+ AnemIC(4) = F_Main.TextBoxbetad.Text
' Appropriate the inputfiles from calibration run
- DataSpez(1) = CSEMain.TextBoxDataC.Text
- MSCCSpez = CSEMain.TextBoxMSCC.Text
+ DataSpez(1) = F_Main.TextBoxDataC.Text
+ MSCCSpez = F_Main.TextBoxMSCC.Text
' Appropriate the inputfiles from test run
- DataSpez(2) = CSEMain.TextBoxDataLS1.Text
- DataSpez(3) = CSEMain.TextBoxDataHS.Text
- DataSpez(4) = CSEMain.TextBoxDataLS2.Text
- MSCTSpez = CSEMain.TextBoxMSCT.Text
- RRC = CSEMain.TextBoxRRC.Text
+ DataSpez(2) = F_Main.TextBoxDataLS1.Text
+ DataSpez(3) = F_Main.TextBoxDataHS.Text
+ DataSpez(4) = F_Main.TextBoxDataLS2.Text
+ MSCTSpez = F_Main.TextBoxMSCT.Text
+ RRC = F_Main.TextBoxRRC.Text
' Get the option parameter
If Not fgetPar() Then Return False
@@ -423,57 +423,57 @@
' Get the parameters from option tab
Function fgetPar() As Boolean
' Evaluation box
- If CSEMain.CheckBoxAcc.Checked Then AccC = True
- If CSEMain.CheckBoxGrd.Checked Then GradC = True
+ If F_Main.CheckBoxAcc.Checked Then AccC = True
+ If F_Main.CheckBoxGrd.Checked Then GradC = True
' Output box
- If CSEMain.RB1Hz.Checked Then HzOut = 1
- If CSEMain.RB100Hz.Checked Then HzOut = 100
+ If F_Main.RB1Hz.Checked Then HzOut = 1
+ If F_Main.RB100Hz.Checked Then HzOut = 100
'Parameter boxes
' General valid criteria
- delta_t_tire_max = CSEMain.TBDeltaTTireMax.Text
- delta_RRC_max = CSEMain.TBDeltaRRCMax.Text
- t_amb_var = CSEMain.TBTambVar.Text
- t_amb_tarmac = CSEMain.TBTambTamac.Text
- t_amb_max = CSEMain.TBTambMax.Text
- t_amb_min = CSEMain.TBTambMin.Text
+ delta_t_tire_max = F_Main.TBDeltaTTireMax.Text
+ delta_RRC_max = F_Main.TBDeltaRRCMax.Text
+ t_amb_var = F_Main.TBTambVar.Text
+ t_amb_tarmac = F_Main.TBTambTamac.Text
+ t_amb_max = F_Main.TBTambMax.Text
+ t_amb_min = F_Main.TBTambMin.Text
' General
- delta_Hz_max = CSEMain.TBDeltaHzMax.Text
- roh_air_ref = CSEMain.TBRhoAirRef.Text
- acc_corr_ave = CSEMain.TBAccCorrAve.Text
- delta_parallel_max = CSEMain.TBDeltaParaMax.Text
+ delta_Hz_max = F_Main.TBDeltaHzMax.Text
+ roh_air_ref = F_Main.TBRhoAirRef.Text
+ acc_corr_ave = F_Main.TBAccCorrAve.Text
+ delta_parallel_max = F_Main.TBDeltaParaMax.Text
' Identification of measurement section
- delta_x_max = CSEMain.TBDeltaXMax.Text
- delta_y_max = CSEMain.TBDeltaYMax.Text
- delta_head_max = CSEMain.TBDeltaHeadMax.Text
+ delta_x_max = F_Main.TBDeltaXMax.Text
+ delta_y_max = F_Main.TBDeltaYMax.Text
+ delta_head_max = F_Main.TBDeltaHeadMax.Text
' Requirements on number of valid datasets
- ds_min_CAL = CSEMain.TBDsMinCAL.Text
- ds_min_LS = CSEMain.TBDsMinLS.Text
- ds_min_HS = CSEMain.TBDsMinHS.Text
- ds_min_head_MS = CSEMain.TBDsMinHeadHS.Text
+ ds_min_CAL = F_Main.TBDsMinCAL.Text
+ ds_min_LS = F_Main.TBDsMinLS.Text
+ ds_min_HS = F_Main.TBDsMinHS.Text
+ ds_min_head_MS = F_Main.TBDsMinHeadHS.Text
' DataSet validity criteria
- dist_float = CSEMain.TBDistFloat.Text
+ dist_float = F_Main.TBDistFloat.Text
' Calibration
- v_wind_ave_CAL_max = CSEMain.TBvWindAveCALMax.Text
- v_wind_1s_CAL_max = CSEMain.TBvWind1sCALMax.Text
- beta_ave_CAL_max = CSEMain.TBBetaAveCALMax.Text
+ v_wind_ave_CAL_max = F_Main.TBvWindAveCALMax.Text
+ v_wind_1s_CAL_max = F_Main.TBvWind1sCALMax.Text
+ beta_ave_CAL_max = F_Main.TBBetaAveCALMax.Text
' Low and high speed test
- leng_crit = CSEMain.TBLengCrit.Text
+ leng_crit = F_Main.TBLengCrit.Text
' Low speed test
- v_wind_ave_LS_max = CSEMain.TBvWindAveLSMax.Text
- v_wind_1s_LS_max = CSEMain.TBvWind1sLSMax.Text
- v_veh_ave_LS_max = CSEMain.TBvVehAveLSMax.Text
- v_veh_ave_LS_min = CSEMain.TBvVehAveLSMin.Text
- v_veh_float_delta = CSEMain.TBvVehFloatD.Text
- tq_sum_float_delta = CSEMain.TBTqSumFloatD.Text
+ v_wind_ave_LS_max = F_Main.TBvWindAveLSMax.Text
+ v_wind_1s_LS_max = F_Main.TBvWind1sLSMax.Text
+ v_veh_ave_LS_max = F_Main.TBvVehAveLSMax.Text
+ v_veh_ave_LS_min = F_Main.TBvVehAveLSMin.Text
+ v_veh_float_delta = F_Main.TBvVehFloatD.Text
+ tq_sum_float_delta = F_Main.TBTqSumFloatD.Text
' High speed test
- v_wind_ave_HS_max = CSEMain.TBvWindAveHSMax.Text
- v_wind_1s_HS_max = CSEMain.TBvWind1sHSMax.Text
- v_veh_ave_HS_min = CSEMain.TBvVehAveHSMin.Text
- beta_ave_HS_max = CSEMain.TBBetaAveHSMax.Text
- v_veh_1s_delta = CSEMain.TBvVeh1sD.Text
- tq_sum_1s_delta = CSEMain.TBTq1sD.Text
+ v_wind_ave_HS_max = F_Main.TBvWindAveHSMax.Text
+ v_wind_1s_HS_max = F_Main.TBvWind1sHSMax.Text
+ v_veh_ave_HS_min = F_Main.TBvVehAveHSMin.Text
+ beta_ave_HS_max = F_Main.TBBetaAveHSMax.Text
+ v_veh_1s_delta = F_Main.TBvVeh1sD.Text
+ tq_sum_1s_delta = F_Main.TBTq1sD.Text
Return True
End Function
@@ -482,64 +482,64 @@
Function WriteParToTB() As Boolean
' Write the Standard values in the textboxes
' General valid criteria
- CSEMain.TBDeltaTTireMax.Text = delta_t_tire_max
- CSEMain.TBDeltaRRCMax.Text = delta_RRC_max
- CSEMain.TBTambVar.Text = t_amb_var
- CSEMain.TBTambTamac.Text = t_amb_tarmac
- CSEMain.TBTambMax.Text = t_amb_max
- CSEMain.TBTambMin.Text = t_amb_min
+ F_Main.TBDeltaTTireMax.Text = delta_t_tire_max
+ F_Main.TBDeltaRRCMax.Text = delta_RRC_max
+ F_Main.TBTambVar.Text = t_amb_var
+ F_Main.TBTambTamac.Text = t_amb_tarmac
+ F_Main.TBTambMax.Text = t_amb_max
+ F_Main.TBTambMin.Text = t_amb_min
' General
- CSEMain.TBDeltaHzMax.Text = delta_Hz_max
- CSEMain.TBRhoAirRef.Text = roh_air_ref
- CSEMain.TBAccCorrAve.Text = acc_corr_ave
- CSEMain.TBDeltaParaMax.Text = delta_parallel_max
+ F_Main.TBDeltaHzMax.Text = delta_Hz_max
+ F_Main.TBRhoAirRef.Text = roh_air_ref
+ F_Main.TBAccCorrAve.Text = acc_corr_ave
+ F_Main.TBDeltaParaMax.Text = delta_parallel_max
' Identification of measurement section
- CSEMain.TBDeltaXMax.Text = delta_x_max
- CSEMain.TBDeltaYMax.Text = delta_y_max
- CSEMain.TBDeltaHeadMax.Text = delta_head_max
+ F_Main.TBDeltaXMax.Text = delta_x_max
+ F_Main.TBDeltaYMax.Text = delta_y_max
+ F_Main.TBDeltaHeadMax.Text = delta_head_max
' Requirements on number of valid datasets
- CSEMain.TBDsMinCAL.Text = ds_min_CAL
- CSEMain.TBDsMinLS.Text = ds_min_LS
- CSEMain.TBDsMinHS.Text = ds_min_HS
- CSEMain.TBDsMinHeadHS.Text = ds_min_head_MS
+ F_Main.TBDsMinCAL.Text = ds_min_CAL
+ F_Main.TBDsMinLS.Text = ds_min_LS
+ F_Main.TBDsMinHS.Text = ds_min_HS
+ F_Main.TBDsMinHeadHS.Text = ds_min_head_MS
' DataSet validity criteria
- CSEMain.TBDistFloat.Text = dist_float
+ F_Main.TBDistFloat.Text = dist_float
' Calibration
- CSEMain.TBvWindAveCALMax.Text = v_wind_ave_CAL_max
- CSEMain.TBvWind1sCALMax.Text = v_wind_1s_CAL_max
- CSEMain.TBBetaAveCALMax.Text = beta_ave_CAL_max
+ F_Main.TBvWindAveCALMax.Text = v_wind_ave_CAL_max
+ F_Main.TBvWind1sCALMax.Text = v_wind_1s_CAL_max
+ F_Main.TBBetaAveCALMax.Text = beta_ave_CAL_max
' Low and high speed test
- CSEMain.TBLengCrit.Text = leng_crit
+ F_Main.TBLengCrit.Text = leng_crit
' Low speed test
- CSEMain.TBvWindAveLSMax.Text = v_wind_ave_LS_max
- CSEMain.TBvWind1sLSMax.Text = v_wind_1s_LS_max
- CSEMain.TBvVehAveLSMax.Text = v_veh_ave_LS_max
- CSEMain.TBvVehAveLSMin.Text = v_veh_ave_LS_min
- CSEMain.TBvVehFloatD.Text = v_veh_float_delta
- CSEMain.TBTqSumFloatD.Text = tq_sum_float_delta
+ F_Main.TBvWindAveLSMax.Text = v_wind_ave_LS_max
+ F_Main.TBvWind1sLSMax.Text = v_wind_1s_LS_max
+ F_Main.TBvVehAveLSMax.Text = v_veh_ave_LS_max
+ F_Main.TBvVehAveLSMin.Text = v_veh_ave_LS_min
+ F_Main.TBvVehFloatD.Text = v_veh_float_delta
+ F_Main.TBTqSumFloatD.Text = tq_sum_float_delta
' High speed test
- CSEMain.TBvWindAveHSMax.Text = v_wind_ave_HS_max
- CSEMain.TBvWind1sHSMax.Text = v_wind_1s_HS_max
- CSEMain.TBvVehAveHSMin.Text = v_veh_ave_HS_min
- CSEMain.TBBetaAveHSMax.Text = beta_ave_HS_max
- CSEMain.TBvVeh1sD.Text = v_veh_1s_delta
- CSEMain.TBTq1sD.Text = tq_sum_1s_delta
+ F_Main.TBvWindAveHSMax.Text = v_wind_ave_HS_max
+ F_Main.TBvWind1sHSMax.Text = v_wind_1s_HS_max
+ F_Main.TBvVehAveHSMin.Text = v_veh_ave_HS_min
+ F_Main.TBBetaAveHSMax.Text = beta_ave_HS_max
+ F_Main.TBvVeh1sD.Text = v_veh_1s_delta
+ F_Main.TBTq1sD.Text = tq_sum_1s_delta
' Evaluation box
If AccC Then
- CSEMain.CheckBoxAcc.Checked = True
+ F_Main.CheckBoxAcc.Checked = True
Else
- CSEMain.CheckBoxAcc.Checked = False
+ F_Main.CheckBoxAcc.Checked = False
End If
If GradC Then
- CSEMain.CheckBoxGrd.Checked = True
+ F_Main.CheckBoxGrd.Checked = True
Else
- CSEMain.CheckBoxGrd.Checked = False
+ F_Main.CheckBoxGrd.Checked = False
End If
' Output
If HzOut = 1 Then
- CSEMain.RB1Hz.Checked = True
+ F_Main.RB1Hz.Checked = True
ElseIf HzOut = 100 Then
- CSEMain.RB100Hz.Checked = True
+ F_Main.RB100Hz.Checked = True
End If
Return True
diff --git a/CSE/My Project/Application.Designer.vb b/CSE/My Project/Application.Designer.vb
index dbe40a0..f72be66 100644
--- a/CSE/My Project/Application.Designer.vb
+++ b/CSE/My Project/Application.Designer.vb
@@ -32,7 +32,7 @@ Namespace My
<Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
Protected Overrides Sub OnCreateMainForm()
- Me.MainForm = Global.CSE.CSEMain
+ Me.MainForm = Global.CSE.F_Main
End Sub
End Class
End Namespace
diff --git a/CSE/My Project/Application.myapp b/CSE/My Project/Application.myapp
index 300a59a..9dc3c43 100644
--- a/CSE/My Project/Application.myapp
+++ b/CSE/My Project/Application.myapp
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-16"?>
<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<MySubMain>true</MySubMain>
- <MainForm>CSEMain</MainForm>
+ <MainForm>F_Main</MainForm>
<SingleInstance>false</SingleInstance>
<ShutdownMode>0</ShutdownMode>
<EnableVisualStyles>true</EnableVisualStyles>
diff --git a/CSE/Tools/Minor_routines.vb b/CSE/Tools/Minor_routines.vb
index 6743c77..d6c7225 100644
--- a/CSE/Tools/Minor_routines.vb
+++ b/CSE/Tools/Minor_routines.vb
@@ -163,7 +163,7 @@ Module Minor_routines
RestartN = False
If MsgBox(text, MsgBoxStyle.YesNo, Styletext) = MsgBoxResult.Yes Then
RestartN = True
- CSEMain.Close()
+ F_Main.Close()
End If
Else
MsgBox(text, StyleOut, Styletext)
@@ -178,24 +178,24 @@ Module Minor_routines
' Output in the Log
Select Case Style
Case 0 To 7 ' Message
- CSEMain.ListBoxMSG.Items.Add(text)
+ F_Main.ListBoxMSG.Items.Add(text)
fWriteLog(2, 4, text)
Case 8 ' Warning
- CSEMain.ListBoxWar.Items.Add(text)
- CSEMain.TabPageWar.Text = Styletext & " (" & CSEMain.ListBoxWar.Items.Count & ")"
+ F_Main.ListBoxWar.Items.Add(text)
+ F_Main.TabPageWar.Text = Styletext & " (" & F_Main.ListBoxWar.Items.Count & ")"
fWriteLog(2, 2, text)
Case 9 ' Error
- CSEMain.ListBoxErr.Items.Add(text)
- CSEMain.TabPageErr.Text = Styletext & " (" & CSEMain.ListBoxErr.Items.Count & ")"
- CSEMain.TabControlOutMsg.SelectTab(2)
+ F_Main.ListBoxErr.Items.Add(text)
+ F_Main.TabPageErr.Text = Styletext & " (" & F_Main.ListBoxErr.Items.Count & ")"
+ F_Main.TabControlOutMsg.SelectTab(2)
fWriteLog(2, 3, text)
End Select
End If
' Set the Scrollbars in the Listboxes at the end
- CSEMain.ListBoxMSG.TopIndex = CSEMain.ListBoxMSG.Items.Count - 1
- CSEMain.ListBoxWar.TopIndex = CSEMain.ListBoxWar.Items.Count - 1
- CSEMain.ListBoxErr.TopIndex = CSEMain.ListBoxErr.Items.Count - 1
+ F_Main.ListBoxMSG.TopIndex = F_Main.ListBoxMSG.Items.Count - 1
+ F_Main.ListBoxWar.TopIndex = F_Main.ListBoxWar.Items.Count - 1
+ F_Main.ListBoxErr.TopIndex = F_Main.ListBoxErr.Items.Count - 1
' Return that the program have an error
If Style = 9 Then
@@ -254,23 +254,23 @@ Module Minor_routines
' Output in the Tabcontrols on the GUI
Select Case Style
Case 0 To 7 ' Message
- CSEMain.ListBoxMSG.Items.Add(Text)
+ F_Main.ListBoxMSG.Items.Add(Text)
fWriteLog(2, 4, Text)
Case 8 ' Warning
- CSEMain.ListBoxWar.Items.Add(Text)
- CSEMain.TabPageWar.Text = Styletext & " (" & CSEMain.ListBoxWar.Items.Count & ")"
+ F_Main.ListBoxWar.Items.Add(Text)
+ F_Main.TabPageWar.Text = Styletext & " (" & F_Main.ListBoxWar.Items.Count & ")"
fWriteLog(2, 2, Text)
Case 9 ' Error
- CSEMain.ListBoxErr.Items.Add(Text)
- CSEMain.TabPageErr.Text = Styletext & " (" & CSEMain.ListBoxErr.Items.Count & ")"
- CSEMain.TabControlOutMsg.SelectTab(2)
+ F_Main.ListBoxErr.Items.Add(Text)
+ F_Main.TabPageErr.Text = Styletext & " (" & F_Main.ListBoxErr.Items.Count & ")"
+ F_Main.TabControlOutMsg.SelectTab(2)
fWriteLog(2, 3, Text)
End Select
' Set the Scrollbars in the Listboxes at the end
- CSEMain.ListBoxMSG.TopIndex = CSEMain.ListBoxMSG.Items.Count - 1
- CSEMain.ListBoxWar.TopIndex = CSEMain.ListBoxWar.Items.Count - 1
- CSEMain.ListBoxErr.TopIndex = CSEMain.ListBoxErr.Items.Count - 1
+ F_Main.ListBoxMSG.TopIndex = F_Main.ListBoxMSG.Items.Count - 1
+ F_Main.ListBoxWar.TopIndex = F_Main.ListBoxWar.Items.Count - 1
+ F_Main.ListBoxErr.TopIndex = F_Main.ListBoxErr.Items.Count - 1
End Sub
#End Region
--
GitLab