From a67a709782cd7cbbce5dfa2431193826f8eb626b Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 27 Jun 2018 11:23:33 +0200 Subject: [PATCH] (1) Fixes in Screens.ProcessTabPageXY, (2) Program can be closed when there is a red error message, ver. 2.18.955 --- TBF/MainWnd.cs | 3 ++- TBF/Properties/AssemblyInfo.cs | 4 ++-- TBF/Screens/ProcessTabPageCtrl24.cs | 4 ++-- TBF/Screens/ProcessTabPageCtrl48.cs | 6 +++--- TBF/Screens/ProcessTabPageCtrl6.cs | 8 ++++---- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/TBF/MainWnd.cs b/TBF/MainWnd.cs index 64226c968..e2aea9617 100644 --- a/TBF/MainWnd.cs +++ b/TBF/MainWnd.cs @@ -344,6 +344,7 @@ namespace TBF { case ActivityEventArgs.Update.Activity: activityLabel.Text = args.Activity; + if (string.IsNullOrEmpty(messageLabel.Text)) messageLabel.ForeColor = Color.Black; break; case ActivityEventArgs.Update.Message: messageLabel.Text = args.Message; @@ -620,7 +621,7 @@ namespace TBF emergencyStopModelessDlg.Visible = false; } - if (BenchControl.StateMachine.Running && CycleRunning) + if (BenchControl.StateMachine.Running && (messageLabel.ForeColor != Color.Red) && CycleRunning) { MessageBox.Show(Strings.Finish_the_session_please, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Exclamation); if (e is FormClosingEventArgs) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 61004a70c..6cbf90274 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.954.0")] -[assembly: AssemblyFileVersion("2.18.954.0")] +[assembly: AssemblyVersion("2.18.955.0")] +[assembly: AssemblyFileVersion("2.18.955.0")] diff --git a/TBF/Screens/ProcessTabPageCtrl24.cs b/TBF/Screens/ProcessTabPageCtrl24.cs index a60a34dd4..efd81aa01 100644 --- a/TBF/Screens/ProcessTabPageCtrl24.cs +++ b/TBF/Screens/ProcessTabPageCtrl24.cs @@ -524,8 +524,8 @@ namespace TBF.Screens tOutLabel.Text = tRes.TempDownMean.ToString("F2"); tDivLabel.Text = tRes.TempDivMean.ToString("F2"); - prInLabel.Text = tRes.PressUpMean.ToString("F1"); - prOutLabel.Text = tRes.PressDownMean.ToString("F1"); + prInLabel.Text = tRes.PressUpMean.ToString("F2"); + prOutLabel.Text = tRes.PressDownMean.ToString("F2"); massLabel.Text = ProcessData.Mass.ToString(); massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3"); diff --git a/TBF/Screens/ProcessTabPageCtrl48.cs b/TBF/Screens/ProcessTabPageCtrl48.cs index b46e7043c..a26336840 100644 --- a/TBF/Screens/ProcessTabPageCtrl48.cs +++ b/TBF/Screens/ProcessTabPageCtrl48.cs @@ -457,7 +457,7 @@ namespace TBF.Screens tDivLabel.Text = ProcessData.TempDiv.ToString(); prInLabel.Text = ProcessData.PressUp.ToString(); - prOutLabel.Text = ProcessData.PressDown.ToString(); + prOutLabel.Text = ProcessData.PressDown.ToString(); massLabel.Text = ProcessData.Mass.ToString(); @@ -553,8 +553,8 @@ namespace TBF.Screens tOutLabel.Text = tRes.TempDownMean.ToString("F2"); tDivLabel.Text = tRes.TempDivMean.ToString("F2"); - prInLabel.Text = tRes.PressUpMean.ToString("F1"); - prOutLabel.Text = tRes.PressDownMean.ToString("F1"); + prInLabel.Text = tRes.PressUpMean.ToString("F2"); + prOutLabel.Text = tRes.PressDownMean.ToString("F2"); massLabel.Text = ProcessData.Mass.ToString(); massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3"); diff --git a/TBF/Screens/ProcessTabPageCtrl6.cs b/TBF/Screens/ProcessTabPageCtrl6.cs index 8f697d46f..d20a9dae5 100644 --- a/TBF/Screens/ProcessTabPageCtrl6.cs +++ b/TBF/Screens/ProcessTabPageCtrl6.cs @@ -460,8 +460,8 @@ namespace TBF.Screens tOutLabel.Text = ProcessData.TempDown.ToString(); tDivLabel.Text = ProcessData.TempDiv.ToString(); - prUpLabel.Text = Config.Units.ConvertTo(Config.Unit.bar, ProcessData.PressUp.Val).ToString(); - prDownLabel.Text = Config.Units.ConvertTo(Config.Unit.bar, ProcessData.PressDown.Val).ToString(); + prUpLabel.Text = ProcessData.PressUp.ToString(); + prDownLabel.Text = ProcessData.PressDown.ToString(); massLabel.Text = ProcessData.Mass.ToString(); @@ -557,8 +557,8 @@ namespace TBF.Screens tOutLabel.Text = tRes.TempDownMean.ToString("F2"); tDivLabel.Text = tRes.TempDivMean.ToString("F2"); - prUpLabel.Text = tRes.PressUpMean.ToString("F1"); - prDownLabel.Text = tRes.PressDownMean.ToString("F1"); + prUpLabel.Text = tRes.PressUpMean.ToString("F2"); + prDownLabel.Text = tRes.PressDownMean.ToString("F2"); massLabel.Text = ProcessData.Mass.ToString(); massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3");