From 49a16dc2b516f179d86685c777e649148ddbd256 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Thu, 19 Apr 2018 12:59:58 +0200 Subject: [PATCH] save GUI setting on validating run-data --- VECTO/Configuration.vb | 5 +++++ VECTO/GUI/MainForm.vb | 2 ++ 2 files changed, 7 insertions(+) diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb index 6e17884ecd..0af42028db 100644 --- a/VECTO/Configuration.vb +++ b/VECTO/Configuration.vb @@ -30,6 +30,8 @@ Public Class Configuration Public FirstRun As Boolean Public DeclMode As Boolean + Public ValidateRunData As Boolean + Public Const DefaultFuelType As FuelType = FuelType.DieselCI Private Const FormatVersion As Short = 2 @@ -55,6 +57,7 @@ Public Class Configuration Co2PerFc = DeclarationData.FuelData.Lookup(DefaultFuelType).CO2PerFuelWeight FirstRun = True DeclMode = True + ValidateRunData = True End Sub Public Sub Load() @@ -82,6 +85,7 @@ Public Class Configuration OpenCmdName = body.GetEx(Of String)("OpenCmdName") FirstRun = body.GetEx(Of Boolean)("FirstRun") DeclMode = body.GetEx(Of Boolean)("DeclMode") + ValidateRunData = IsNothing(body("ValidateRunData")) OrElse body.GetEx(Of Boolean)("ValidateRunData") End Using Catch ex As Exception GUIMsg(MessageType.Err, "Error while loading settings!") @@ -106,6 +110,7 @@ Public Class Configuration body.Add("OpenCmdName", OpenCmdName) body.Add("FirstRun", FirstRun) body.Add("DeclMode", DeclMode) + body.Add("ValidateRunData", ValidateRunData) JSONFileWriter.WriteFile(New Dictionary(Of String, Object) From {{"Header", header}, {"Body", body}}, FilePath) End Sub diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb index 36bf080410..46fe44d371 100644 --- a/VECTO/GUI/MainForm.vb +++ b/VECTO/GUI/MainForm.vb @@ -1375,12 +1375,14 @@ lbFound: ChBoxMod1Hz.Checked = Cfg.Mod1Hz RbDecl.Checked = Cfg.DeclMode + cbValidateRunData.Checked = cfg.ValidateRunData End Sub 'Update config class from options in GUI, e.g. before running calculations Private Sub SetOptions() Cfg.ModOut = ChBoxModOut.Checked Cfg.Mod1Hz = ChBoxMod1Hz.Checked + Cfg.ValidateRunData = cbValidateRunData.Checked End Sub #End Region -- GitLab