From 971ff6a8091980bab7fa183f257a7ecf2049b3a8 Mon Sep 17 00:00:00 2001
From: Thomas Wiedebusch <thomas.wiedebusch@t-wiedebusch.de>
Date: Thu, 1 Jun 2023 14:41:50 +0200
Subject: [PATCH] MagFlux: - Support for legacy control to calibrate

---
 .../MagFlux/MagFluxCore/MagFluxMeter.cs       | 37 +++++++++++++------
 Common/Ui/MagFluxToolBox/FrmTest.cs           |  2 +-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
index 0618e143..c60b2787 100644
--- a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
+++ b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
@@ -673,6 +673,32 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore
             SetupFromConfigFile(slot, ignoreCorruptedData, true, true);
         }
 
+
+        /// <summary>
+        /// Copy list of flow results to <see cref="MagFlux.DataPackages.DataTypes.Calibration"/> and kick off the
+        /// writing of calibrations to MagFlux.
+        /// </summary>
+        /// <param name="results">List of flow results</param>
+        public void WriteCalibrationTestBench(List<WaterMeter.DataPackages.MeasurementRecords.FlowDeviations> results)
+        {
+            if (RequestProtocol == null) return;
+            var calibrationsCmPerH = new List<Calibration>();
+            var calibrationCmPerH = new Calibration();
+            foreach (var result in results)
+            {
+                calibrationCmPerH.refFlowRate = (Single)result.MeasuredRefFlowQmPerH;
+                calibrationCmPerH.dutFlowRate = (Single)result.MeasuredDutFlowQmPerH;
+                calibrationsCmPerH.Add(calibrationCmPerH);
+            }
+
+            RequestProtocol.SetCalibrationPoints(calibrationsCmPerH);
+        }
+
+        /// <inheritdoc/>
+        void IMeter.SetupFromConfigFile(Int32 slot, Boolean ignoreCorruptedData, Boolean useRequest, Boolean useStreaming)
+        {
+            SetupFromConfigFile(slot, ignoreCorruptedData);
+        }
         /// <summary>
         /// Setup water meter from configuration file:
         /// -slot,
@@ -1159,17 +1185,6 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore
                 }
             }
         }
-
-        public void WriteCalibrationTestBench(List<WaterMeter.DataPackages.MeasurementRecords.FlowDeviations> results)
-        {
-            //todo: convert to CalibrationPoints in L per H
-        }
-
-        /// <inheritdoc/>
-        void IMeter.SetupFromConfigFile(Int32 slot, Boolean ignoreCorruptedData, Boolean useRequest, Boolean useStreaming)
-        {
-            SetupFromConfigFile(slot, ignoreCorruptedData);
-        }
         #endregion
     }
 }
diff --git a/Common/Ui/MagFluxToolBox/FrmTest.cs b/Common/Ui/MagFluxToolBox/FrmTest.cs
index dfc03f21..ae972cc4 100644
--- a/Common/Ui/MagFluxToolBox/FrmTest.cs
+++ b/Common/Ui/MagFluxToolBox/FrmTest.cs
@@ -654,7 +654,7 @@ namespace Xylem.Common.Ui.MagFluxToolBox
                 return;
  
             _magFluxMeter?.WriteCalibration(_calibPointsCmPerH);
-            SetControlsDownloadIsFinished();
+            btnReadCalibration_Click(this, null);
         }
 
         private void btnAbortCalibration_Click(Object sender, EventArgs e)