diff --git a/CSE/CSE_Globals.vb b/CSE/CSE_Globals.vb
index fa7fc36e3938a6a7e8c3a27924cf0c7efa2b52ef..96cfa477182b7a8bbe31ac5377230e9de0e8419a 100644
--- a/CSE/CSE_Globals.vb
+++ b/CSE/CSE_Globals.vb
@@ -63,7 +63,8 @@ Module CSE_Globals
alt
slope_deg
omega_wh
- omega_p_wh
+ omega_wh_acc
+ omega_p_wh_acc
tq_sum
tq_sum_1s
t_float
@@ -118,7 +119,8 @@ Module CSE_Globals
beta_avg
dist
omega_wh
- omega_p_wh
+ omega_wh_acc
+ omega_p_wh_acc
tq_sum_1s
t_float
tq_sum_float
@@ -422,8 +424,10 @@ Module CSE_Globals
Return "slope_deg"
Case tCompCali.omega_wh
Return "omega_wh"
- Case tCompCali.omega_p_wh
- Return "omega_p_wh"
+ Case tCompCali.omega_wh_acc
+ Return "omega_wh_acc"
+ Case tCompCali.omega_p_wh_acc
+ Return "omega_p_wh_acc"
Case tCompCali.tq_sum
Return "tq_sum"
Case tCompCali.tq_sum_1s
@@ -529,7 +533,9 @@ Module CSE_Globals
Return "[°]"
Case tCompCali.omega_wh
Return "[rad/s]"
- Case tCompCali.omega_p_wh
+ Case tCompCali.omega_wh_acc
+ Return "[rad/s]"
+ Case tCompCali.omega_p_wh_acc
Return "[rad/s2]"
Case tCompCali.tq_sum
Return "[Nm]"
@@ -682,8 +688,10 @@ Module CSE_Globals
Return "delta s"
Case tCompErg.omega_wh
Return "omega_wh"
- Case tCompErg.omega_p_wh
- Return "omega_p_wh"
+ Case tCompErg.omega_wh_acc
+ Return "omega_wh_acc"
+ Case tCompErg.omega_p_wh_acc
+ Return "omega_p_wh_acc"
Case tCompErg.tq_sum_1s
Return "tq_sum_1s"
Case tCompErg.t_float
@@ -849,7 +857,9 @@ Module CSE_Globals
Return "[m]"
Case tCompErg.omega_wh
Return "[rad/s]"
- Case tCompErg.omega_p_wh
+ Case tCompErg.omega_wh_acc
+ Return "[rad/s]"
+ Case tCompErg.omega_p_wh_acc
Return "[rad/s2]"
Case tCompErg.tq_sum_1s
Return "[Nm]"
diff --git a/CSE/Calculation/Signal_identification.vb b/CSE/Calculation/Signal_identification.vb
index 2c25cdef2986a0aeb48eead13d505dc3c3ec9b9c..e82c757859c64b1dc8dde4d14eeb57686078d6e3 100644
--- a/CSE/Calculation/Signal_identification.vb
+++ b/CSE/Calculation/Signal_identification.vb
@@ -724,12 +724,6 @@ Module Signal_identification
' Wheel rotation
CalcData(tCompCali.omega_wh)(i) = (CalcData(tCompCali.n_ec)(i) * Math.PI / (30 * vehicleX.axleRatio * igear))
- If i = 0 Or i = CalcData(tCompCali.SecID).Count - 1 Then
- CalcData(tCompCali.omega_p_wh)(i) = 0
- Else
- CalcData(tCompCali.omega_p_wh)(i) = ((CalcData(tCompCali.n_ec)(i + 1) - CalcData(tCompCali.n_ec)(i - 1)) / 2) * Math.PI / (30 * vehicleX.axleRatio * igear)
- End If
-
' Torque sum
CalcData(tCompCali.tq_sum)(i) = InputData(tComp.tq_l)(i) + InputData(tComp.tq_r)(i)
@@ -786,14 +780,17 @@ Module Signal_identification
fMoveAve(CalcData(tCompCali.t), CalcData(tCompCali.v_veh_c), CalcData(tCompCali.v_veh_float), CalcData(tCompCali.t_float))
fMoveAve(CalcData(tCompCali.t), CalcData(tCompCali.n_ec), CalcData(tCompCali.n_ec_1s))
fMoveAve(CalcData(tCompCali.t), CalcData(tCompCali.n_ec), CalcData(tCompCali.n_ec_float), CalcData(tCompCali.t_float))
+ fMoveAve(CalcData(tCompCali.t), CalcData(tCompCali.omega_wh), CalcData(tCompCali.omega_wh_acc))
' Calculate the remaining values
For i = 0 To CalcData(tCompCali.SecID).Count - 1
- ' Acceleration
+ ' Acceleration and omega_p
If i = 0 Or i = CalcData(tCompCali.SecID).Count - 1 Then
CalcData(tCompCali.a_veh_avg)(i) = 0
+ CalcData(tCompCali.omega_p_wh_acc)(i) = 0
Else
CalcData(tCompCali.a_veh_avg)(i) = (CalcData(tCompCali.v_veh_acc)(i + 1) - CalcData(tCompCali.v_veh_acc)(i - 1)) / (3.6 * 2) * HzIn
+ CalcData(tCompCali.omega_p_wh_acc)(i) = ((CalcData(tCompCali.omega_wh_acc)(i + 1) - CalcData(tCompCali.omega_wh_acc)(i - 1)) / 2) * Math.PI / (30 * vehicleX.axleRatio * igear)
End If
If Crt.gradient_correction Then
@@ -818,7 +815,7 @@ Module Signal_identification
End If
' Force acceleration
- CalcData(tCompCali.F_acc)(i) = vehicleX.testMass * CalcData(tCompCali.a_veh_avg)(i) + vehicleX.wheelsInertia * CalcData(tCompCali.omega_wh)(i) * CalcData(tCompCali.omega_p_wh)(i) / (CalcData(tCompCali.v_veh_c)(i) / 3.6)
+ CalcData(tCompCali.F_acc)(i) = vehicleX.testMass * CalcData(tCompCali.a_veh_avg)(i) + vehicleX.wheelsInertia * CalcData(tCompCali.omega_wh_acc)(i) * CalcData(tCompCali.omega_p_wh_acc)(i) / (CalcData(tCompCali.v_veh_acc)(i) / 3.6)
' Force trajectory
CalcData(tCompCali.F_res)(i) = CalcData(tCompCali.F_trac)(i)
@@ -834,7 +831,8 @@ Module Signal_identification
ErgValues(tCompErg.RunID)(run) = RunIDx
ErgValues(tCompErg.n_ec)(run) = (CalcData(tCompCali.n_ec)(i))
ErgValues(tCompErg.omega_wh)(run) = (CalcData(tCompCali.omega_wh)(i))
- ErgValues(tCompErg.omega_p_wh)(run) = (CalcData(tCompCali.omega_p_wh)(i))
+ ErgValues(tCompErg.omega_wh_acc)(run) = (CalcData(tCompCali.omega_wh_acc)(i))
+ ErgValues(tCompErg.omega_p_wh_acc)(run) = (CalcData(tCompCali.omega_p_wh_acc)(i))
ErgValues(tCompErg.tq_sum)(run) = (CalcData(tCompCali.tq_sum)(i))
ErgValues(tCompErg.tq_sum_1s)(run) = (CalcData(tCompCali.tq_sum_1s)(i))
ErgValues(tCompErg.tq_sum_float)(run) = (CalcData(tCompCali.tq_sum_float)(i))
@@ -874,7 +872,8 @@ Module Signal_identification
' Build the sum
ErgValues(tCompErg.n_ec)(run) += (CalcData(tCompCali.n_ec)(i))
ErgValues(tCompErg.omega_wh)(run) += (CalcData(tCompCali.omega_wh)(i))
- ErgValues(tCompErg.omega_p_wh)(run) += (CalcData(tCompCali.omega_p_wh)(i))
+ ErgValues(tCompErg.omega_wh_acc)(run) += (CalcData(tCompCali.omega_wh_acc)(i))
+ ErgValues(tCompErg.omega_p_wh_acc)(run) += (CalcData(tCompCali.omega_p_wh_acc)(i))
ErgValues(tCompErg.tq_sum)(run) += (CalcData(tCompCali.tq_sum)(i))
ErgValues(tCompErg.tq_sum_1s)(run) += (CalcData(tCompCali.tq_sum_1s)(i))
ErgValues(tCompErg.tq_sum_float)(run) += (CalcData(tCompCali.tq_sum_float)(i))
@@ -911,7 +910,8 @@ Module Signal_identification
' Calculate the results from the last section
ErgValues(tCompErg.n_ec)(run) = ErgValues(tCompErg.n_ec)(run) / anz
ErgValues(tCompErg.omega_wh)(run) = ErgValues(tCompErg.omega_wh)(run) / anz
- ErgValues(tCompErg.omega_p_wh)(run) = ErgValues(tCompErg.omega_p_wh)(run) / anz
+ ErgValues(tCompErg.omega_wh_acc)(run) = ErgValues(tCompErg.omega_wh_acc)(run) / anz
+ ErgValues(tCompErg.omega_p_wh_acc)(run) = ErgValues(tCompErg.omega_p_wh_acc)(run) / anz
ErgValues(tCompErg.tq_sum)(run) = ErgValues(tCompErg.tq_sum)(run) / anz
ErgValues(tCompErg.tq_sum_1s)(run) = ErgValues(tCompErg.tq_sum_1s)(run) / anz
ErgValues(tCompErg.tq_sum_float)(run) = ErgValues(tCompErg.tq_sum_float)(run) / anz
@@ -947,7 +947,8 @@ Module Signal_identification
ErgValues(tCompErg.RunID)(run) = RunIDx
ErgValues(tCompErg.n_ec)(run) = (CalcData(tCompCali.n_ec)(i))
ErgValues(tCompErg.omega_wh)(run) = (CalcData(tCompCali.omega_wh)(i))
- ErgValues(tCompErg.omega_p_wh)(run) = (CalcData(tCompCali.omega_p_wh)(i))
+ ErgValues(tCompErg.omega_wh_acc)(run) = (CalcData(tCompCali.omega_wh_acc)(i))
+ ErgValues(tCompErg.omega_p_wh_acc)(run) = (CalcData(tCompCali.omega_p_wh_acc)(i))
ErgValues(tCompErg.tq_sum)(run) = (CalcData(tCompCali.tq_sum)(i))
ErgValues(tCompErg.tq_sum_1s)(run) = (CalcData(tCompCali.tq_sum_1s)(i))
ErgValues(tCompErg.tq_sum_float)(run) = (CalcData(tCompCali.tq_sum_float)(i))
@@ -987,7 +988,8 @@ Module Signal_identification
' Calculate the results from the last section
ErgValues(tCompErg.n_ec)(run) = ErgValues(tCompErg.n_ec)(run) / anz
ErgValues(tCompErg.omega_wh)(run) = ErgValues(tCompErg.omega_wh)(run) / anz
- ErgValues(tCompErg.omega_p_wh)(run) = ErgValues(tCompErg.omega_p_wh)(run) / anz
+ ErgValues(tCompErg.omega_wh_acc)(run) = ErgValues(tCompErg.omega_wh_acc)(run) / anz
+ ErgValues(tCompErg.omega_p_wh_acc)(run) = ErgValues(tCompErg.omega_p_wh_acc)(run) / anz
ErgValues(tCompErg.tq_sum)(run) = ErgValues(tCompErg.tq_sum)(run) / anz
ErgValues(tCompErg.tq_sum_1s)(run) = ErgValues(tCompErg.tq_sum_1s)(run) / anz
ErgValues(tCompErg.tq_sum_float)(run) = ErgValues(tCompErg.tq_sum_float)(run) / anz
diff --git a/CSE/Calculation/main_calculation_call.vb b/CSE/Calculation/main_calculation_call.vb
index 01d948f87ff04a756d713b95b6f562032e9e1cb4..c677ed6fb9ef8fbba9b581cf0a0a4d9c553c563b 100644
--- a/CSE/Calculation/main_calculation_call.vb
+++ b/CSE/Calculation/main_calculation_call.vb
@@ -109,6 +109,9 @@ Public Module main_calculation_call
' Exit function if error is detected
If BWorker.CancellationPending Then Return
+ ' Output on the GUI
+ If i = 0 Then logme(6, False, "Calculating the HS parameter")
+
' Calculate the run
fCalcRun(MSC, vehicle, i, r_dyn_ref)
@@ -315,18 +318,13 @@ Public Module main_calculation_call
End If
Next i
- ' Error if no valid section is found
- If num = 0 Then
- Throw New Exception("No used/valid section is found for calculation of fv_veh!")
- End If
-
' Calculate the average over all factors
Job.fv_veh = Job.fv_veh / num
Job.fv_veh_opt2 = Job.fv_veh_opt2 / num
End Sub
' Function to calculate fv_pe & beta_amn
- Function ffvpeBeta(Optional ByVal allData As Boolean = True) As Boolean
+ Function ffvpeBeta(Optional ByVal CalibRun As Boolean = True) As Boolean
' Declaration
Dim i, anz_DirID(1) As Integer
Dim vair_ic(1), beta_ic(1), sum_v_veh As Double
@@ -334,30 +332,39 @@ Public Module main_calculation_call
' Initialise
For i = 0 To 1
vair_ic(i) = 0
- If allData Then beta_ic(i) = 0
+ If CalibRun Then beta_ic(i) = 0
anz_DirID(i) = 0
Next i
sum_v_veh = 0
- ' Calculate velocity correction
+ ' Calculate velocity and beta correction
For i = 0 To ErgValues(tCompErg.SecID).Count - 1
If ErgValues(tCompErg.used)(i) = 1 Then
sum_v_veh += ErgValues(tCompErg.v_veh)(i) / 3.6
- If ErgValues(tCompErg.DirID)(i) = ErgValues(tCompErg.DirID)(0) Then
- vair_ic(0) += ErgValues(tCompErg.vair_ic)(i)
- If allData Then beta_ic(0) += ErgValues(tCompErg.beta_ic)(i)
- anz_DirID(0) += 1
+ If CalibRun Then
+ If ErgValues(tCompErg.DirID)(i) = ErgValues(tCompErg.DirID)(0) Then
+ vair_ic(0) += ErgValues(tCompErg.vair_ic)(i)
+ beta_ic(0) += ErgValues(tCompErg.beta_ic)(i)
+ anz_DirID(0) += 1
+ Else
+ vair_ic(1) += ErgValues(tCompErg.vair_ic)(i)
+ beta_ic(1) += ErgValues(tCompErg.beta_ic)(i)
+ anz_DirID(1) += 1
+ End If
Else
- vair_ic(1) += ErgValues(tCompErg.vair_ic)(i)
- If allData Then beta_ic(1) += ErgValues(tCompErg.beta_ic)(i)
- anz_DirID(1) += 1
+ If ErgValues(tCompErg.HeadID)(i) = ErgValues(tCompErg.HeadID)(0) Then
+ vair_ic(0) += ErgValues(tCompErg.vair_ic)(i)
+ anz_DirID(0) += 1
+ Else
+ vair_ic(1) += ErgValues(tCompErg.vair_ic)(i)
+ anz_DirID(1) += 1
+ End If
End If
End If
Next i
Job.fv_pe = (sum_v_veh / (anz_DirID(0) + anz_DirID(1))) / (0.5 * (vair_ic(0) / anz_DirID(0) + vair_ic(1) / anz_DirID(1)))
- If allData Then Job.beta_ame = (0.5 * (beta_ic(0) / anz_DirID(0) + beta_ic(1) / anz_DirID(1))) - AmeAng
-
+ If CalibRun Then Job.beta_ame = (0.5 * (beta_ic(0) / anz_DirID(0) + beta_ic(1) / anz_DirID(1))) - AmeAng
Return True
End Function
@@ -419,7 +426,14 @@ Public Module main_calculation_call
' Set the values
For i = 0 To ErgValues(tCompErg.SecID).Count - 1
- If ErgValues(tCompErg.v_wind_avg)(i) < Crt.v_wind_avg_max_CAL And Math.Abs(ErgValues(tCompErg.beta_avg)(i)) < Crt.beta_avg_max_CAL And ErgValues(tCompErg.v_wind_1s_max)(i) < Crt.v_wind_1s_max_CAL And ErgValues(tCompErg.user_valid)(i) = 1 Then
+ If ErgValues(tCompErg.v_wind_avg)(i) < Crt.v_wind_avg_max_CAL Then ErgValues(tCompErg.val_vWind)(i) = 1
+ If Math.Abs(ErgValues(tCompErg.beta_avg)(i)) < Crt.beta_avg_max_CAL Then ErgValues(tCompErg.val_beta)(i) = 1
+ If ErgValues(tCompErg.v_wind_1s_max)(i) < Crt.v_wind_1s_max_CAL Then ErgValues(tCompErg.val_vWind_1s)(i) = 1
+ If ErgValues(tCompErg.user_valid)(i) = 1 Then ErgValues(tCompErg.val_User)(i) = 1
+
+ ' Check if all criterias are valid
+ If ErgValues(tCompErg.val_vWind)(i) = 1 And ErgValues(tCompErg.val_beta)(i) = 1 And _
+ ErgValues(tCompErg.val_vWind_1s)(i) = 1 And ErgValues(tCompErg.val_User)(i) = 1 Then
ErgValues(tCompErg.valid)(i) = 1
ErgValues(tCompErg.used)(i) = 1
Else
@@ -813,9 +827,11 @@ Public Module main_calculation_call
Dim i As Integer
Dim OldValid(ErgValues(tCompErg.SecID).Count - 1), OldUse(ErgValues(tCompErg.SecID).Count - 1) As Boolean
Dim igear As Double
+ Dim allFalse As Boolean
' Initialisation
Change = False
+ allFalse = True
' Evaluation
Select Case coastingSeq
@@ -846,6 +862,7 @@ Public Module main_calculation_call
ErgValues(tCompErg.val_vWind_1s)(i) = 1 And ErgValues(tCompErg.val_vVeh_f)(i) = 1 And ErgValues(tCompErg.val_tq_f)(i) = 1 And ErgValues(tCompErg.val_n_eng)(i) = 1 And ErgValues(tCompErg.val_dist)(i) = 1 Then
ErgValues(tCompErg.valid)(i) = 1
ErgValues(tCompErg.used)(i) = 1
+ allFalse = False
Else
ErgValues(tCompErg.valid)(i) = 0
ErgValues(tCompErg.used)(i) = 0
@@ -890,6 +907,7 @@ Public Module main_calculation_call
ErgValues(tCompErg.val_beta)(i) = 1 And ErgValues(tCompErg.val_vVeh_1s)(i) = 1 And ErgValues(tCompErg.val_tq_1s)(i) = 1 And ErgValues(tCompErg.val_n_eng)(i) = 1 And ErgValues(tCompErg.val_dist)(i) = 1 Then
ErgValues(tCompErg.valid)(i) = 1
ErgValues(tCompErg.used)(i) = 1
+ allFalse = False
Else
ErgValues(tCompErg.valid)(i) = 0
ErgValues(tCompErg.used)(i) = 0
@@ -910,6 +928,12 @@ Public Module main_calculation_call
Else
Change = True
End If
+
+ ' Look if something is true
+ If allFalse Then
+ logme(8, False, "No used/valid section is found for calculation of fv_veh and fv_pe in HS test!")
+ Change = False
+ End If
End Select
End Sub
diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb
index 85c83bcd9bdccf8a8ff98a0c410eb68af08c33d3..7cb3038ba00b8e8f9603dbd8a3680b20f11e65f4 100644
--- a/CSE/GUI/F_Main.vb
+++ b/CSE/GUI/F_Main.vb
@@ -347,6 +347,9 @@ Public Class F_Main
UI_PopulateToJob(True)
UI_PopulateToCriteria()
+ Me.TextBoxRVeh.Text = 0
+ Me.TextBoxRAirPos.Text = 0
+
' Check if outfolder exist. If not then generate the folder
If Not System.IO.Directory.Exists(OutFolder) Then
If OutFolder <> Nothing Then
@@ -705,6 +708,13 @@ Public Class F_Main
UI_PopulateFromCriteria()
End If
+ ' Clear the text in the WarnigBox and ErrorBox and activate the MessageBox
+ Me.ListBoxWar.Items.Clear()
+ Me.ListBoxErr.Items.Clear()
+ Me.TabControlOutMsg.SelectTab(0)
+ Me.TabPageErr.Text = "Errors (0)"
+ Me.TabPageWar.Text = "Warnings (0)"
+
Return True
End Function
diff --git a/CSE/IO/cJob.vb b/CSE/IO/cJob.vb
index 5a105850901a3165d66f2acf15233bf60eaec7bd..da7f18d71967e233d572c86f25355ccd2d754619 100644
--- a/CSE/IO/cJob.vb
+++ b/CSE/IO/cJob.vb
@@ -192,12 +192,12 @@ Public Class cJob
' Reset the Values to Standard
Friend Sub ResetValue(Optional IsCalibration As Boolean = False)
If IsCalibration Then
- Job.fv_veh = 0
Job.fa_pe = 1
- Job.fv_pe = 0
Job.beta_ame = 0
End If
+ Job.fv_veh = 0
+ Job.fv_pe = 0
Job.CdxAß = 0
Job.beta = 0
Job.delta_CdxA = 0
diff --git a/CSE/IO/output.vb b/CSE/IO/output.vb
index f43ea5c28b4e9e08b8f5c455bdf4f659fba55a69..4bc389ac7294943a69e591132bef4c3e609e69ef 100644
--- a/CSE/IO/output.vb
+++ b/CSE/IO/output.vb
@@ -339,7 +339,8 @@ Module output
If Not calibration Then
AddToErg(tCompCali.omega_wh, fCompName(tCompCali.omega_wh), fCompUnit(tCompCali.omega_wh), "CalcData")
- AddToErg(tCompCali.omega_p_wh, fCompName(tCompCali.omega_p_wh), fCompUnit(tCompCali.omega_p_wh), "CalcData")
+ AddToErg(tCompCali.omega_wh_acc, fCompName(tCompCali.omega_wh_acc), fCompUnit(tCompCali.omega_wh_acc), "CalcData")
+ AddToErg(tCompCali.omega_p_wh_acc, fCompName(tCompCali.omega_p_wh_acc), fCompUnit(tCompCali.omega_p_wh_acc), "CalcData")
AddToErg(tCompCali.tq_sum, fCompName(tCompCali.tq_sum), fCompUnit(tCompCali.tq_sum), "CalcData")
AddToErg(tCompCali.tq_sum_1s, fCompName(tCompCali.tq_sum_1s), fCompUnit(tCompCali.tq_sum_1s), "CalcData")
AddToErg(tCompCali.tq_sum_float, fCompName(tCompCali.tq_sum_float), fCompUnit(tCompCali.tq_sum_float), "CalcData")
@@ -382,6 +383,13 @@ Module output
AddToErg(tCompErg.valid, fCompName(tCompErg.valid), fCompUnit(tCompErg.valid), "ErgValues")
AddToErg(tCompErg.used, fCompName(tCompErg.used), fCompUnit(tCompErg.used), "ErgValues")
+ If calibration Then
+ AddToErg(tCompErg.val_User, fCompName(tCompErg.val_User), fCompUnit(tCompErg.val_User), "ErgValues")
+ AddToErg(tCompErg.val_vWind, fCompName(tCompErg.val_vWind), fCompUnit(tCompErg.val_vWind), "ErgValues")
+ AddToErg(tCompErg.val_vWind_1s, fCompName(tCompErg.val_vWind_1s), fCompUnit(tCompErg.val_vWind_1s), "ErgValues")
+ AddToErg(tCompErg.val_beta, fCompName(tCompErg.val_beta), fCompUnit(tCompErg.val_beta), "ErgValues")
+ End If
+
If Not calibration Then
AddToErg(tCompErg.val_User, fCompName(tCompErg.val_User), fCompUnit(tCompErg.val_User), "ErgValues")
AddToErg(tCompErg.val_vVeh_avg, fCompName(tCompErg.val_vVeh_avg), fCompUnit(tCompErg.val_vVeh_avg), "ErgValues")
@@ -412,7 +420,8 @@ Module output
AddToErg(tCompErg.n_ec_float_min, fCompName(tCompErg.n_ec_float_min), fCompUnit(tCompErg.n_ec_float_min), "ErgValues")
AddToErg(tCompErg.r_dyn, fCompName(tCompErg.r_dyn), fCompUnit(tCompErg.r_dyn), "ErgValues")
AddToErg(tCompErg.omega_wh, fCompName(tCompErg.omega_wh), fCompUnit(tCompErg.omega_wh), "ErgValues")
- AddToErg(tCompErg.omega_p_wh, fCompName(tCompErg.omega_p_wh), fCompUnit(tCompErg.omega_p_wh), "ErgValues")
+ AddToErg(tCompErg.omega_wh_acc, fCompName(tCompErg.omega_wh_acc), fCompUnit(tCompErg.omega_wh_acc), "ErgValues")
+ AddToErg(tCompErg.omega_p_wh_acc, fCompName(tCompErg.omega_p_wh_acc), fCompUnit(tCompErg.omega_p_wh_acc), "ErgValues")
AddToErg(tCompErg.tq_sum, fCompName(tCompErg.tq_sum), fCompUnit(tCompErg.tq_sum), "ErgValues")
AddToErg(tCompErg.tq_sum_1s, fCompName(tCompErg.tq_sum_1s), fCompUnit(tCompErg.tq_sum_1s), "ErgValues")
AddToErg(tCompErg.tq_sum_1s_max, fCompName(tCompErg.tq_sum_1s_max), fCompUnit(tCompErg.tq_sum_1s_max), "ErgValues")
diff --git a/CSE/utils.vb b/CSE/utils.vb
index 71d52dce870a01459af7d86034ad17ec0c3e0091..c38fbc48c31b37ed3c3da32de798aa73fc7349cd 100644
--- a/CSE/utils.vb
+++ b/CSE/utils.vb
@@ -239,12 +239,10 @@ Module utils
fWriteLog(2, logFileLevel, text, ex)
'' Print only filtered msgs in log-window
- ''
If logLevel >= Prefs.logLevel Then
Dim wintext = AnzeigeMessage(logLevel) & text
If BWorker IsNot Nothing AndAlso BWorker.IsBusy Then
'' If in Worker-thread, update GUI through a ProgressChanged event
- ''
Dim WorkerMsg As New cLogMsg(logFileLevel, asMsgBox, wintext, ex, tabLabel)
BWorker.ReportProgress(0, WorkerMsg)
Else
@@ -253,7 +251,6 @@ Module utils
End If
'' Output as an messagebox (if requested)
- ''
If asMsgBox Then
' Output in a MsgBox
If RestartN Then
@@ -273,6 +270,7 @@ Module utils
' Established the text wit the symbol from the style
Dim printEx = False
Dim lbox As ListBox
+ Dim Page As TabPage
Dim mtext = text
If (ex IsNot Nothing) Then
@@ -281,21 +279,22 @@ Module utils
End If
' Always write to log-msg tab.
- ''
lbox = F_Main.ListBoxMSG
+ Page = F_Main.TabPageMSG
lbox.Items.Add(mtext)
- F_Main.TabPageMSG.Text = format("Messages({0})", lbox.Items.Count)
+ Page.Text = format("Messages({0})", lbox.Items.Count)
' Set the Scrollbars in the Listboxes at the end
lbox.TopIndex = lbox.Items.Count - 1
''Write to other Log-windows.
- ''
Dim label As String
If logFileLevel = 2 Then ' Warning
lbox = F_Main.ListBoxWar
+ Page = F_Main.TabPageWar
label = "Warnings"
ElseIf logFileLevel = 3 Then ' Error
lbox = F_Main.ListBoxErr
+ Page = F_Main.TabPageErr
label = "Errors"
Else
Return
@@ -307,7 +306,7 @@ Module utils
End If
lbox.TopIndex = lbox.Items.Count - 1
- lbox.Text = format("{0}({1})", label, lbox.Items.Count)
+ Page.Text = format("{0}({1})", label, lbox.Items.Count)
End Sub
' Update the Resultboxes on the GUI