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

ReSharper: - LegacyGenesisControl\ctlBatch - Part 2

Browse Source
This commit is contained in:
Thomas Wiedebusch
2023-01-03 11:25:42 +01:00
parent f9f8f29bad
commit 3934848b10
1 changed files with 53 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/Ui/LegacyGenesisControl/ctlBatch.cs
+53 -82
View File
@@ -114,8 +114,7 @@ namespace XylemCommonUiLegacyGenCtl
private Dictionary<Int32, String> slotLut = new Dictionary<Int32, String>();
private Dictionary<Int32, Boolean> slotPreadjustment = new Dictionary<Int32, Boolean>();
private Dictionary<String, Tuple<Label, String>> labelValueCollection;
private Boolean isFlyingStartStop = true;
public Boolean IsFlyingStartStop { get; private set; }
@@ -439,19 +438,19 @@ namespace XylemCommonUiLegacyGenCtl
tmpLblValue.Name = $"lblInfo{name}value";
tmpLblValue.Size = new Size(LblPositionSize, LblPositionHeight);
tmpLblValue.TabIndex = index + 1;
tmpLblValue.Text = value.ToString();
tmpLblValue.Text = value;
labelValueCollection.Add(name, new Tuple<Label, String>(tmpLblValue, value));
}
public void updateLableCollection()
public void updateLabelCollection()
{
labelValueCollection["MeterDn"] = new Tuple<Label, String>(labelValueCollection["MeterDn"].Item1, MeterDn);
labelValueCollection["PulseValence"] =
new Tuple<Label, String>(labelValueCollection["PulseValence"].Item1, doubleToStringFormat(RefPulseValence, 2));
new Tuple<Label, String>(labelValueCollection["PulseValence"].Item1, doubleToStringFormat(RefPulseValence));
labelValueCollection["PredictedQFlow"] =
new Tuple<Label, String>(labelValueCollection["PredictedQFlow"].Item1, doubleToStringFormat(PredictedQFlow, 6));
labelValueCollection["PredictedTs"] =
@@ -662,13 +661,10 @@ namespace XylemCommonUiLegacyGenCtl
private Boolean _isAdjustment;
private Boolean _checkAllChannels = true;
/// <summary>
///
/// </summary>
/// <param name="useRequest"></param>
/// <param name="rawLogging"></param>
/// <param name="checkAllChannels"></param>
/// <param name="manualAdjustment">Obsolet</param>
/// <param name="ControlSrt"></param>
public void PrepareBatch(String ControlSrt = "JustToCheckUpdate")
{
@@ -831,7 +827,7 @@ namespace XylemCommonUiLegacyGenCtl
MeterDone(slot, Succeed);
var meter = batch.ListOfMeters.First(f => f.Slot == slot);
if (meter != null && meter is GenesisMeter gen)
if (meter is GenesisMeter gen)
{
slotLut[slot] = gen.LutCrc;
try
@@ -841,12 +837,12 @@ namespace XylemCommonUiLegacyGenCtl
var SerialNumber = a[0];
if (!string.IsNullOrEmpty(SerialNumber))
{
Int32 tmp;
slotPreadjustment[slot] = int.TryParse(a[4], out tmp);
slotPreadjustment[slot] = int.TryParse(a[4], out _);
}
}
catch (Exception)
catch (Exception ex)
{
_logger.Error(ex, $"error at meter done web request (PcbId={gen.PcbId}");
throw;
}
@@ -863,10 +859,6 @@ namespace XylemCommonUiLegacyGenCtl
{
//FF-55-00-00
var meter = batch.ListOfMeters.First(f => f.Slot == slot);
if (meter == null)
{
return;
}
var state = Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.FlowTested;
if (!Succeed)
@@ -905,7 +897,7 @@ namespace XylemCommonUiLegacyGenCtl
}
genMeter.WriteRegister(Register.Genesisflow.SampleRate, 2);
genMeter.WriteRegister(Register.Genesisflow.LedMode, 0, true);
genMeter.WriteRegister(Register.Genesisflow.LedMode, 0);
meter.WriteLog($"MeterIsDone {state} {genMeter.LutCrc }");
}
else
@@ -956,10 +948,6 @@ namespace XylemCommonUiLegacyGenCtl
Task.Factory.StartNew(() =>
{
var meter = batch.ListOfMeters.First(f => f.Slot == slot);
if (meter == null)
{
return;
}
meter.WriteLog(message);
});
}
@@ -967,50 +955,37 @@ namespace XylemCommonUiLegacyGenCtl
{
_logger.Error(ex, $"error at LogMeter(slot={slot},message={message}");
}
}
public void PrepareMeters(String meterDn = "-", Double refPulseValence = 0.0, Double predictedQFlow = 0.0, Double predictedTs = 0.0, Double refError = 0.0, Boolean isAdjustment = false, Boolean IsFlyingStartStop = true)
public void PrepareMeters(String meterDn = "-", Double refPulseValence = 0.0, Double predictedQFlow = 0.0,
Double predictedTs = 0.0, Double refError = 0.0, Boolean isAdjustment = false, Boolean isFlyingStartStop = true)
{
try
{
_logger.Trace($"Start PrepareMeters(meterDn={meterDn},refPulseValence={refPulseValence},predictedQFlow ={predictedQFlow},predictedTs={predictedTs},refError={refError},isAdjustment={isAdjustment},IsFlyingStartStop={IsFlyingStartStop}");
IsFlyingStartStop = isFlyingStartStop;
_logger.Trace($"Start PrepareMeters(meterDn={meterDn},refPulseValence={refPulseValence}," +
$"predictedQFlow ={predictedQFlow},predictedTs={predictedTs},refError={refError}," +
$"isAdjustment={isAdjustment},IsFlyingStartStop={IsFlyingStartStop}");
WarningMetersAlarms = new ConcurrentDictionary<Int32, GenesisMeter.Alarm>();
ErrorMetersAlarms = new ConcurrentDictionary<Int32, GenesisMeter.Alarm>();
setBusy(true, $"Bereite Zähler vor");
initAction(meterDn, refPulseValence, predictedQFlow, predictedTs, refError, isFlyingStartStop);
_isAdjustment = isAdjustment;
if (isAdjustment)
{
CalibrationIsDone = new Dictionary<Int32, LegacyCalibrationResult>();
}
foreach (var meter in batch.ListOfMeters)
{
_logger.Trace($"Meter {meter.Slot} Start PrepareMeters(meterDn={meterDn},refPulseValence={refPulseValence},predictedQFlow ={predictedQFlow},predictedTs={predictedTs},refError={refError},isAdjustment={isAdjustment},IsFlyingStartStop={IsFlyingStartStop}");
_logger.Trace($"Meter {meter.Slot} Start PrepareMeters(meterDn={meterDn}," +
$"refPulseValence={refPulseValence},predictedQFlow ={predictedQFlow}," +
$"predictedTs={predictedTs},refError={refError},isAdjustment={isAdjustment}," +
$"IsFlyingStartStop={IsFlyingStartStop}");
var settings = TestSetupContainer.meterTestSettings.First(f => f != null && f.Slot == meter.Slot);
//if (isAdjustment && !settings.FlowAdjustment)
//{
// continue;
//}
//if (!isAdjustment && !settings.FlowTesting)
//{
// continue;
//}
if (!(meter is GenesisMeter genmeter))
if (!(meter is GenesisMeter genesisMeter))
{
continue;
}
@@ -1019,17 +994,13 @@ namespace XylemCommonUiLegacyGenCtl
_logger.Debug($"Add Meter To Grid {meter.Slot}");
AddMeterToGrid(meter.Slot, meter.SerialNumber, genmeter.PcbId, isFlyingStartStop);
AddMeterToGrid(meter.Slot, meter.SerialNumber, genesisMeter.PcbId, isFlyingStartStop);
if (isAdjustment)
{
CalibrationIsDone.Add(meter.Slot, LegacyCalibrationResult.Pending);
}
if (_useRequest)
{
var r = ((GenesisMeter)meter).ReLogin();
@@ -1043,14 +1014,10 @@ namespace XylemCommonUiLegacyGenCtl
{
((GenesisMeter)meter).InitMeasurement();
}
//// Reboot, HighPeresur
//// Reboot, HighPressure
////ReadOut Alarms, Show and reset
//_logger.Debug($"Start CheckMetersAreReadyForTest");
}
}
TryInvoke(new Action(() =>
@@ -1065,7 +1032,9 @@ namespace XylemCommonUiLegacyGenCtl
}
catch (Exception ex)
{
_logger.Error(ex, $"error at PrepareMeters(meterDn={meterDn},refPulseValence={refPulseValence},predictedQFlow ={predictedQFlow},predictedTs={predictedTs},refError={refError},isAdjustment={isAdjustment},IsFlyingStartStop={IsFlyingStartStop}");
_logger.Error(ex, $"error at PrepareMeters(meterDn={meterDn},refPulseValence={refPulseValence}," +
$"predictedQFlow ={predictedQFlow},predictedTs={predictedTs},refError={refError}," +
$"isAdjustment={isAdjustment},IsFlyingStartStop={IsFlyingStartStop}");
}
}
@@ -1546,22 +1515,18 @@ namespace XylemCommonUiLegacyGenCtl
}
public void AddMeterToGrid(Int32 Slot, String SerialNumber, String PcbId, Boolean IsFlyingStartStop)
public void AddMeterToGrid(Int32 Slot, String SerialNumber, String PcbId, Boolean isFlyingStartStop)
{
try
{
IsFlyingStartStop = isFlyingStartStop;
//var totalWidth = dgvBatch.Columns.GetColumnsWidth(DataGridViewElementStates.None) + 40;
//dgvBatch.Size = new Size(totalWidth, dgvBatch.Size.Height);
updateCell("Einbauplatz", Slot, Slot.ToString());
updateCell("Seriennummer", Slot, SerialNumber);
updateCell("PcbId", Slot, PcbId);
TryInvoke(new Action(() =>
{
dgvBatch.Columns[Slot].Visible = true;
@@ -1571,7 +1536,8 @@ namespace XylemCommonUiLegacyGenCtl
}
catch (Exception ex)
{
_logger.Error(ex, $"error on AddMeterToGrid Slot={Slot},SerialNumber={SerialNumber},IsFlyingStartStop={IsFlyingStartStop}");
_logger.Error(ex, $"error on AddMeterToGrid Slot={Slot},SerialNumber={SerialNumber}," +
$"IsFlyingStartStop={IsFlyingStartStop}");
}
}
@@ -1602,7 +1568,8 @@ namespace XylemCommonUiLegacyGenCtl
// }
//}
private void initAction(String meterDn = "-", Double refPulseValence = 0, Double predictedQFlow = 0, Double predictedTs = 0, Double refError = 0, Boolean isFlyingStartStop = true)
private void initAction(String meterDn = "-", Double refPulseValence = 0, Double predictedQFlow = 0,
Double predictedTs = 0, Double refError = 0, Boolean isFlyingStartStop = true)
{
TryInvoke(new Action(() =>
{
@@ -1617,14 +1584,14 @@ namespace XylemCommonUiLegacyGenCtl
PredictedTs = predictedTs;
RefError = refError;
currentMode = Mode.AutoRefresh;
//this.RefeshTimer.Interval = 10000;
//this.RefeshTimer.Tick += new EventHandler(this.RefreshTimer_Tick);
//this.RefeshTimer.Enabled = true;
//this.RefreshTimer.Interval = 10000;
//this.RefreshTimer.Tick += new EventHandler(this.RefreshTimer_Tick);
//this.RefreshTimer.Enabled = true;
pgbUpdate.Maximum = 10000;
updateLableCollection();
updateLabelCollection();
ExpertMode(cbxExpert.Checked);
// dgvBatch.Size = new Size(SizeOfMeter, dgvBatch.Size.Height);
pgbEndTime.Maximum = (Int32)predictedTs;
@@ -1632,17 +1599,21 @@ namespace XylemCommonUiLegacyGenCtl
}
public void Init(String meterDn = "-", Double refPulseValence = 0, Double predictedQFlow = 0, Double predictedTs = 0, Double refError = 0, Boolean isFlyingStartStop = true)
public void Init(String meterDn = "-", Double refPulseValence = 0, Double predictedQFlow = 0, Double predictedTs = 0,
Double refError = 0, Boolean isFlyingStartStop = true)
{
try
{
IsFlyingStartStop = isFlyingStartStop;
setBusy(true, "lade Prüfpunkt");
initAction(meterDn, refPulseValence, predictedQFlow, predictedTs, refError, isFlyingStartStop);
initAction(meterDn, refPulseValence, predictedQFlow, predictedTs, refError, IsFlyingStartStop);
setBusy(false);
}
catch (Exception ex)
{
_logger.Error(ex, $"error on Init meterDn={meterDn},refPulseValence={refPulseValence},predictedQFlow={predictedQFlow},predictedTs={predictedTs},refError={refError},isFlyingStartStop={isFlyingStartStop}");
_logger.Error(ex, $"error on Init meterDn={meterDn},refPulseValence={refPulseValence}," +
$"predictedQFlow={predictedQFlow},predictedTs={predictedTs}," +
$"refError={refError},IsFlyingStartStop={IsFlyingStartStop}");
}
}
@@ -1662,7 +1633,7 @@ namespace XylemCommonUiLegacyGenCtl
RefFlowrate = refFlowrate;
RefTestTime = refTestTime;
RefFlowUncorrected = refFlowUncorrected;
updateLableCollection();
updateLabelCollection();
updateTotalProgress(refTestTime);
// if (forceMeterUpdate)
@@ -1726,10 +1697,10 @@ namespace XylemCommonUiLegacyGenCtl
}
updateCell($"Status", _meter.Slot, textState, statusColor);
Double? testtime = null;
if (isFlyingStartStop)
Double? testTime = null;
if (IsFlyingStartStop)
{
testtime = RefTestTime;
testTime = RefTestTime;
}
if (ProcessStatus != MeasurementStates.NotStarted)
@@ -1739,24 +1710,24 @@ namespace XylemCommonUiLegacyGenCtl
{
if (_checkAllChannels)
{
interResult = _meter.GetAllMeasurementResults(CurrentRefVolume, testtime, true);
interResult = _meter.GetAllMeasurementResults(CurrentRefVolume, testTime, true);
}
else
{
interResult.Add(_meter.GetMainMeasurementResult(CurrentRefVolume, testtime, true));
interResult.Add(_meter.GetMainMeasurementResult(CurrentRefVolume, testTime, true));
}
}
else if (ProcessStatus == MeasurementStates.IsCompleted)
{
if (_checkAllChannels)
{
interResult = _meter.GetAllMeasurementResults(CurrentRefVolume, testtime, false);
interResult = _meter.GetAllMeasurementResults(CurrentRefVolume, testTime);
}
else
{
interResult.Add(_meter.GetMainMeasurementResult(CurrentRefVolume, testtime, false));
interResult.Add(_meter.GetMainMeasurementResult(CurrentRefVolume, testTime));
}
}
if (interResult != null && interResult.Any())
@@ -2072,7 +2043,7 @@ namespace XylemCommonUiLegacyGenCtl
var text = "-";
if (Value != double.NaN)
{
text = string.Format("{0:N" + digits.ToString() + "}", Value);
text = string.Format("{0:N" + digits + "}", Value);
}
return text;