diff --git a/Config/Entities/Enums.cs b/Config/Entities/Enums.cs
index e9bffb688..6dbb1aa21 100644
--- a/Config/Entities/Enums.cs
+++ b/Config/Entities/Enums.cs
@@ -167,31 +167,38 @@ namespace Config.Entities
public enum Publish : sbyte
{
#if LANG_DE
- /// nemecky
+ /// german
[Description("nie")] Never = 0,
[Description("immer")] Always = 1,
[Description("Bildschirm")] OnScreen = 2,
[Description("intern")] Internal = 3,
#elif LANG_CS
- /// cesky
+ /// czech
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interně")] Internal = 3,
#elif LANG_SK
- /// slovensky
+ /// slovak
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interne")] Internal = 3,
#elif LANG_PL
- /// polsky
+ /// polish
[Description("nigdy")] Never = 0,
[Description("zawsze")] Always = 1,
[Description("na ekranie")] OnScreen = 2,
[Description("wewnętrznie")] Internal = 3,
+#elif LANG_RU
+ /// russian
+ [Description("никогда")] Never = 0,
+ [Description("всегда")] Always = 1,
+ [Description("толька экран")] OnScreen = 2,
+ [Description("внутренно")] Internal = 3,
#else
- [Description("Never")] Never = 0,
+ /// english
+ [Description("Never")] Never = 0,
[Description("Always")] Always = 1,
[Description("On screen")] OnScreen = 2,
[Description("Internal")] Internal = 3,
diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
index 52f467a3b..45dce8206 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
@@ -207,6 +207,7 @@ namespace TBF.BenchControl.Elde
///
/// Control of regulating valves.
+ ///
///
/// Regulating valve nr. (1..5)
/// Valve regulation mode, see the enum
diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
index 2b753c7a5..9b67b0cd3 100644
--- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
@@ -109,8 +109,6 @@ namespace TBF.BenchControl.Sequences
StateMachine.LoadProcedure(true); // TODO: Implement as an operation so that the worker thread is not blocked
- Bridge.Bench2UI(ButtonsEtc.StopBtnEn);
-
//--------------------------------------------------------------------------------------------
Bridge.OnActivity(this, Strings.Starting_system);
State.Create("MainSeq : Setting valves to default positions")
@@ -163,11 +161,11 @@ namespace TBF.BenchControl.Sequences
}
///
- /// Drain tanls for the first time, use defined drain times
+ /// Drain tanks for the first time, use defined drain times
///
- Bridge.Bench2UI(((StateMachine.Scale1 != null && StateMachine.DrainValve1 != null) ? ButtonsEtc.DrainTankBtn1Hi : 0) |
- ((StateMachine.Scale2 != null && StateMachine.DrainValve2 != null) ? ButtonsEtc.DrainTankBtn2Hi : 0) |
- ((StateMachine.Scale3 != null && StateMachine.DrainValve3 != null) ? ButtonsEtc.DrainTankBtn3Hi : 0));
+ Bridge.Bench2UI(((StateMachine.DrainValve1 != null) ? ButtonsEtc.DrainTankBtn1Hi : 0) |
+ ((StateMachine.DrainValve2 != null) ? ButtonsEtc.DrainTankBtn2Hi : 0) |
+ ((StateMachine.DrainValve3 != null) ? ButtonsEtc.DrainTankBtn3Hi : 0));
IntBox remainingTime = new IntBox();
State startNew = State.Create("MainSeq : Drain tanks")
@@ -219,8 +217,6 @@ namespace TBF.BenchControl.Sequences
Bridge.OnActivity(this, Strings.Emptying_tank);
stop_draining:
- //--------------------------------------------------------------------------------------------
- Bridge.Bench2UI(ButtonsEtc.StopBtnEn);
State stopDraining = State.Create("MainSeq : Stop draining water tanks")
.AddOperation(checkUiOp)
@@ -230,14 +226,15 @@ namespace TBF.BenchControl.Sequences
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
- if (e.Contains(Event.UiCmdStop)) goto stop;
}
while (e.Contains(Event.ValvesBusy));
//--------------------------------------------------------------------------------------------
Bridge.OnActivity(this, Strings.Resetting_scales);
//--------------------------------------------------------------------------------------------
- DoubleBox tara1 = new DoubleBox(0);
+ Bridge.Bench2UI(ButtonsEtc.StopBtnEn);
+
+ DoubleBox tara1 = new DoubleBox(0);
DoubleBox tara2 = new DoubleBox(0);
DoubleBox tara3 = new DoubleBox(0);
State.Create("MainSeq : Reset scales").AddOperation(checkUiOp)
@@ -284,8 +281,10 @@ namespace TBF.BenchControl.Sequences
///
StateMachine.LoadProcedureParams(StateMachine.Procedure);
StateMachine.ControlBoard.ManualUIAllowed = !StateMachine.Procedure.ManualCtrlDisabled;
+
Bridge.Bench2UI(ButtonsEtc.StopBtnEn); /// Enable STOP button
- int newBatchNr = Program.LocalSettings.BatchNr;
+
+ int newBatchNr = Program.LocalSettings.BatchNr;
log.FatalFormat("New measurement session started: batch = {0}, procedure = {1}", newBatchNr, StateMachine.Procedure.Name);
if (selection == Selection.RestoreBatch)
diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs
index 9368e44f7..73a4d0dfd 100644
--- a/TestBenchFramework/MainWnd.cs
+++ b/TestBenchFramework/MainWnd.cs
@@ -242,10 +242,8 @@ namespace TBF
CustomStyle.Set(3, DockStyle.Fill, Color.FromArgb(200, 200, 150), BorderStyle.None, true,
new System.Drawing.Font("Verdana", 10.5F, FontStyle.Regular, GraphicsUnit.Point, (byte)(238)));
- /// Initialize bench control user interface(s)
/// Initialize bench control user interface(s)
BenchControlPanel = new TBF.UiControls.BenchControlPanel();
- BenchControlPanel.BackColor = System.Drawing.Color.LightGray;
BenchControlPanel.BalancesCount = TBF.BenchControl.MettlerToledo.Standard.BalanceDev.BalancesCount
+ TBF.BenchControl.MettlerToledo.Multi.BalanceDev.BalancesCount;
new System.ComponentModel.ComponentResourceManager(typeof(MainWnd)).ApplyResources(BenchControlPanel, "benchControlPanel");
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index e5e7592a7..18c847d48 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.14.606.1")]
-[assembly: AssemblyFileVersion("2.14.606.1")]
+[assembly: AssemblyVersion("2.14.608.1")]
+[assembly: AssemblyFileVersion("2.14.608.1")]
diff --git a/TestBenchFramework/UiControls/BenchControlPanel.cs b/TestBenchFramework/UiControls/BenchControlPanel.cs
index 184708710..4c7df0e0b 100644
--- a/TestBenchFramework/UiControls/BenchControlPanel.cs
+++ b/TestBenchFramework/UiControls/BenchControlPanel.cs
@@ -128,16 +128,24 @@ namespace TBF.UiControls
colorAcceptEn = acceptResultsBtn.BackColor;
colorDrainEn = emptyTank1Btn.BackColor;
colorOtherEn = breakBtn.BackColor;
+
colorBenchEmpty = emptyGroupBox.BackColor;
- // Colors of disabled buttons
- colorStopDis = Color.FromArgb(Lghtr(colorStopEn.R), Lghtr(colorStopEn.G), Lghtr(colorStopEn.B));
- colorTestsDis = Color.FromArgb(Lghtr(colorTestsEn.R), Lghtr(colorTestsEn.G), Lghtr(colorTestsEn.B));
- colorCycleDis = Color.FromArgb(Lghtr(colorCycleEn.R), Lghtr(colorCycleEn.G), Lghtr(colorCycleEn.B));
- colorPurgeDis = Color.FromArgb(Lghtr(colorPurgeEn.R), Lghtr(colorPurgeEn.G), Lghtr(colorPurgeEn.B));
- colorAcceptDis = Color.FromArgb(Lghtr(colorAcceptEn.R), Lghtr(colorAcceptEn.G), Lghtr(colorAcceptEn.B));
- colorDrainDis = Color.FromArgb(Lghtr(colorDrainEn.R), Lghtr(colorDrainEn.G), Lghtr(colorDrainEn.B));
- colorOtherDis = Color.FromArgb(Lghtr(colorOtherEn.R), Lghtr(colorOtherEn.G), Lghtr(colorOtherEn.B));
+ /// Colors of disabled buttons
+ //colorStopDis = Color.FromArgb(Lghtr(colorStopEn.R), Lghtr(colorStopEn.G), Lghtr(colorStopEn.B));
+ //colorTestsDis = Color.FromArgb(Lghtr(colorTestsEn.R), Lghtr(colorTestsEn.G), Lghtr(colorTestsEn.B));
+ //colorCycleDis = Color.FromArgb(Lghtr(colorCycleEn.R), Lghtr(colorCycleEn.G), Lghtr(colorCycleEn.B));
+ //colorPurgeDis = Color.FromArgb(Lghtr(colorPurgeEn.R), Lghtr(colorPurgeEn.G), Lghtr(colorPurgeEn.B));
+ //colorAcceptDis = Color.FromArgb(Lghtr(colorAcceptEn.R), Lghtr(colorAcceptEn.G), Lghtr(colorAcceptEn.B));
+ //colorDrainDis = Color.FromArgb(Lghtr(colorDrainEn.R), Lghtr(colorDrainEn.G), Lghtr(colorDrainEn.B));
+ //colorOtherDis = Color.FromArgb(Lghtr(colorOtherEn.R), Lghtr(colorOtherEn.G), Lghtr(colorOtherEn.B));
+ colorStopDis = System.Drawing.SystemColors.Control;
+ colorTestsDis = System.Drawing.SystemColors.Control;
+ colorCycleDis = System.Drawing.SystemColors.Control;
+ colorPurgeDis = System.Drawing.SystemColors.Control;
+ colorAcceptDis = System.Drawing.SystemColors.Control;
+ colorDrainDis = System.Drawing.SystemColors.Control;
+ colorOtherDis = System.Drawing.SystemColors.Control;
colorDrainHi = Color.FromArgb(Drkr(colorDrainEn.R), Drkr(colorDrainEn.G), Drkr(colorDrainEn.B));
}