Fix bug where multiple threads modify same variable at the same time. Perform some refactoring
This commit is contained in:
@@ -72,8 +72,8 @@ namespace ProgramLib
|
||||
ProgramLib.Program.Instance().GetGuiManager()[ProgramGuiManager.WINDOWS.LIVE_DATA].Hide();
|
||||
});
|
||||
|
||||
Program.Instance()._eventManager[EventManager.Events.UUT_POWER_ON].Reset();
|
||||
Program.Instance()._eventManager[EventManager.Events.UUT_POWER_OFF].Set();
|
||||
Program.Instance().EventManager[EventManager.Events.UUT_POWER_ON].Reset();
|
||||
Program.Instance().EventManager[EventManager.Events.UUT_POWER_OFF].Set();
|
||||
|
||||
Program.Instance()._isUutPwrOn = false;
|
||||
}
|
||||
@@ -110,7 +110,7 @@ namespace ProgramLib
|
||||
|
||||
if (_sttoSuccess)
|
||||
{
|
||||
Program.Instance()._powerSupplySharedData.ResetAll();
|
||||
Program.Instance().PowerSupplySharedData.ResetAll();
|
||||
|
||||
ProgramLib.Program.Instance().GetGuiManager()[ProgramGuiManager.WINDOWS.IMPEDANCE_CHECK].Dispatcher.Invoke((Action)delegate
|
||||
{
|
||||
@@ -122,8 +122,8 @@ namespace ProgramLib
|
||||
// disable front panel
|
||||
Program.Instance().MalMeasurementLibManager.PowerSupplyMeasurementManager.DisplayDisable("STE_POWER_SUPPLY_SYSTEM");
|
||||
|
||||
Program.Instance()._eventManager[EventManager.Events.UUT_POWER_OFF].Reset();
|
||||
Program.Instance()._eventManager[EventManager.Events.UUT_POWER_ON].Set();
|
||||
Program.Instance().EventManager[EventManager.Events.UUT_POWER_OFF].Reset();
|
||||
Program.Instance().EventManager[EventManager.Events.UUT_POWER_ON].Set();
|
||||
|
||||
Program.Instance()._isUutPwrOn = true;
|
||||
}
|
||||
@@ -178,9 +178,9 @@ namespace ProgramLib
|
||||
impedanceDataModel.PassFailImagePath = impedanceCheckWindow.ViewModel.ImageToResourcePathDict[passFailImage];
|
||||
impedanceDataModel.Description = $"{measurementName} Measured {measurement} Range [0,50]";
|
||||
|
||||
if (Program.Instance()._testStandSeqContext != null)
|
||||
if (Program.Instance().TestStandSeqContext != null)
|
||||
{
|
||||
Program.Instance()._testStandSeqContext.Step.AdditionalResults.CustomResults.Insert($"\"{measurementName}\"", $"\"Measured: {measurement++} Range [0,50] - {measurementStatus}\"");
|
||||
Program.Instance().TestStandSeqContext.Step.AdditionalResults.CustomResults.Insert($"\"{measurementName}\"", $"\"Measured: {measurement++} Range [0,50] - {measurementStatus}\"");
|
||||
}
|
||||
|
||||
impedanceCheckWindow.ViewModel.AddData(impedanceDataModel);
|
||||
|
||||
Reference in New Issue
Block a user