michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1) Fixes in Screens.ProcessTabPageXY, (2) Program can be closed when there is a red error message, ver. 2.18.955

Browse Source
This commit is contained in:
Milan Hanajik 2018-06-27 11:23:33 +02:00
parent 9543de4170
commit a67a709782
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TBF/MainWnd.cs
View File

@ -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)

4
TBF/Properties/AssemblyInfo.cs
View File

@ -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")]

4
TBF/Screens/ProcessTabPageCtrl24.cs
View File

@ -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");

6
TBF/Screens/ProcessTabPageCtrl48.cs
View File

@ -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");

8
TBF/Screens/ProcessTabPageCtrl6.cs
View File

@ -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");