Develop - GciBridge -> GCI -> PreadjustmentUI functions 4

This commit is contained in:
2026-05-26 10:51:18 +02:00
parent 9700ba7900
commit c5f52e06fa
6 changed files with 90 additions and 87 deletions
@@ -1414,7 +1414,7 @@ namespace GenesisCordonelInterface.API
private FrmCordonelPreadjustmentUI _preadjustmentForm;
private readonly object _formLock = new object();
public event EventHandler PreadjustmentFormClosedByUser;
public event EventHandler PreAdjustmentFormClosedByUser;
/// <summary>
/// Shows singleton instance of preadjustment form.
@@ -1456,7 +1456,7 @@ namespace GenesisCordonelInterface.API
/// _bridge.ShowPreadjustmentForm(this);
///
/// </summary>
public void ShowPreadjustmentForm(IWin32Window owner)
public void ShowPreAdjustmentForm(IWin32Window owner)
{
lock (_formLock)
{
@@ -1476,7 +1476,7 @@ namespace GenesisCordonelInterface.API
_preadjustmentForm.Hide();
// Notify outside code that the form was closed by user
PreadjustmentFormClosedByUser?.Invoke(
PreAdjustmentFormClosedByUser?.Invoke(
this,
EventArgs.Empty);
}
@@ -1526,7 +1526,7 @@ namespace GenesisCordonelInterface.API
#region ================================== PreAdjustmentUI DETECT process ==================================
public Task<PreadjustmentDetectResult> Preadjustment_DetectAsync(
public Task<PreadjustmentDetectResult> PreAdjustment_DetectAsync(
CancellationToken token = default)
{
return Task.Run(() => Preadjustment_DetectCore(token), token);
@@ -1724,24 +1724,24 @@ namespace GenesisCordonelInterface.API
#endregion
#region ================================== PreAdjustmentUI PREPARATION process ==================================
public Task<PreadjustmentProcessResult> Preadjustment_PreparationAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_PreparationAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return GetWorker(slot).RunAsync(
() => Preadjustment_Preparation(slot, pp),
() => PreAdjustment_Preparation(slot, pp),
token);
}
/// <summary>
/// Executes standalone preparation process.
/// </summary>
public PreadjustmentProcessResult Preadjustment_Preparation(
public PreAdjustmentProcessResult PreAdjustment_Preparation(
int slot,
ProcessProgress pp)
{
const string operation = nameof(Preadjustment_Preparation);
const string operation = nameof(PreAdjustment_Preparation);
try
{
@@ -1757,7 +1757,7 @@ namespace GenesisCordonelInterface.API
ExecuteProcess(process, pp);
var result =
new PreadjustmentProcessResult
new PreAdjustmentProcessResult
{
Success = success,
Slot = slot,
@@ -1775,7 +1775,7 @@ namespace GenesisCordonelInterface.API
{
LogError(operation, ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -1813,21 +1813,21 @@ namespace GenesisCordonelInterface.API
#endregion
#region ================================== PreAdjustmentUI AMPLITUDE TEST process ==================================
public Task<PreadjustmentProcessResult> Preadjustment_AmplitudeTestAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_AmplitudeTestAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return GetWorker(slot).RunAsync(
() => Preadjustment_AmplitudeTest(slot, pp),
() => PreAdjustment_AmplitudeTest(slot, pp),
token);
}
public PreadjustmentProcessResult Preadjustment_AmplitudeTest(
public PreAdjustmentProcessResult PreAdjustment_AmplitudeTest(
int slot,
ProcessProgress pp)
{
const string operation = nameof(Preadjustment_AmplitudeTest);
const string operation = nameof(PreAdjustment_AmplitudeTest);
try
{
@@ -1838,7 +1838,7 @@ namespace GenesisCordonelInterface.API
if (pp.Setting.TempOnly)
{
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = true,
Slot = slot,
@@ -1852,7 +1852,7 @@ namespace GenesisCordonelInterface.API
LogInfo(operation, $"Finished. Slot={slot}, Success={success}");
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = success,
Slot = slot,
@@ -1864,7 +1864,7 @@ namespace GenesisCordonelInterface.API
{
LogError(operation, ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -1903,22 +1903,22 @@ namespace GenesisCordonelInterface.API
#region ================================== PreAdjustmentUI TEMPERATURE CALIBRATION process ==================================
public Task<PreadjustmentProcessResult> Preadjustment_TemperatureCalibrationAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_TemperatureCalibrationAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return GetWorker(slot).RunAsync(
() => Preadjustment_TemperatureCalibration(slot, pp),
() => PreAdjustment_TemperatureCalibration(slot, pp),
token);
}
public PreadjustmentProcessResult Preadjustment_TemperatureCalibration(
public PreAdjustmentProcessResult PreAdjustment_TemperatureCalibration(
int slot,
ProcessProgress pp)
{
const string operation =
nameof(Preadjustment_TemperatureCalibration);
nameof(PreAdjustment_TemperatureCalibration);
try
{
@@ -1936,7 +1936,7 @@ namespace GenesisCordonelInterface.API
ExecuteProcess(process, pp);
var result =
new PreadjustmentProcessResult
new PreAdjustmentProcessResult
{
Success = success,
Slot = slot,
@@ -1954,7 +1954,7 @@ namespace GenesisCordonelInterface.API
{
LogError(operation, ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -1993,22 +1993,22 @@ namespace GenesisCordonelInterface.API
#region ================================== PreAdjustmentUI OFFSET TEST process ==================================
public Task<PreadjustmentProcessResult> Preadjustment_OffsetTestAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_OffsetTestAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return GetWorker(slot).RunAsync(
() => Preadjustment_OffsetTest(slot, pp),
() => PreAdjustment_OffsetTest(slot, pp),
token);
}
public PreadjustmentProcessResult Preadjustment_OffsetTest(
public PreAdjustmentProcessResult PreAdjustment_OffsetTest(
int slot,
ProcessProgress pp)
{
const string operation =
nameof(Preadjustment_OffsetTest);
nameof(PreAdjustment_OffsetTest);
try
{
@@ -2021,7 +2021,7 @@ namespace GenesisCordonelInterface.API
if (pp.Setting.TempOnly)
{
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = true,
Slot = slot,
@@ -2036,7 +2036,7 @@ namespace GenesisCordonelInterface.API
ExecuteProcess(process, pp);
var result =
new PreadjustmentProcessResult
new PreAdjustmentProcessResult
{
Success = success,
Slot = slot,
@@ -2054,7 +2054,7 @@ namespace GenesisCordonelInterface.API
{
LogError(operation, ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -2093,22 +2093,22 @@ namespace GenesisCordonelInterface.API
#region ================================== PreAdjustmentUI COMPLETION process ==================================
public Task<PreadjustmentProcessResult> Preadjustment_CompletionAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_CompletionAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return GetWorker(slot).RunAsync(
() => Preadjustment_Completion(slot, pp),
() => PreAdjustment_Completion(slot, pp),
token);
}
public PreadjustmentProcessResult Preadjustment_Completion(
public PreAdjustmentProcessResult PreAdjustment_Completion(
int slot,
ProcessProgress pp)
{
const string operation =
nameof(Preadjustment_Completion);
nameof(PreAdjustment_Completion);
try
{
@@ -2126,7 +2126,7 @@ namespace GenesisCordonelInterface.API
ExecuteProcess(process, pp);
var result =
new PreadjustmentProcessResult
new PreAdjustmentProcessResult
{
Success = success,
Slot = slot,
@@ -2144,7 +2144,7 @@ namespace GenesisCordonelInterface.API
{
LogError(operation, ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -26,7 +26,7 @@ namespace GenesisCordonelInterface.API
_innerMeterAPI = new InterfaceGCIToLaatzen();
}
//
//
#region ================================== PORT DETECTION ==================================
@@ -456,50 +456,53 @@ namespace GenesisCordonelInterface.API
// Preadjustment
public Task<PreadjustmentDetectResult> Preadjustment_DetectAsync(
#region ================================== PreAdjustment ==================================
public Task<PreadjustmentDetectResult> PreAdjustment_DetectAsync(
CancellationToken token = default)
{
return _innerMeterAPI.Preadjustment_DetectAsync(token);
return _innerMeterAPI.PreAdjustment_DetectAsync(token);
}
public Task<PreadjustmentProcessResult> Preadjustment_PreparationAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_PreparationAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return _innerMeterAPI.Preadjustment_PreparationAsync(slot, pp, token);
return _innerMeterAPI.PreAdjustment_PreparationAsync(slot, pp, token);
}
public Task<PreadjustmentProcessResult> Preadjustment_AmplitudeTestAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_AmplitudeTestAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return _innerMeterAPI.Preadjustment_AmplitudeTestAsync(slot, pp, token);
return _innerMeterAPI.PreAdjustment_AmplitudeTestAsync(slot, pp, token);
}
public Task<PreadjustmentProcessResult> Preadjustment_TemperatureCalibrationAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_TemperatureCalibrationAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return _innerMeterAPI.Preadjustment_TemperatureCalibrationAsync(slot, pp, token);
return _innerMeterAPI.PreAdjustment_TemperatureCalibrationAsync(slot, pp, token);
}
public Task<PreadjustmentProcessResult> Preadjustment_OffsetTestAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_OffsetTestAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return _innerMeterAPI.Preadjustment_OffsetTestAsync(slot, pp, token);
return _innerMeterAPI.PreAdjustment_OffsetTestAsync(slot, pp, token);
}
public Task<PreadjustmentProcessResult> Preadjustment_CompletionAsync(
public Task<PreAdjustmentProcessResult> PreAdjustment_CompletionAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
return _innerMeterAPI.Preadjustment_CompletionAsync(slot, pp, token);
return _innerMeterAPI.PreAdjustment_CompletionAsync(slot, pp, token);
}
#endregion
}
}
+1 -1
View File
@@ -448,7 +448,7 @@ namespace GenesisCordonelInterface.API
}
}
public class PreadjustmentProcessResult
public class PreAdjustmentProcessResult
{
public bool Success { get; set; }
public int Slot { get; set; }
+28 -28
View File
@@ -1426,10 +1426,10 @@ namespace TBF.Rig.BridgeComponents.GciBridge
#region ================================== Preadjustment DETECT bridge ==================================
public async Task<PreadjustmentDetectResult> Preadjustment_DetectAsync(
public async Task<PreadjustmentDetectResult> PreAdjustment_DetectAsync(
CancellationToken token = default)
{
const string operation = nameof(Preadjustment_DetectAsync);
const string operation = nameof(PreAdjustment_DetectAsync);
try
{
@@ -1439,7 +1439,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge
PreadjustmentDetectResult result =
await gciExternalInterface
.Preadjustment_DetectAsync(token)
.PreAdjustment_DetectAsync(token)
.ConfigureAwait(false);
log.InfoFormat(
@@ -1469,12 +1469,12 @@ namespace TBF.Rig.BridgeComponents.GciBridge
#region ================================== PreAdjustment PREPARATION bridge ==================================
public async Task<PreadjustmentProcessResult> Preadjustment_PreparationAsync(
public async Task<PreAdjustmentProcessResult> PreAdjustment_PreparationAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
const string operation = nameof(Preadjustment_PreparationAsync);
const string operation = nameof(PreAdjustment_PreparationAsync);
try
{
@@ -1489,9 +1489,9 @@ namespace TBF.Rig.BridgeComponents.GciBridge
operation,
slot);
PreadjustmentProcessResult result =
PreAdjustmentProcessResult result =
await gciExternalInterface
.Preadjustment_PreparationAsync(
.PreAdjustment_PreparationAsync(
slot,
pp,
token)
@@ -1511,7 +1511,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge
string.Format("{0}: {1} failed.", Name, operation),
ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -1526,12 +1526,12 @@ namespace TBF.Rig.BridgeComponents.GciBridge
#region ================================== PreAdjustment AMPLITUDE TEST bridge ==================================
public async Task<PreadjustmentProcessResult> Preadjustment_AmplitudeTestAsync(
public async Task<PreAdjustmentProcessResult> PreAdjustment_AmplitudeTestAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
const string operation = nameof(Preadjustment_AmplitudeTestAsync);
const string operation = nameof(PreAdjustment_AmplitudeTestAsync);
try
{
@@ -1546,9 +1546,9 @@ namespace TBF.Rig.BridgeComponents.GciBridge
operation,
slot);
PreadjustmentProcessResult result =
PreAdjustmentProcessResult result =
await gciExternalInterface
.Preadjustment_AmplitudeTestAsync(
.PreAdjustment_AmplitudeTestAsync(
slot,
pp,
token)
@@ -1568,7 +1568,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge
string.Format("{0}: {1} failed.", Name, operation),
ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -1582,12 +1582,12 @@ namespace TBF.Rig.BridgeComponents.GciBridge
#region ================================== PreAdjustment TEMPERATURE CALIBRATION bridge ==================================
public async Task<PreadjustmentProcessResult> Preadjustment_TemperatureCalibrationAsync(
public async Task<PreAdjustmentProcessResult> PreAdjustment_TemperatureCalibrationAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
const string operation = nameof(Preadjustment_TemperatureCalibrationAsync);
const string operation = nameof(PreAdjustment_TemperatureCalibrationAsync);
try
{
@@ -1602,9 +1602,9 @@ namespace TBF.Rig.BridgeComponents.GciBridge
operation,
slot);
PreadjustmentProcessResult result =
PreAdjustmentProcessResult result =
await gciExternalInterface
.Preadjustment_TemperatureCalibrationAsync(
.PreAdjustment_TemperatureCalibrationAsync(
slot,
pp,
token)
@@ -1624,7 +1624,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge
string.Format("{0}: {1} failed.", Name, operation),
ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -1639,12 +1639,12 @@ namespace TBF.Rig.BridgeComponents.GciBridge
#region ================================== PreAdjustment OFFSET TEST bridge ==================================
public async Task<PreadjustmentProcessResult> Preadjustment_OffsetTestAsync(
public async Task<PreAdjustmentProcessResult> PreAdjustment_OffsetTestAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
const string operation = nameof(Preadjustment_OffsetTestAsync);
const string operation = nameof(PreAdjustment_OffsetTestAsync);
try
{
@@ -1659,9 +1659,9 @@ namespace TBF.Rig.BridgeComponents.GciBridge
operation,
slot);
PreadjustmentProcessResult result =
PreAdjustmentProcessResult result =
await gciExternalInterface
.Preadjustment_OffsetTestAsync(
.PreAdjustment_OffsetTestAsync(
slot,
pp,
token)
@@ -1681,7 +1681,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge
string.Format("{0}: {1} failed.", Name, operation),
ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -1696,12 +1696,12 @@ namespace TBF.Rig.BridgeComponents.GciBridge
#region ================================== PreAdjustment COMPLETION bridge ==================================
public async Task<PreadjustmentProcessResult> Preadjustment_CompletionAsync(
public async Task<PreAdjustmentProcessResult> PreAdjustment_CompletionAsync(
int slot,
ProcessProgress pp,
CancellationToken token = default)
{
const string operation = nameof(Preadjustment_CompletionAsync);
const string operation = nameof(PreAdjustment_CompletionAsync);
try
{
@@ -1716,9 +1716,9 @@ namespace TBF.Rig.BridgeComponents.GciBridge
operation,
slot);
PreadjustmentProcessResult result =
PreAdjustmentProcessResult result =
await gciExternalInterface
.Preadjustment_CompletionAsync(
.PreAdjustment_CompletionAsync(
slot,
pp,
token)
@@ -1738,7 +1738,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge
string.Format("{0}: {1} failed.", Name, operation),
ex);
return new PreadjustmentProcessResult
return new PreAdjustmentProcessResult
{
Success = false,
Slot = slot,
@@ -423,7 +423,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI
Logger.Trace("FORM: ---------------------------------");
Logger.Trace("FORM: Preadjustment open.");
_laatzenApi.ShowPreadjustmentForm(DialogOwner);
_laatzenApi.ShowPreAdjustmentForm(DialogOwner);
Logger.Trace("FORM: Preadjustment shown.");
}
@@ -166,7 +166,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI.StaraTuraAPI_GciBridge
ExecuteAsync(async token =>
{
await ExecutePreadjustmentForSelectedSlotsAsync(
_bridge.Preadjustment_PreparationAsync,
_bridge.PreAdjustment_PreparationAsync,
"Preparation",
token);
});
@@ -179,7 +179,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI.StaraTuraAPI_GciBridge
ExecuteAsync(async token =>
{
await ExecutePreadjustmentForSelectedSlotsAsync(
_bridge.Preadjustment_AmplitudeTestAsync,
_bridge.PreAdjustment_AmplitudeTestAsync,
"Amplitude Test",
token);
});
@@ -192,7 +192,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI.StaraTuraAPI_GciBridge
ExecuteAsync(async token =>
{
await ExecutePreadjustmentForSelectedSlotsAsync(
_bridge.Preadjustment_TemperatureCalibrationAsync,
_bridge.PreAdjustment_TemperatureCalibrationAsync,
"Temperature Calibration",
token);
});
@@ -205,7 +205,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI.StaraTuraAPI_GciBridge
ExecuteAsync(async token =>
{
await ExecutePreadjustmentForSelectedSlotsAsync(
_bridge.Preadjustment_OffsetTestAsync,
_bridge.PreAdjustment_OffsetTestAsync,
"Offset Test",
token);
});
@@ -218,7 +218,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI.StaraTuraAPI_GciBridge
ExecuteAsync(async token =>
{
await ExecutePreadjustmentForSelectedSlotsAsync(
_bridge.Preadjustment_CompletionAsync,
_bridge.PreAdjustment_CompletionAsync,
"Completion",
token);
});
@@ -246,7 +246,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI.StaraTuraAPI_GciBridge
CreateMeterControls(selectedSlots);
PreadjustmentDetectResult result =
await _bridge.Preadjustment_DetectAsync(token);
await _bridge.PreAdjustment_DetectAsync(token);
Log(
result.Success
@@ -367,7 +367,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI.StaraTuraAPI_GciBridge
}
private async Task ExecutePreadjustmentForSelectedSlotsAsync(
Func<int, ProcessProgress, CancellationToken, Task<PreadjustmentProcessResult>> action,
Func<int, ProcessProgress, CancellationToken, Task<PreAdjustmentProcessResult>> action,
string processName,
CancellationToken token)
{
@@ -385,7 +385,7 @@ namespace TBF.Rig.BridgeComponents.GciBridge.UI.StaraTuraAPI_GciBridge
foreach (var selectedSlot in selectedSlots)
{
PreadjustmentProcessResult result =
PreAdjustmentProcessResult result =
await action(
selectedSlot.Slot,
pp,