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

Compound profiles support in progress

Browse Source
This commit is contained in:
Milan Hanajik 2023-07-13 13:00:24 +02:00
parent a770f5a9b8
commit bc0de96ad9
9 changed files with 1094 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Common/Enums.cs
View File

@ -199,6 +199,9 @@ namespace Common
QnClassColdWater,
QnClassHotWater,
QpQi,
Q3RCompound,
QnClassCompound,
QpQiCompound,
Manual,
Count,
}

7
TBF/Rig/StateMachine.cs
View File

@ -55,6 +55,7 @@ namespace TBF.Rig
/// Public components
public static ControlBoard.IControlBoard ControlBoard;
public static TestMethods.CombinedWithDetection.TestMethod QriseQfallDetection;
public static GenericDevices.IAmbient Ambient;
public static IOperation BenchWaitingOp;
public static IOperation BenchErrorOp;
@ -227,10 +228,14 @@ namespace TBF.Rig
UInt128 valvesToInvert = 0;
foreach (var cmpnt in components)
{
if (cmpnt is TBF.Rig.ControlBoard.IControlBoard) ControlBoard = cmpnt as TBF.Rig.ControlBoard.IControlBoard;
if (cmpnt is ControlBoard.IControlBoard) ControlBoard = cmpnt as ControlBoard.IControlBoard;
if (cmpnt is IBenchInfo) ProcessData.BenchInfo = cmpnt as IBenchInfo;
if (cmpnt is IErrorFlags) ProcessData.ErrorFlagsComp = cmpnt as IErrorFlags;
if (cmpnt is IStatisticsMonitoring) ProcessData.StatisticsMonitoringComp = cmpnt as IStatisticsMonitoring;
if (cmpnt is TestMethods.CombinedWithDetection.TestMethod && QriseQfallDetection == null)
{
QriseQfallDetection = cmpnt as TestMethods.CombinedWithDetection.TestMethod;
}
if (cmpnt is SchematicDrawing.IDrawingItCmpntWithMeasuredVal)
{

2
TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetTestParams.cs
View File

@ -18,7 +18,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
public override XmlSerializer GetSerializer() { return Serializer; }
public double TargetQ; /// Target=terminal flow durning detection when increasing or decreasing the flow
public double RelativeQfrom; /// Tested flow low range related to the detected flow
public double RelativeQfrom; /// Tested flow low range related to the detected flow
public double RelativeQto; /// Tested flow high range related to the detected flow
public float RateOfChange; /// Each step is calculated as (TargetQfrom - Qfrom) * RateOfChange, text form is displayed in % (*100)
public float DetectionThreshold; /// Drop of frequency for the detection, text form is displayed in % (*100)

4
TBF/Rig/TestMethods/CombinedWithDetection/TestMethodFactory.cs
View File

@ -8,14 +8,14 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
{
public class TestMethodFactory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(8) + ".Compound"; } }
public string ClassName { get { return GetType().Namespace.Substring(8) + ".Compound"; } }
public override string ToString() { return ClassName; }
public IComponent DummyComponent() { return new TestMethod(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new TestMethod(cfg); }
public IComponentCfg DefaultConfig() { return new TestMethodCfg(this.GetType().Namespace.Substring(20), this); }
public IComponentCfg DefaultConfig() { return new TestMethodCfg(GetType().Namespace.Substring(20), this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{

1100
TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
View File

File diff suppressed because it is too large Load Diff

113
TBF/UI/Bench/TestProfiles/TestProfileDlg.designer.cs generated
View File

@ -39,11 +39,14 @@ namespace TBF.UI.Bench.TestProfiles
this.errorCalculationRadioButton2 = new System.Windows.Forms.RadioButton();
this.errorCalculationRadioButton1 = new System.Windows.Forms.RadioButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.profileTypeRadioButton1 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton8 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton7 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton6 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton5 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton2 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton4 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton3 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton2 = new System.Windows.Forms.RadioButton();
this.profileTypeRadioButton1 = new System.Windows.Forms.RadioButton();
this.lastChangedOnTextBox = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.lastChangedByTextBox = new System.Windows.Forms.TextBox();
@ -58,6 +61,8 @@ namespace TBF.UI.Bench.TestProfiles
this.label1 = new System.Windows.Forms.Label();
this.metrologyTabPage = new System.Windows.Forms.TabPage();
this.metrologyListViewEx = new Common.Forms.ListViewEx();
this.compoundTabPage = new System.Windows.Forms.TabPage();
this.compoundListViewEx = new Common.Forms.ListViewEx();
this.errorFlagsTabPage = new System.Windows.Forms.TabPage();
this.errorFlagsListViewEx = new Common.Forms.ListViewEx();
this.errorFlags2TabPage = new System.Windows.Forms.TabPage();
@ -72,6 +77,7 @@ namespace TBF.UI.Bench.TestProfiles
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.metrologyTabPage.SuspendLayout();
this.compoundTabPage.SuspendLayout();
this.errorFlagsTabPage.SuspendLayout();
this.errorFlags2TabPage.SuspendLayout();
this.SuspendLayout();
@ -94,6 +100,7 @@ namespace TBF.UI.Bench.TestProfiles
//
this.tabControl.Controls.Add(this.generalTabPage);
this.tabControl.Controls.Add(this.metrologyTabPage);
this.tabControl.Controls.Add(this.compoundTabPage);
this.tabControl.Controls.Add(this.errorFlagsTabPage);
this.tabControl.Controls.Add(this.errorFlags2TabPage);
resources.ApplyResources(this.tabControl, "tabControl");
@ -145,21 +152,40 @@ namespace TBF.UI.Bench.TestProfiles
//
// groupBox1
//
this.groupBox1.Controls.Add(this.profileTypeRadioButton1);
this.groupBox1.Controls.Add(this.profileTypeRadioButton8);
this.groupBox1.Controls.Add(this.profileTypeRadioButton7);
this.groupBox1.Controls.Add(this.profileTypeRadioButton6);
this.groupBox1.Controls.Add(this.profileTypeRadioButton5);
this.groupBox1.Controls.Add(this.profileTypeRadioButton2);
this.groupBox1.Controls.Add(this.profileTypeRadioButton4);
this.groupBox1.Controls.Add(this.profileTypeRadioButton3);
this.groupBox1.Controls.Add(this.profileTypeRadioButton2);
this.groupBox1.Controls.Add(this.profileTypeRadioButton1);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
// profileTypeRadioButton1
// profileTypeRadioButton8
//
resources.ApplyResources(this.profileTypeRadioButton1, "profileTypeRadioButton1");
this.profileTypeRadioButton1.Name = "profileTypeRadioButton1";
this.profileTypeRadioButton1.TabStop = true;
this.profileTypeRadioButton1.UseVisualStyleBackColor = true;
resources.ApplyResources(this.profileTypeRadioButton8, "profileTypeRadioButton8");
this.profileTypeRadioButton8.Name = "profileTypeRadioButton8";
this.profileTypeRadioButton8.TabStop = true;
this.profileTypeRadioButton8.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton7
//
resources.ApplyResources(this.profileTypeRadioButton7, "profileTypeRadioButton7");
this.profileTypeRadioButton7.Name = "profileTypeRadioButton7";
this.profileTypeRadioButton7.TabStop = true;
this.profileTypeRadioButton7.UseVisualStyleBackColor = true;
this.profileTypeRadioButton7.CheckedChanged += new System.EventHandler(this.profileTypeRadioButton7_CheckedChanged);
//
// profileTypeRadioButton6
//
resources.ApplyResources(this.profileTypeRadioButton6, "profileTypeRadioButton6");
this.profileTypeRadioButton6.Name = "profileTypeRadioButton6";
this.profileTypeRadioButton6.TabStop = true;
this.profileTypeRadioButton6.UseVisualStyleBackColor = true;
this.profileTypeRadioButton6.CheckedChanged += new System.EventHandler(this.profileTypeRadioButton6_CheckedChanged);
//
// profileTypeRadioButton5
//
@ -167,13 +193,7 @@ namespace TBF.UI.Bench.TestProfiles
this.profileTypeRadioButton5.Name = "profileTypeRadioButton5";
this.profileTypeRadioButton5.TabStop = true;
this.profileTypeRadioButton5.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton2
//
resources.ApplyResources(this.profileTypeRadioButton2, "profileTypeRadioButton2");
this.profileTypeRadioButton2.Name = "profileTypeRadioButton2";
this.profileTypeRadioButton2.TabStop = true;
this.profileTypeRadioButton2.UseVisualStyleBackColor = true;
this.profileTypeRadioButton5.CheckedChanged += new System.EventHandler(this.profileTypeRadioButton5_CheckedChanged);
//
// profileTypeRadioButton4
//
@ -189,6 +209,20 @@ namespace TBF.UI.Bench.TestProfiles
this.profileTypeRadioButton3.TabStop = true;
this.profileTypeRadioButton3.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton2
//
resources.ApplyResources(this.profileTypeRadioButton2, "profileTypeRadioButton2");
this.profileTypeRadioButton2.Name = "profileTypeRadioButton2";
this.profileTypeRadioButton2.TabStop = true;
this.profileTypeRadioButton2.UseVisualStyleBackColor = true;
//
// profileTypeRadioButton1
//
resources.ApplyResources(this.profileTypeRadioButton1, "profileTypeRadioButton1");
this.profileTypeRadioButton1.Name = "profileTypeRadioButton1";
this.profileTypeRadioButton1.TabStop = true;
this.profileTypeRadioButton1.UseVisualStyleBackColor = true;
//
// lastChangedOnTextBox
//
resources.ApplyResources(this.lastChangedOnTextBox, "lastChangedOnTextBox");
@ -263,11 +297,32 @@ namespace TBF.UI.Bench.TestProfiles
this.metrologyListViewEx.DoubleClickActivation = false;
this.metrologyListViewEx.FullRowSelect = true;
this.metrologyListViewEx.GridLines = true;
this.metrologyListViewEx.HideSelection = false;
this.metrologyListViewEx.Name = "metrologyListViewEx";
this.metrologyListViewEx.UseCompatibleStateImageBehavior = false;
this.metrologyListViewEx.View = System.Windows.Forms.View.Details;
this.metrologyListViewEx.SelectedIndexChanged += new System.EventHandler(this.metrologyListViewEx_SelectedIndexChanged);
//
// compoundTabPage
//
this.compoundTabPage.Controls.Add(this.compoundListViewEx);
resources.ApplyResources(this.compoundTabPage, "compoundTabPage");
this.compoundTabPage.Name = "compoundTabPage";
this.compoundTabPage.UseVisualStyleBackColor = true;
//
// compoundListViewEx
//
this.compoundListViewEx.AllowColumnReorder = true;
resources.ApplyResources(this.compoundListViewEx, "compoundListViewEx");
this.compoundListViewEx.DoubleClickActivation = false;
this.compoundListViewEx.FullRowSelect = true;
this.compoundListViewEx.GridLines = true;
this.compoundListViewEx.HideSelection = false;
this.compoundListViewEx.Name = "compoundListViewEx";
this.compoundListViewEx.UseCompatibleStateImageBehavior = false;
this.compoundListViewEx.View = System.Windows.Forms.View.Details;
this.compoundListViewEx.SelectedIndexChanged += new System.EventHandler(this.compoundListViewEx_SelectedIndexChanged);
//
// errorFlagsTabPage
//
this.errorFlagsTabPage.Controls.Add(this.errorFlagsListViewEx);
@ -282,6 +337,7 @@ namespace TBF.UI.Bench.TestProfiles
this.errorFlagsListViewEx.DoubleClickActivation = false;
this.errorFlagsListViewEx.FullRowSelect = true;
this.errorFlagsListViewEx.GridLines = true;
this.errorFlagsListViewEx.HideSelection = false;
this.errorFlagsListViewEx.Name = "errorFlagsListViewEx";
this.errorFlagsListViewEx.UseCompatibleStateImageBehavior = false;
this.errorFlagsListViewEx.View = System.Windows.Forms.View.Details;
@ -301,6 +357,7 @@ namespace TBF.UI.Bench.TestProfiles
this.errorFlags2ListViewEx.DoubleClickActivation = false;
this.errorFlags2ListViewEx.FullRowSelect = true;
this.errorFlags2ListViewEx.GridLines = true;
this.errorFlags2ListViewEx.HideSelection = false;
this.errorFlags2ListViewEx.Name = "errorFlags2ListViewEx";
this.errorFlags2ListViewEx.UseCompatibleStateImageBehavior = false;
this.errorFlags2ListViewEx.View = System.Windows.Forms.View.Details;
@ -330,6 +387,7 @@ namespace TBF.UI.Bench.TestProfiles
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.metrologyTabPage.ResumeLayout(false);
this.compoundTabPage.ResumeLayout(false);
this.errorFlagsTabPage.ResumeLayout(false);
this.errorFlags2TabPage.ResumeLayout(false);
this.ResumeLayout(false);
@ -356,18 +414,23 @@ namespace TBF.UI.Bench.TestProfiles
private System.Windows.Forms.Label label12;
private System.Windows.Forms.TextBox procNameTextBox;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.RadioButton profileTypeRadioButton2;
private System.Windows.Forms.RadioButton profileTypeRadioButton1;
private System.Windows.Forms.TabPage errorFlagsTabPage;
private System.Windows.Forms.TabPage errorFlagsTabPage;
private Common.Forms.ListViewEx errorFlagsListViewEx;
private System.Windows.Forms.RadioButton profileTypeRadioButton3;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.RadioButton errorCalculationRadioButton2;
private System.Windows.Forms.RadioButton errorCalculationRadioButton1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.RadioButton profileTypeRadioButton5;
private System.Windows.Forms.RadioButton profileTypeRadioButton1;
private System.Windows.Forms.RadioButton profileTypeRadioButton2;
private System.Windows.Forms.RadioButton profileTypeRadioButton3;
private System.Windows.Forms.RadioButton profileTypeRadioButton4;
private System.Windows.Forms.RadioButton profileTypeRadioButton5;
private System.Windows.Forms.RadioButton profileTypeRadioButton6;
private System.Windows.Forms.RadioButton profileTypeRadioButton7;
private System.Windows.Forms.RadioButton profileTypeRadioButton8;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.RadioButton errorCalculationRadioButton1;
private System.Windows.Forms.RadioButton errorCalculationRadioButton2;
private System.Windows.Forms.TabPage errorFlags2TabPage;
private Common.Forms.ListViewEx errorFlags2ListViewEx;
}
private System.Windows.Forms.TabPage compoundTabPage;
private Common.Forms.ListViewEx compoundListViewEx;
}
}

250
TBF/UI/Bench/TestProfiles/TestProfileDlg.resx
View File

@ -222,36 +222,96 @@
<data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="profileTypeRadioButton1.AutoSize" type="System.Boolean, mscorlib">
<data name="profileTypeRadioButton8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="profileTypeRadioButton1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<data name="profileTypeRadioButton8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="profileTypeRadioButton1.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 21</value>
<data name="profileTypeRadioButton8.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 173</value>
</data>
<data name="profileTypeRadioButton1.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 17</value>
<data name="profileTypeRadioButton8.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 17</value>
</data>
<data name="profileTypeRadioButton1.TabIndex" type="System.Int32, mscorlib">
<value>34</value>
<data name="profileTypeRadioButton8.TabIndex" type="System.Int32, mscorlib">
<value>41</value>
</data>
<data name="profileTypeRadioButton1.Text" xml:space="preserve">
<value>Q3 and R</value>
<data name="profileTypeRadioButton8.Text" xml:space="preserve">
<value>Entering numbers and designations manually</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton1.Name" xml:space="preserve">
<value>profileTypeRadioButton1</value>
<data name="&gt;&gt;profileTypeRadioButton8.Name" xml:space="preserve">
<value>profileTypeRadioButton8</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton1.Type" xml:space="preserve">
<data name="&gt;&gt;profileTypeRadioButton8.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton1.Parent" xml:space="preserve">
<data name="&gt;&gt;profileTypeRadioButton8.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton1.ZOrder" xml:space="preserve">
<data name="&gt;&gt;profileTypeRadioButton8.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="profileTypeRadioButton7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="profileTypeRadioButton7.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="profileTypeRadioButton7.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 151</value>
</data>
<data name="profileTypeRadioButton7.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 17</value>
</data>
<data name="profileTypeRadioButton7.TabIndex" type="System.Int32, mscorlib">
<value>40</value>
</data>
<data name="profileTypeRadioButton7.Text" xml:space="preserve">
<value>qp and qi - compound</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton7.Name" xml:space="preserve">
<value>profileTypeRadioButton7</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton7.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton7.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton7.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="profileTypeRadioButton6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="profileTypeRadioButton6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="profileTypeRadioButton6.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 129</value>
</data>
<data name="profileTypeRadioButton6.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 17</value>
</data>
<data name="profileTypeRadioButton6.TabIndex" type="System.Int32, mscorlib">
<value>39</value>
</data>
<data name="profileTypeRadioButton6.Text" xml:space="preserve">
<value>Qn and Class - compound</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton6.Name" xml:space="preserve">
<value>profileTypeRadioButton6</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton6.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton6.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton6.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="profileTypeRadioButton5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -262,13 +322,13 @@
<value>28, 107</value>
</data>
<data name="profileTypeRadioButton5.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 17</value>
<value>130, 17</value>
</data>
<data name="profileTypeRadioButton5.TabIndex" type="System.Int32, mscorlib">
<value>38</value>
</data>
<data name="profileTypeRadioButton5.Text" xml:space="preserve">
<value>Entering numbers and designations manually</value>
<value>Q3 and R - compound</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton5.Name" xml:space="preserve">
<value>profileTypeRadioButton5</value>
@ -280,37 +340,7 @@
<value>groupBox1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton5.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="profileTypeRadioButton2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="profileTypeRadioButton2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="profileTypeRadioButton2.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 42</value>
</data>
<data name="profileTypeRadioButton2.Size" type="System.Drawing.Size, System.Drawing">
<value>146, 17</value>
</data>
<data name="profileTypeRadioButton2.TabIndex" type="System.Int32, mscorlib">
<value>35</value>
</data>
<data name="profileTypeRadioButton2.Text" xml:space="preserve">
<value>Qn and Class - cold water</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton2.Name" xml:space="preserve">
<value>profileTypeRadioButton2</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton2.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton2.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton2.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="profileTypeRadioButton4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -322,13 +352,13 @@
<value>28, 85</value>
</data>
<data name="profileTypeRadioButton4.Size" type="System.Drawing.Size, System.Drawing">
<value>73, 17</value>
<value>69, 17</value>
</data>
<data name="profileTypeRadioButton4.TabIndex" type="System.Int32, mscorlib">
<value>37</value>
</data>
<data name="profileTypeRadioButton4.Text" xml:space="preserve">
<value>Qp and Qi</value>
<value>qp and qi</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton4.Name" xml:space="preserve">
<value>profileTypeRadioButton4</value>
@ -340,7 +370,7 @@
<value>groupBox1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton4.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="profileTypeRadioButton3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -370,13 +400,73 @@
<value>groupBox1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton3.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="profileTypeRadioButton2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="profileTypeRadioButton2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="profileTypeRadioButton2.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 42</value>
</data>
<data name="profileTypeRadioButton2.Size" type="System.Drawing.Size, System.Drawing">
<value>146, 17</value>
</data>
<data name="profileTypeRadioButton2.TabIndex" type="System.Int32, mscorlib">
<value>35</value>
</data>
<data name="profileTypeRadioButton2.Text" xml:space="preserve">
<value>Qn and Class - cold water</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton2.Name" xml:space="preserve">
<value>profileTypeRadioButton2</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton2.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton2.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton2.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="profileTypeRadioButton1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="profileTypeRadioButton1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="profileTypeRadioButton1.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 21</value>
</data>
<data name="profileTypeRadioButton1.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 17</value>
</data>
<data name="profileTypeRadioButton1.TabIndex" type="System.Int32, mscorlib">
<value>34</value>
</data>
<data name="profileTypeRadioButton1.Text" xml:space="preserve">
<value>Q3 and R</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton1.Name" xml:space="preserve">
<value>profileTypeRadioButton1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton1.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton1.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;profileTypeRadioButton1.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 123</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>366, 137</value>
<value>366, 203</value>
</data>
<data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
<value>39</value>
@ -777,6 +867,54 @@
<data name="&gt;&gt;metrologyTabPage.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="compoundListViewEx.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="compoundListViewEx.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="compoundListViewEx.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 366</value>
</data>
<data name="compoundListViewEx.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;compoundListViewEx.Name" xml:space="preserve">
<value>compoundListViewEx</value>
</data>
<data name="&gt;&gt;compoundListViewEx.Type" xml:space="preserve">
<value>Common.Forms.ListViewEx, Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;compoundListViewEx.Parent" xml:space="preserve">
<value>compoundTabPage</value>
</data>
<data name="&gt;&gt;compoundListViewEx.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="compoundTabPage.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 34</value>
</data>
<data name="compoundTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>923, 366</value>
</data>
<data name="compoundTabPage.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="compoundTabPage.Text" xml:space="preserve">
<value>Compound</value>
</data>
<data name="&gt;&gt;compoundTabPage.Name" xml:space="preserve">
<value>compoundTabPage</value>
</data>
<data name="&gt;&gt;compoundTabPage.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;compoundTabPage.Parent" xml:space="preserve">
<value>tabControl</value>
</data>
<data name="&gt;&gt;compoundTabPage.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="errorFlagsListViewEx.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -823,7 +961,7 @@
<value>tabControl</value>
</data>
<data name="&gt;&gt;errorFlagsTabPage.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="errorFlags2ListViewEx.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -871,7 +1009,7 @@
<value>tabControl</value>
</data>
<data name="&gt;&gt;errorFlags2TabPage.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="tabControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -925,7 +1063,7 @@
<value>sharedButtons</value>
</data>
<data name="&gt;&gt;sharedButtons.Type" xml:space="preserve">
<value>TBF.UI.Shared.SharedButtons, TBF, Version=3.4.1981.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Shared.SharedButtons, TBF, Version=3.6.2071.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;sharedButtons.Parent" xml:space="preserve">
<value>mainSplitContainer.Panel2</value>

27
TBF/UI/Procedures/TestWizard/TestProfileSelection.cs
View File

@ -109,8 +109,9 @@ namespace TBF.UI.Procedures.TestWizard
case ProfileType.Q3R:
qnLabel.Text = "Q3";
break;
case ProfileType.QpQi:
qnLabel.Text = "qp";
case ProfileType.Q3RCompound:
qnLabel.Text = "Q3 main";
qnAuxLabel.Text = "Q3 aux";
break;
case ProfileType.QnClassColdWater:
case ProfileType.QnClassHotWater:
@ -118,6 +119,17 @@ namespace TBF.UI.Procedures.TestWizard
default:
qnLabel.Text = "Qn";
break;
case ProfileType.QnClassCompound:
qnLabel.Text = "Qn main";
qnAuxLabel.Text = "Qn aux";
break;
case ProfileType.QpQi:
qnLabel.Text = "qp";
break;
case ProfileType.QpQiCompound:
qnLabel.Text = "qp main";
qnAuxLabel.Text = "qp aux";
break;
}
}
@ -125,6 +137,7 @@ namespace TBF.UI.Procedures.TestWizard
{
string oriText = metroClassComboBox.Text;
metroClassComboBox.Items.Clear();
metroClassAuxComboBox.Items.Clear();
bool clearTextFlag = true;
if (profile != null)
@ -134,6 +147,7 @@ namespace TBF.UI.Procedures.TestWizard
{
default:
case ProfileType.Q3R:
case ProfileType.Q3RCompound:
mClasses = new string[] { "R40", "R50", "R63", "R80", "R100", "R125", "R160", "R200", "R250", "R315",
"R400", "R500", "R630", "R800", "R1000", "R1250", "R1600", "R2000", "R2500" };
break;
@ -143,7 +157,11 @@ namespace TBF.UI.Procedures.TestWizard
case ProfileType.QnClassHotWater:
mClasses = new string[] { "A", "B", "C", "D" };
break;
case ProfileType.QnClassCompound:
mClasses = new string[] { "A", "B" };
break;
case ProfileType.QpQi:
case ProfileType.QpQiCompound:
mClasses = new string[] { "1", "2", "3" };
break;
}
@ -151,6 +169,7 @@ namespace TBF.UI.Procedures.TestWizard
foreach (var mc in mClasses)
{
metroClassComboBox.Items.Add(mc);
metroClassAuxComboBox.Items.Add(mc);
if (oriText == mc) clearTextFlag = false;
}
}
@ -258,6 +277,10 @@ namespace TBF.UI.Procedures.TestWizard
qpQiRatioGroupBox.Visible = (SelectedProfile.ProfileType == ProfileType.QpQi);
metroClassGroupBox.Visible = (SelectedProfile.ProfileType != ProfileType.Manual);
qnAuxLabel.Visible = qnAuxTextBox.Visible = metroClassAuxComboBox.Visible =
(SelectedProfile.ProfileType == ProfileType.Q3RCompound ||
SelectedProfile.ProfileType == ProfileType.QnClassCompound ||
SelectedProfile.ProfileType == ProfileType.QpQiCompound);
profileTypeLabel.Text = (newProfile != null) ? newProfile.ProfileType.ToString() : string.Empty;
profileDescriptionLabel.Text = (newProfile != null) ? newProfile.Description : string.Empty;

