test container fix

Common/.vs/config/applicationhost.config

@@ -155,7 +155,7 @@
 			</site>
             <site name="MeterProcessState" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" />
+                    <virtualDirectory path="/" physicalPath="C:\Users\drabesch_ro\Repo\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:56011:localhost" />

Common/CordonelAssemblyLine/Model/PickingModel.cs

@@ -578,6 +578,741 @@ namespace CordonelAssemblyLine.Model
                                 lblS08Color = _progressError;
                                 ret = false;
                             }
+
+                            meter.WriteRegister("POWERMON_StoreConfiguration", 1, true);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
                             var genesisStatus = new GenesisStatus();
 

Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj

@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{D0C8D887-ED52-40AB-A069-90BCE0E801E2}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xylem.Common.Ui.CordonelPreadjustmentUi</RootNamespace>
     <AssemblyName>Xylem.Common.Ui.CordonelPreadjustmentUi</AssemblyName>
@@ -105,6 +105,7 @@
   <PropertyGroup />
   <PropertyGroup />
   <PropertyGroup />
+  <PropertyGroup />
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>

Common/CordonelPreadjustmentUi/MeterStateControl.cs

@@ -296,21 +296,38 @@ namespace CordonelPreadjustmentUi
         private List<Tuple<double, double>> TempFromTofLUT;
         internal void StartTempWatch(TempMode tempMode = TempMode.Hand)
         {
-            Meter.WriteLog($"StartTempWatch with {tempMode}");
-
-            Meter.logAmpTest = true;
-            if (tempMode == TempMode.CalcTof)
+            try
             {
-                TempFromTofLUT = new List<Tuple<double, double>>();
+                Meter.WriteLog($"StartTempWatch with {tempMode}");
 
-                var pcbid = "notFound";
-                try
+                Meter.logAmpTest = true;
+                if (tempMode == TempMode.CalcTof)
                 {
-                    pcbid = Meter.GetPcbId();
-                    if (string.IsNullOrEmpty(pcbid))
+                    TempFromTofLUT = new List<Tuple<double, double>>();
+
+                    var pcbid = "notFound";
+                    try
                     {
                         pcbid = Meter.GetPcbId();
                         if (string.IsNullOrEmpty(pcbid))
+                        {
+                            pcbid = Meter.GetPcbId();
+                            if (string.IsNullOrEmpty(pcbid))
+                            {
+                                if (Meter.Slot == 11)
+                                {
+                                    pcbid = "193400550";
+                                    Meter.WriteLog($"Fake pcbid {pcbid} for 2016 slot 11");
+                                }
+                                else if (Meter.Slot == 12)
+                                {
+                                    pcbid = "193400388";
+                                    Meter.WriteLog($"Fake pcbid {pcbid} for 2016 slot 12");
+                                }
+
+                            }
+                        }
+                        if (string.IsNullOrEmpty(pcbid) || pcbid.Length < 5 || pcbid.Length == "1934193400388".Length)
                         {
                             if (Meter.Slot == 11)
                             {
@@ -322,57 +339,48 @@ namespace CordonelPreadjustmentUi
                                 pcbid = "193400388";
                                 Meter.WriteLog($"Fake pcbid {pcbid} for 2016 slot 12");
                             }
-                           
+
                         }
-                    }
-                    if (string.IsNullOrEmpty(pcbid) || pcbid.Length < 5)
-                    {
-                        if (Meter.Slot == 11)
+
+
+
+                        var resp = LocalWebRequest.GetRequest($"http://10.49.40.25/MeterProcessState/api/TempFlange/GetLut?PcbId={pcbid}", 50000);
+                        var cordonelTempLut = JsonConvert.DeserializeObject<List<CordonelTempLut>>(resp);
+                        TempFromTofLUT = new List<Tuple<double, double>>();
+
+                        foreach (var item in cordonelTempLut.OrderBy(a => a.RefTempC))
                         {
-                            pcbid = "193400550";
-                            Meter.WriteLog($"Fake pcbid {pcbid} for 2016 slot 11");
+                            TempFromTofLUT.Add(new Tuple<double, double>(item.AvgTof, item.RefTempC));
                         }
-                        else if (Meter.Slot == 12)
+                        var sb = new StringBuilder();
+                        foreach (var t in TempFromTofLUT)
                         {
-                            pcbid = "193400388";
-                            Meter.WriteLog($"Fake pcbid {pcbid} for 2016 slot 12");
+                            sb.Append("Tof:");
+                            sb.Append(t.Item1);
+                            sb.Append("=Temp:");
+                            sb.Append(t.Item2);
+                            sb.Append(",");
                         }
 
+
+                        Meter.WriteLog($"Load LUT { sb.ToString() } for meter {pcbid}");
                     }
-
-
-
-                    var resp = LocalWebRequest.GetRequest($"http://10.49.40.25/MeterProcessState/api/TempFlange/GetLut?PcbId={pcbid}", 10000);
-                    var cordonelTempLut = JsonConvert.DeserializeObject<List<CordonelTempLut>>(resp);
-                    TempFromTofLUT = new List<Tuple<double, double>>();
-                       
-                    foreach (var item in cordonelTempLut.OrderBy(a => a.RefTempC))
+                    catch (Exception ex)
                     {
-                        TempFromTofLUT.Add(new Tuple<double, double>(item.AvgTof, item.RefTempC));
-                    }
-                    var sb = new StringBuilder();
-                    foreach (var t in TempFromTofLUT)
-                    {
-                        sb.Append("Tof:");
-                        sb.Append(t.Item1);
-                        sb.Append("=Temp:");
-                        sb.Append(t.Item2);
-                        sb.Append(",");
+                        Meter.WriteLog($"StartTempWatch with LUT  faild for meter {pcbid} with ex{ex.Message}");
+
                     }
 
 
-                    Meter.WriteLog($"Load LUT { sb.ToString() } for meter {pcbid}");
-                }
-                catch (Exception ex)
-                {
-                    Meter.WriteLog($"StartTempWatch with LUT  faild for meter {pcbid} with ex{ex.Message}");
-
                 }
-
-                
+                watchActiv = true;
+                MeterTempMode = tempMode;
             }
-            watchActiv = true;
-            MeterTempMode = tempMode;
+            catch (Exception ex)
+            {
+                Log("StartTempWatch" + ex.Message);
+            }
+           
 
         }
         public enum TempMode

