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

Long time no commit

Browse Source
This commit is contained in:
Roland Drabesch
2022-04-06 10:42:16 +02:00
parent 0a72be12ab
commit ec37bb9b9e
225 changed files with 65673 additions and 18510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs
+15 -11
View File
@@ -76,7 +76,7 @@ namespace CordonelPreadjustmentUi
}
tmpI = 1;
if (settings.TempMeters.Any() && !settings.TempMan)
if (settings.TempMeters.Any() && settings.GetTempUseTempFlansh())
{
foreach (var tempMeter in settings.TempMeters)
{
@@ -92,7 +92,6 @@ namespace CordonelPreadjustmentUi
}
else
{
settings.TempMan = true;
var ctl = new TempMeterStateControl("Input");
ctl.Location = new Point(5 + ((tmpI - 1) * ctl.Width), 15);
ctl.SetChecked(true);
@@ -1412,7 +1411,7 @@ namespace CordonelPreadjustmentUi
GlobalMeterBatch = new MeterBatch();
ThermoMeterBatch = new MeterBatch();
if (settings.TempMan)
if (!settings.GetTempUseTempFlansh())
{
TempMeterStateCtls = new List<MeterStateControl>();
}
@@ -1521,14 +1520,19 @@ namespace CordonelPreadjustmentUi
}
try
{
foreach (var meterCtl in TempMeterStateCtls)
if (!settings.GetTempUseManualInput())
{
if (meterCtl != null && meterCtl.IsEnabled)
foreach (var meterCtl in TempMeterStateCtls)
{
meterCtl.Ok = meterCtl.Meter.CheckStreamingPort();
if (meterCtl != null && meterCtl.IsEnabled)
{
meterCtl.Ok = meterCtl.Meter.CheckStreamingPort();
}
}
AllMeterStateCtrls().ForEach(f => f.SetUi());
}
AllMeterStateCtrls().ForEach(f => f.SetUi());
}
catch (Exception ex)
{
@@ -1564,9 +1568,9 @@ namespace CordonelPreadjustmentUi
}
else
{
DialogResult AskForActions;
DialogResult AskForActions = DialogResult.Ignore;
AbortButtonEnabled(false);
AskForActions = ShowMsg(Text, $"{sequenceName}", MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Question);
AskForActions = ShowMsg(Text, $"{sequenceName}", MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Question, true);
AbortButtonEnabled(true);
DebugMessage($"AskForActions on {sequenceName} selected {AskForActions}");
@@ -1656,7 +1660,7 @@ namespace CordonelPreadjustmentUi
pp.OnRequestTemperatur += delegate (Object o, EventArgs args)
{
OnRequestTemperatur.Invoke(o, new EventArgs());
OnRequestTemperatur?.Invoke(o, new EventArgs());
};
@@ -1982,7 +1986,7 @@ namespace CordonelPreadjustmentUi
ThermoMeterBatch = new MeterBatch();
StopMainSequence(msg, MessageBoxIcon.Information, c);
OnIsDone?.Invoke(this,new EventArgsMeterSuccsessfull(goodMeters));
OnIsDone?.Invoke(this, new EventArgsMeterSuccsessfull(goodMeters));
}