marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MagFlux 5 min Zeroflow, Magflux testresult mit abfrage

Browse Source
This commit is contained in:
Roland Drabesch 2023-08-30 16:18:15 +02:00
parent 222001ebc5
commit bbbaa8f7a1
15 changed files with 77 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs
View File

@ -1939,7 +1939,7 @@ namespace CordonelPreadjustmentUi
}
}
private void PushProgressBars(int totalSecondsEstm, DateTimeOffset totalStart, int currentProccessEstm, DateTimeOffset currentProccessStartTime)
public void PushProgressBars(int totalSecondsEstm, DateTimeOffset totalStart, int currentProccessEstm, DateTimeOffset currentProccessStartTime)
{
if (this.InvokeRequired)
{

4
Common/Hardware/PLC/Siemens/Client/TestbenchAdapter/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="5.2.2" targetFramework="net451" />
</packages>

2
Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
View File

@ -898,6 +898,7 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore
{
throw new ApplicationException("Can not find an ongoing measurement");
}
mainMeasurement.FlowDirectionforCalculatingVol = dir;
var results = new List<MeasurementResults>();
var mainResult = intermediateMeasurement
@ -1034,7 +1035,6 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore
public void StopCalibration()
{
StopMeasurement();
RequestProtocol?.AbortDeviceForCalibration();
RequestProtocol?.CloseConnection();
}

4
Common/Hardware/WaterMeter/MagFlux/Protocols/StreamingProtocol/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="5.2.2" targetFramework="net48" />
</packages>

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

@ -1 +1 @@
89102b0142e574de38a9f47d370f3334e5e6c268
c43c40a030005a8f189e6179faf40a6d42bfef5c

4
Common/Logic/RelatePcb/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="5.2.2" targetFramework="net40" />
</packages>

4
Common/Logic/ServiceCore/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="5.2.2" targetFramework="net40" />
</packages>

2
Common/Metrology/Measurements/MeasurementRecord.cs
View File

@ -20,7 +20,7 @@ namespace Xylem.Common.Metrology.Measurements
public Double VolumeCm;
/// <summary>
/// Reverse volume in cubic meters
/// Forward volume in cubic meters
/// </summary>
public Double ForwardVolumeCm;

2
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
338bdd8d71c148c9df0972f903098eb23eacf0c9
65d75c3322f8a137c69963cfdc0cb6f1ffacf62a

4
Common/Ui.ProductionControls/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="5.2.2" targetFramework="net40" />
</packages>

4
Common/Ui/DynamicStremingLogAnalyzer/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="5.2.2" targetFramework="net472" />
</packages>

4
Common/Ui/IrdaDemo/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="5.2.2" targetFramework="net46" />
</packages>

4
Common/Ui/IrdaFunctionalTestApp/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="5.2.2" targetFramework="net461" />
</packages>

24
Common/Ui/LegacyGenesisControl/PreAdjWr.cs
View File

@ -273,7 +273,7 @@ namespace XylemCommonUiLegacyGenCtl
}
else if (Mode == MeterTypes.MagFlux)
{
wrappedControl.StatusLabel("MagFlux Zeroflow is preparing");
var meterBatch = new MeterBatch();
foreach (var item in TestsetuptContainer?.meterTestSettings)
@ -295,10 +295,28 @@ namespace XylemCommonUiLegacyGenCtl
var c = TestsetuptContainer.meterTestSettings.Count();
TestsetuptContainer.meterTestResults = new MeterTestResults[c];
try
{
Thread.Sleep(60000);
var testTimeMS = 300000;
wrappedControl.StatusLabel("MagFlux Zeroflow is running");
var Start = DateTimeOffset.Now;
while (testTimeMS >= 0)
{
testTimeMS = testTimeMS - 50;
wrappedControl.PushProgressBars(testTimeMS / 1000, Start, testTimeMS / 1000, Start);
Thread.Sleep(50);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
foreach (var meter in meterBatch.ListOfMeters)
{

29
Common/Ui/LegacyGenesisControl/ctlBatch.cs
View File

@ -1546,6 +1546,7 @@ namespace XylemCommonUiLegacyGenCtl
}
catch (Exception ex)
{
_logger.Error(ex, $"error on GetResults Slot={Slot},Chnnl={Chnnl},refVolQm={refVolQm},refTimeS={refTimeS}");
return null;
}
@ -1560,21 +1561,29 @@ namespace XylemCommonUiLegacyGenCtl
MeasurementResults? result;
var t = MeasurementDirection.TakeBoth;
if (TestSetupContainer != null && TestSetupContainer.meterTestSettings != null && TestSetupContainer.meterTestSettings.Any(ts => ts.Slot == Slot))
try
{
var testset = TestSetupContainer.meterTestSettings.First(ts => ts.Slot == Slot);
if (testset.FlowTestingOnlyRevers)
if (TestSetupContainer != null && TestSetupContainer.meterTestSettings != null && TestSetupContainer.meterTestSettings.Any(ts => ts != null && ts.Slot == Slot))
{
t = MeasurementDirection.TakeOnlyBackward;
var testset = TestSetupContainer.meterTestSettings.First(ts => ts != null && ts.Slot == Slot);
if (testset.FlowTestingOnlyRevers)
{
t = MeasurementDirection.TakeOnlyBackward;
}
else if (testset.FlowTestingOnlyForward)
{
t = MeasurementDirection.TakeOnlyForward;
}
}
else if (testset.FlowTestingOnlyForward)
{
t = MeasurementDirection.TakeOnlyForward;
}
}
catch (Exception ex)
{
_logger.Error(ex, $"error on GetResults find Testcontainer Slot={Slot},Chnnl={Chnnl},refVolQm={refVolQm},refTimeS={refTimeS}");
throw;
}
result = GetMeasurementResult(Slot, Chnnl, refVolQm, refTimeS,t);
if (!result.HasValue)