Common/CordonelPreadjustmentUi/PreAdjustmentSettingsContainer.cs

@@ -194,6 +194,12 @@ namespace CordonelPreadjustmentUi
             {
                 sb.Append($"{p.Name}={p.GetValue(this, null).ToString()}");
             }
+
+            sb.Append($"GetTempUsePtOverSps()={GetTempUsePtOverSps().ToString()}");
+            sb.Append($"GetTempUseTempFlansh()={GetTempUseTempFlansh().ToString()}");
+            sb.Append($"GetTempUseManualInput()={GetTempUseManualInput().ToString()}");
+
+
             return sb.ToString();
         }
 

Common/CordonelPreadjustmentUi/Processes/Actions/LoginProcess.cs

@@ -36,7 +36,19 @@ namespace CordonelPreadjustmentUi.Processes.Actions
                     {
                         pp.DebugMessage($"Load Temp {tempmeterctl.Slot} with {MeterStateControl.TempMode.CalcTof}\n");
 
-                        tempmeterctl.StartTempWatch(MeterStateControl.TempMode.CalcTof);
+                        try
+                        {
+                            tempmeterctl.StartTempWatch(MeterStateControl.TempMode.CalcTof);
+                        }
+                        catch (Exception ex)
+                        {
+                            pp.DebugMessage($"Load Temp error use hand insted");
+                            pp.DebugMessage(ex.Message);
+                            pp.DebugMessage($"Load Temp {tempmeterctl.Slot} with {MeterStateControl.TempMode.Hand}\n");
+
+                            tempmeterctl.StartTempWatch();
+                        }
+                
                     } 
                     else
                     {

Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-bf6bb8fceb3db5a9977dadc407cf576684bf7127
+c43c40a030005a8f189e6179faf40a6d42bfef5c

Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-247396738e2c5d26ac00f9df05c0cc5c61d7f33a
+65d75c3322f8a137c69963cfdc0cb6f1ffacf62a

Common/Ui/LegacyGenesisControl/PreAdjWr.cs

@@ -210,8 +210,11 @@ namespace XylemCommonUiLegacyGenCtl
 
 
 
-                // s.TempSouce = TestsetuptContainer.TempSouce;
+                
                 _logger.Info($"SetSettings [{s.ToString()}]");
+                _logger.Info($"TestsetuptContainer [{TestsetuptContainer.ToString()}]");
+
+
                 wrappedControl.SetSettings(s);
 
                 s.Production = TestsetuptContainer.ProductionMode;
@@ -455,7 +458,7 @@ namespace XylemCommonUiLegacyGenCtl
 
         public dynamic GetTestSetupContainer()
         {
-            MessageBox.Show(TestsetuptContainer.ToString(), "after PreAjdustemnt  GetTestSetupContainer");
+            //MessageBox.Show(TestsetuptContainer.ToString(), "after PreAjdustemnt  GetTestSetupContainer");
             return TestsetuptContainer;
         }
     }

Common/Ui/LegacyGenesisControl/TstContHlp.cs

@@ -190,7 +190,7 @@ namespace XylemCommonUiLegacyGenCtl
 
             if (testSetup.meterTestSettings[Slot - 1] == null)
             {
-                System.Windows.Forms.MessageBox.Show("new testresults from setmetertestsettings");
+                //System.Windows.Forms.MessageBox.Show("new testresults from setmetertestsettings");
                 testSetup.meterTestResults[Slot - 1] = new MeterTestResults();
             }