50
TBF/UI/Procedures/TestWizard/TestProfileSelection.designer.cs generated
View File

@ -47,6 +47,9 @@ namespace TBF.UI.Procedures.TestWizard
this.listViewEx = new Common.Forms.ListViewEx();
this.cancelButton = new System.Windows.Forms.Button();
this.nextButton = new System.Windows.Forms.Button();
this.qnAuxTextBox = new System.Windows.Forms.TextBox();
this.qnAuxLabel = new System.Windows.Forms.Label();
this.metroClassAuxComboBox = new System.Windows.Forms.ComboBox();
((System.ComponentModel.ISupportInitialize)(this.horizSplitContainer)).BeginInit();
this.horizSplitContainer.Panel1.SuspendLayout();
this.horizSplitContainer.Panel2.SuspendLayout();
@ -165,6 +168,8 @@ namespace TBF.UI.Procedures.TestWizard
//
// qnGroupBox
//
this.qnGroupBox.Controls.Add(this.qnAuxTextBox);
this.qnGroupBox.Controls.Add(this.qnAuxLabel);
this.qnGroupBox.Controls.Add(this.qnTextBox);
this.qnGroupBox.Controls.Add(this.qnLabel);
this.qnGroupBox.Location = new System.Drawing.Point(406, 12);
@ -176,7 +181,7 @@ namespace TBF.UI.Procedures.TestWizard
//
// qnTextBox
//
this.qnTextBox.Location = new System.Drawing.Point(50, 22);
this.qnTextBox.Location = new System.Drawing.Point(55, 22);
this.qnTextBox.Name = "qnTextBox";
this.qnTextBox.Size = new System.Drawing.Size(82, 20);
this.qnTextBox.TabIndex = 11;
@ -185,7 +190,7 @@ namespace TBF.UI.Procedures.TestWizard
// qnLabel
//
this.qnLabel.AutoSize = true;
this.qnLabel.Location = new System.Drawing.Point(17, 26);
this.qnLabel.Location = new System.Drawing.Point(10, 26);
this.qnLabel.Name = "qnLabel";
this.qnLabel.Size = new System.Drawing.Size(21, 13);
this.qnLabel.TabIndex = 10;
@ -193,6 +198,7 @@ namespace TBF.UI.Procedures.TestWizard
//
// metroClassGroupBox
//
this.metroClassGroupBox.Controls.Add(this.metroClassAuxComboBox);
this.metroClassGroupBox.Controls.Add(this.metroClassComboBox);
this.metroClassGroupBox.Location = new System.Drawing.Point(571, 12);
this.metroClassGroupBox.Name = "metroClassGroupBox";
@ -210,12 +216,16 @@ namespace TBF.UI.Procedures.TestWizard
this.metroClassComboBox.TabIndex = 0;
this.metroClassComboBox.SelectedIndexChanged += new System.EventHandler(this.metroClassComboBox_SelectedIndexChanged);
//
// listView
// listViewEx
//
this.listViewEx.AllowColumnReorder = true;
this.listViewEx.Dock = System.Windows.Forms.DockStyle.Fill;
this.listViewEx.DoubleClickActivation = false;
this.listViewEx.FullRowSelect = true;
this.listViewEx.GridLines = true;
this.listViewEx.HideSelection = false;
this.listViewEx.Location = new System.Drawing.Point(0, 0);
this.listViewEx.Name = "listView";
this.listViewEx.Name = "listViewEx";
this.listViewEx.Size = new System.Drawing.Size(850, 164);
this.listViewEx.TabIndex = 0;
this.listViewEx.UseCompatibleStateImageBehavior = false;
@ -243,6 +253,33 @@ namespace TBF.UI.Procedures.TestWizard
this.nextButton.UseVisualStyleBackColor = true;
this.nextButton.Click += new System.EventHandler(this.nextButton_Click);
//
// qnAuxTextBox
//
this.qnAuxTextBox.Location = new System.Drawing.Point(55, 48);
this.qnAuxTextBox.Name = "qnAuxTextBox";
this.qnAuxTextBox.Size = new System.Drawing.Size(82, 20);
this.qnAuxTextBox.TabIndex = 13;
this.qnAuxTextBox.Visible = false;
//
// qnAuxLabel
//
this.qnAuxLabel.AutoSize = true;
this.qnAuxLabel.Location = new System.Drawing.Point(10, 52);
this.qnAuxLabel.Name = "qnAuxLabel";
this.qnAuxLabel.Size = new System.Drawing.Size(41, 13);
this.qnAuxLabel.TabIndex = 12;
this.qnAuxLabel.Text = "Q3 aux";
this.qnAuxLabel.Visible = false;
//
// metroClassAuxComboBox
//
this.metroClassAuxComboBox.FormattingEnabled = true;
this.metroClassAuxComboBox.Location = new System.Drawing.Point(23, 48);
this.metroClassAuxComboBox.Name = "metroClassAuxComboBox";
this.metroClassAuxComboBox.Size = new System.Drawing.Size(100, 21);
this.metroClassAuxComboBox.TabIndex = 1;
this.metroClassAuxComboBox.Visible = false;
//
// TestProfileSelection
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -289,5 +326,8 @@ namespace TBF.UI.Procedures.TestWizard
private System.Windows.Forms.GroupBox qpQiRatioGroupBox;
private System.Windows.Forms.ComboBox qpQiRatioComboBox;
private System.Windows.Forms.TextBox qnTextBox;
}
private System.Windows.Forms.TextBox qnAuxTextBox;
private System.Windows.Forms.Label qnAuxLabel;
private System.Windows.Forms.ComboBox metroClassAuxComboBox;
}
}