From 0fd0c44c1894dfda3d9afd372a94af93668e8e40 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Mon, 1 Aug 2022 13:24:29 +0200
Subject: [PATCH] Better on-screen error message when a path is missing in a
 test.

---
 TBF/Resources/Strings.Designer.cs | 9 +++++++++
 TBF/Resources/Strings.cs.resx     | 3 +++
 TBF/Resources/Strings.resx        | 3 +++
 TBF/Rig/StateMachine.cs           | 9 +++++----
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs
index 08f4958ac..d1e40118b 100644
--- a/TBF/Resources/Strings.Designer.cs
+++ b/TBF/Resources/Strings.Designer.cs
@@ -5739,6 +5739,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Test {0} config. error : {1} is missing.
+        /// </summary>
+        internal static string Test_0_config_error_1_is_missing {
+            get {
+                return ResourceManager.GetString("Test_0_config_error_1_is_missing", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Test bench.
         /// </summary>
diff --git a/TBF/Resources/Strings.cs.resx b/TBF/Resources/Strings.cs.resx
index 4a9db9816..44208df1e 100644
--- a/TBF/Resources/Strings.cs.resx
+++ b/TBF/Resources/Strings.cs.resx
@@ -1680,4 +1680,7 @@
   <data name="Delay" xml:space="preserve">
     <value>Zpoždění</value>
   </data>
+  <data name="Test_0_config_error_1_is_missing" xml:space="preserve">
+    <value>Konfigurace testu {0} : chybí {1}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx
index 27975a02b..4afe8863d 100644
--- a/TBF/Resources/Strings.resx
+++ b/TBF/Resources/Strings.resx
@@ -2311,4 +2311,7 @@
   <data name="Delay" xml:space="preserve">
     <value>Delay</value>
   </data>
+  <data name="Test_0_config_error_1_is_missing" xml:space="preserve">
+    <value>Test {0} config. error : {1} is missing</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TBF/Rig/StateMachine.cs b/TBF/Rig/StateMachine.cs
index 31f183177..456d45525 100644
--- a/TBF/Rig/StateMachine.cs
+++ b/TBF/Rig/StateMachine.cs
@@ -658,11 +658,12 @@ namespace TBF.Rig
 
 			pmtrs = GetMetersPath(test);
 
-            if (isHydroTest && (pfeed == null)) errorMsg = Strings.Cannot_load_feeding_path;
-            else if (isHydroTest && (pben == null)) errorMsg = Strings.Cannot_load_bench_path;
-            else if (isHydroTest && (pout == null)) errorMsg = Strings.Cannot_load_output_path;
-            else if (pmtrs == null) errorMsg = Strings.Cannot_load_sensor_path;
+            if (isHydroTest && (pfeed == null))     errorMsg = string.Format(Strings.Test_0_config_error_1_is_missing, test.Name, Strings.Feeding_chdr);
+            else if (isHydroTest && (pben == null)) errorMsg = string.Format(Strings.Test_0_config_error_1_is_missing, test.Name, Strings.Bench_chdr);
+            else if (isHydroTest && (pout == null)) errorMsg = string.Format(Strings.Test_0_config_error_1_is_missing, test.Name, Strings.Output_chdr);
+            else if (pmtrs == null)                 errorMsg = string.Format(Strings.Test_0_config_error_1_is_missing, test.Name, Strings.Sensors_chdr);
             else errorMsg = string.Empty;
+            
             if ((isHydroTest && (pfeed == null || pben == null || pout == null)) || (pmtrs == null))
             {
                 log.ErrorFormat("GetPaths({0},...) returns false, wrong configuration", test.Name);