diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs index ae687eaf1..5c37d29f5 100644 --- a/TestBenchFramework/MainWnd.cs +++ b/TestBenchFramework/MainWnd.cs @@ -235,6 +235,8 @@ namespace TBF /// 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"); BenchControlPanel.Name = "benchControlPanel"; rightHorizSplitContainer.Panel2.Controls.Add(BenchControlPanel); diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index b656650f7..3720f25a4 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.12.431.1")] -[assembly: AssemblyFileVersion("2.12.431.1")] +[assembly: AssemblyVersion("2.12.432.1")] +[assembly: AssemblyFileVersion("2.12.432.1")] diff --git a/TestBenchFramework/UiControls/BenchControlPanel.Designer.cs b/TestBenchFramework/UiControls/BenchControlPanel.Designer.cs index cdc28362c..4cc3d676c 100644 --- a/TestBenchFramework/UiControls/BenchControlPanel.Designer.cs +++ b/TestBenchFramework/UiControls/BenchControlPanel.Designer.cs @@ -50,6 +50,7 @@ namespace TBF.UiControls this.testComboBox = new System.Windows.Forms.ComboBox(); this.purgeGroupBox = new System.Windows.Forms.GroupBox(); this.emptyGroupBox = new System.Windows.Forms.GroupBox(); + this.emptyTank3Btn = new System.Windows.Forms.Button(); this.otherGroupBox = new System.Windows.Forms.GroupBox(); this.nextButton = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -219,11 +220,21 @@ namespace TBF.UiControls // emptyGroupBox // resources.ApplyResources(this.emptyGroupBox, "emptyGroupBox"); + this.emptyGroupBox.Controls.Add(this.emptyTank3Btn); this.emptyGroupBox.Controls.Add(this.emptyTank1Btn); this.emptyGroupBox.Controls.Add(this.emptyTank2Btn); this.emptyGroupBox.Name = "emptyGroupBox"; this.emptyGroupBox.TabStop = false; // + // emptyTank3Btn + // + resources.ApplyResources(this.emptyTank3Btn, "emptyTank3Btn"); + this.emptyTank3Btn.BackColor = System.Drawing.Color.LightSteelBlue; + this.emptyTank3Btn.ImageKey = global::TBF.Resources.Strings.Camera; + this.emptyTank3Btn.Name = "emptyTank3Btn"; + this.emptyTank3Btn.UseVisualStyleBackColor = false; + this.emptyTank3Btn.Click += new System.EventHandler(this.emptyTank3Btn_Click); + // // otherGroupBox // resources.ApplyResources(this.otherGroupBox, "otherGroupBox"); @@ -304,5 +315,6 @@ namespace TBF.UiControls private System.Windows.Forms.Button nextButton; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button acceptResultsBtn; + private System.Windows.Forms.Button emptyTank3Btn; } } diff --git a/TestBenchFramework/UiControls/BenchControlPanel.cs b/TestBenchFramework/UiControls/BenchControlPanel.cs index 491f36c56..88ec2c4df 100644 --- a/TestBenchFramework/UiControls/BenchControlPanel.cs +++ b/TestBenchFramework/UiControls/BenchControlPanel.cs @@ -38,6 +38,22 @@ namespace TBF.UiControls Color colorEmptyDis; Color colorOtherDis; + + public int BalancesCount + { + set + { + if (value <= 2) + { + emptyTank1Btn.Size = new Size(92, 35); + emptyTank2Btn.Size = new Size(92, 35); + emptyTank2Btn.Location = new Point(106, 26); + emptyTank3Btn.Visible = false; + } + } + } + + public BenchControlPanel() { InitializeComponent(); @@ -175,24 +191,25 @@ namespace TBF.UiControls } - private void startTestBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartTest); } - private void startQ1Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartQ1); } - private void startQ2Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartQ2); } - private void startQ3Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartQ3); } - private void startCycleBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartCycle); } - private void stopBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.Stop); } - private void purgeBeginBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.PurgeBegin); } - private void purgeEndBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.PurgeEnd); } - private void emptyTank1Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.EmptyTank1); } - private void emptyTank2Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.EmptyTank2); } - private void breakBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.Break); } - private void resetResultsBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.ResetResults); } - private void acceptResultsBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.AcceptResults); } - private void cameraTestBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.CameraTest); } + private void startTestBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartTest); } + private void startQ1Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartQ1); } + private void startQ2Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartQ2); } + private void startQ3Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartQ3); } + private void startCycleBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.StartCycle); } + private void stopBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.Stop); } + private void purgeBeginBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.PurgeBegin); } + private void purgeEndBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.PurgeEnd); } + private void emptyTank1Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.EmptyTank1); } + private void emptyTank2Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.EmptyTank2); } + private void emptyTank3Btn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.EmptyTank3); } + private void breakBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.Break); } + private void resetResultsBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.ResetResults); } + private void acceptResultsBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.AcceptResults); } + private void cameraTestBtn_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.CameraTest); } private void sensitivityTestBtn_Click(object sender, EventArgs e){ Bridge.Ui2Bench(UI2BenchCmd.SensitivityTest); } - private void button1_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.B1); } - private void button2_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.B2); } - private void nextButton_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.Next); } + private void button1_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.B1); } + private void button2_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.B2); } + private void nextButton_Click(object sender, EventArgs e) { Bridge.Ui2Bench(UI2BenchCmd.Next); } /// /// Processes a pressed keys. @@ -275,6 +292,9 @@ namespace TBF.UiControls emptyTank2Btn.Enabled = ((args.Flags & ButtonsEtc.EmptyTankBtn2En) != 0); emptyTank2Btn.BackColor = emptyTank2Btn.Enabled ? colorEmptyEn : colorEmptyDis; + emptyTank3Btn.Enabled = ((args.Flags & ButtonsEtc.EmptyTankBtn3En) != 0); + emptyTank3Btn.BackColor = emptyTank3Btn.Enabled ? colorEmptyEn : colorEmptyDis; + resetResultsBtn.Enabled = ((args.Flags & ButtonsEtc.ResetResultsBtnEn) != 0); resetResultsBtn.BackColor = resetResultsBtn.Enabled ? colorStopEn : colorStopDis; diff --git a/TestBenchFramework/UiControls/BenchControlPanel.cs.resx b/TestBenchFramework/UiControls/BenchControlPanel.cs.resx index b9a5ffd5d..eb6cec2d3 100644 --- a/TestBenchFramework/UiControls/BenchControlPanel.cs.resx +++ b/TestBenchFramework/UiControls/BenchControlPanel.cs.resx @@ -163,24 +163,12 @@ Test kamery - - Verdana, 12pt - - - Nádrž 1 - Verdana, 11.25pt Citlivost - - Verdana, 12pt - - - Nádrž 2 - Trať diff --git a/TestBenchFramework/UiControls/BenchControlPanel.de.resx b/TestBenchFramework/UiControls/BenchControlPanel.de.resx index 8fbcd2c1a..0c52dfca7 100644 --- a/TestBenchFramework/UiControls/BenchControlPanel.de.resx +++ b/TestBenchFramework/UiControls/BenchControlPanel.de.resx @@ -181,12 +181,6 @@ Verdana, 14.25pt - - 8, 23 - - - 8 Beh.1 - Verdana, 11.25pt @@ -199,14 +193,11 @@ Verdana, 14.25pt - - 104, 23 + + 13, 3 - - 94, 35 - - - 9 Beh.2 + + Prüfpunkt Verdana, 14.25pt @@ -235,12 +226,6 @@ 1 - - 13, 3 - - - Prüfpunkt - 13, 252 @@ -266,18 +251,18 @@ False - - Verdana, 10pt - - - bestätigen - 13, 536 Ergebnisse + + Verdana, 10pt + + + bestätigen + 235, 1000 diff --git a/TestBenchFramework/UiControls/BenchControlPanel.resx b/TestBenchFramework/UiControls/BenchControlPanel.resx index 98f0b55d2..720ae5533 100644 --- a/TestBenchFramework/UiControls/BenchControlPanel.resx +++ b/TestBenchFramework/UiControls/BenchControlPanel.resx @@ -121,18 +121,18 @@ 12 - - - 4, 4, 4, 4 + + otherGroupBox Start Test + NoControl - - emptyGroupBox + + 1 @@ -156,17 +156,14 @@ 106, 23 - - 7 + + 4, 4, 4, 4 System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Purge - - - NoControl + + 2 5 @@ -177,26 +174,35 @@ Results - - 8, 117 + + False - - cameraTestBtn + + testGroupBox + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Verdana, 15.75pt - - startCycleBtn + + NoControl + + + 92, 42 + + + 19 Verdana, 15.75pt - - purgeGroupBox + + Auxiliary - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 190, 33 Camera test @@ -216,8 +222,8 @@ sensitivityTestBtn - - 207, 68 + + 91, 25 NoControl @@ -231,17 +237,11 @@ 7, 253 - - 2 - Verdana, 12pt - - 92, 35 - - - Lucida Console, 8.25pt + + emptyTank3Btn End @@ -252,12 +252,15 @@ 8, 67 - - Verdana, 15.75pt - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + W1 + 60, 45 @@ -273,6 +276,9 @@ 7, 327 + + startCycleBtn + emptyGroupBox @@ -306,11 +312,14 @@ Verdana, 15.75pt + + 7 + Begin - - NoControl + + 0 106, 20 @@ -321,14 +330,14 @@ 0 - - Auxiliary + + Q3 22 - Tank 2 + W2 purgeGroupBox @@ -345,8 +354,8 @@ Start Cycle - - NoControl + + 60, 35 System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -354,14 +363,17 @@ purgeEndBtn - - Q3 + + Verdana, 12pt nextButton + + 11 + - 1 + 2 92, 35 @@ -375,17 +387,14 @@ 92, 70 - - Sensi- tivity - - - 19 + + 20 BenchControlPanel - - 0 + + Purge System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -402,8 +411,8 @@ 14 - - 0 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 92, 35 @@ -423,8 +432,8 @@ NoControl - - 92, 35 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -435,36 +444,39 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + purgeGroupBox + Empty - - Verdana, 15.75pt + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - testGroupBox - - - 7, 3 + + NoControl startQ1Btn - - Tank 1 + + 0 13 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Verdana, 15.75pt + + + Verdana, 15.75pt + + + 7 3 - - Verdana, 12pt - purgeGroupBox @@ -489,15 +501,21 @@ stopBtn - - 92, 42 + + emptyGroupBox Test + + 60, 35 + $this + + 138, 26 + Verdana, 15.75pt @@ -516,8 +534,8 @@ False - - 11 + + 16 9 @@ -525,8 +543,8 @@ testComboBox - - testGroupBox + + 60, 35 Verdana, 12pt @@ -537,17 +555,17 @@ 4 + + Q2 + 224, 736 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - purgeBeginBtn - - NoControl + + 207, 68 acceptResultsBtn @@ -561,8 +579,8 @@ Accept - - 10 + + emptyGroupBox 1 @@ -570,23 +588,23 @@ 8, 25 - - False + + testGroupBox + + + W3 System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 207, 246 - 138, 117 NoControl - - Verdana, 12pt + + NoControl 8 @@ -594,21 +612,18 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7 + + 8, 117 - - NoControl + + Verdana, 15.75pt - - 73, 117 + + 106, 168 3 - - 207, 68 - Stop @@ -624,17 +639,14 @@ Break - - 106, 168 - - 106, 26 + 73, 26 - - 190, 33 + + NoControl - - 106, 26 + + 10 9, 18 @@ -654,6 +666,9 @@ 8, 77 + + 8, 23 + 5 @@ -693,6 +708,12 @@ 7, 401 + + 73, 117 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -702,45 +723,48 @@ 18 + + Lucida Console, 8.25pt + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 91, 25 + + 207, 68 - - 92, 45 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cameraTestBtn - - 8, 26 + + 7, 3 1 - - otherGroupBox + + Verdana, 12pt System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 92, 45 + + + 8, 26 8, 20 - - Q2 + + Sensi- tivity 92, 45 - - 20 - groupBox1 @@ -759,11 +783,17 @@ Verdana, 15.75pt + + NoControl + + + 106, 26 + Verdana, 12pt - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl 9 @@ -771,12 +801,15 @@ 92, 70 - - 8, 23 + + 207, 128 15 + + 207, 246 + False @@ -786,13 +819,7 @@ 60, 45 - - 207, 128 - True - - de - \ No newline at end of file