From 3a44126389cce90830f4141f2feedf75bf908487 Mon Sep 17 00:00:00 2001
From: DIPPOLD Martin <Dippold@ivt.tugraz.at>
Date: Wed, 25 Jun 2014 08:07:01 +0200
Subject: [PATCH] Reset Result Values by calculations
---
CSE/Calculation/main_calculation_call.vb | 1 +
CSE/GUI/F_Main.vb | 6 ++++
CSE/IO/cJob.vb | 44 +++++++++++++++++-------
3 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/CSE/Calculation/main_calculation_call.vb b/CSE/Calculation/main_calculation_call.vb
index b43acc9..b11b598 100644
--- a/CSE/Calculation/main_calculation_call.vb
+++ b/CSE/Calculation/main_calculation_call.vb
@@ -51,6 +51,7 @@
fOutCalcRes(isCalibrate)
End Try
Else
+ ' Declaration
Dim MSC As New cMSC
Dim vMSC As New cVirtMSC
diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb
index 3397092..77e9255 100644
--- a/CSE/GUI/F_Main.vb
+++ b/CSE/GUI/F_Main.vb
@@ -242,6 +242,9 @@ Public Class F_Main
' Change the button "Exec" --> "Cancel"
Me.CalibrationState = True
+ ' Reset Values
+ Job.ResetValue(True)
+
' Save the Jobfiles
doSaveJob(False)
@@ -322,6 +325,9 @@ Public Class F_Main
fWriteLog(2, 4, "----- Speed runs ")
+ ' Reset Values
+ Job.ResetValue()
+
' Save the Jobfiles
doSaveJob(False)
diff --git a/CSE/IO/cJob.vb b/CSE/IO/cJob.vb
index c3128cc..a2037e2 100644
--- a/CSE/IO/cJob.vb
+++ b/CSE/IO/cJob.vb
@@ -185,6 +185,24 @@ Public Class cJob
MyBase.New(inputFilePath, skipValidation)
End Sub
+ ' 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.CdxA = 0
+ Job.beta = 0
+ Job.delta_CdxA = 0
+ Job.CdxA0 = 0
+ Job.CdxA0_opt2 = 0
+ Job.valid_t_tire = True
+ Job.valid_t_amb = True
+ Job.valid_RRC = True
+ End Sub
Protected Overrides Function BodySchemaStr() As String
Return JSchemaStr()
@@ -220,19 +238,19 @@ Public Class cJob
Public beta_f As Double
Public beta_d As Double
- Public fv_veh As Double = 0
- Public fv_veh_opt2 As Double = 0
- Public fa_pe As Double = 1
- Public fv_pe As Double = 0
- Public beta_ame As Double = 0
- Public CdxA As Double = 0
- Public beta As Double = 0
- Public delta_CdxA As Double = 0
- Public CdxA0 As Double = 0
- Public CdxA0_opt2 As Double = 0
- Public valid_t_tire As Boolean = True
- Public valid_t_amb As Boolean = True
- Public valid_RRC As Boolean = True
+ Public fv_veh As Double
+ Public fv_veh_opt2 As Double
+ Public fa_pe As Double
+ Public fv_pe As Double
+ Public beta_ame As Double
+ Public CdxA As Double
+ Public beta As Double
+ Public delta_CdxA As Double
+ Public CdxA0 As Double
+ Public CdxA0_opt2 As Double
+ Public valid_t_tire As Boolean
+ Public valid_t_amb As Boolean
+ Public valid_RRC As Boolean
Protected Overrides Sub OnContentUpdated()
Dim anem = PropOrDefault(".Anemometer")
--
GitLab