diff --git a/Common/Common.csproj b/Common/Common.csproj
index 08fd0a62e..eb24bc269 100644
--- a/Common/Common.csproj
+++ b/Common/Common.csproj
@@ -65,6 +65,7 @@
+
diff --git a/Common/IOrderInfo.cs b/Common/IOrderInfo.cs
new file mode 100644
index 000000000..cc08542e8
--- /dev/null
+++ b/Common/IOrderInfo.cs
@@ -0,0 +1,26 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+
+namespace Common
+{
+ public interface IOrderInfo
+ {
+ string POName { get; }
+ string VariantCode { get; }
+ string ModuleParam { get; }
+ int PiecesCount { get; }
+ string SNPrefix { get; }
+ int SNFirst { get; }
+ int SNDigitsCount { get; }
+ string SNSuffix { get; }
+ string RAPrefix { get; }
+ int RAFirst { get; }
+ string RASuffix { get; }
+ string Remark { get; }
+ int CurrentPcsCount { get; set; }
+ int CurrentSN { get; set; }
+ int CurrentRA { get; set; }
+ }
+}
diff --git a/Common/ProcedureInfo.cs b/Common/ProcedureInfo.cs
index 42cfcf9a8..1a682ca71 100644
--- a/Common/ProcedureInfo.cs
+++ b/Common/ProcedureInfo.cs
@@ -17,7 +17,7 @@ namespace Common
public readonly string Name;
public readonly string Signature;
public string Variant;
- public string Order;
+ public IOrderInfo OrderInfo;
public string Workflow;
public string LaserMarking;
public bool IsNative;
@@ -25,14 +25,14 @@ namespace Common
public string ResolvedName;
public ProcedureInfo(ProcedureSelection source, int itemNr, string name, string signature = null,
- string variant = null, string order = null, string workflow = null, string laserMarking = null)
+ string variant = null, IOrderInfo orderInfo = null, string workflow = null, string laserMarking = null)
{
Source = source;
ItemNr = itemNr;
Name = name;
Signature = (signature == null) ? string.Empty : signature;
Variant = (variant == null) ? string.Empty : variant;
- Order = order;
+ OrderInfo = orderInfo;
Workflow = workflow;
LaserMarking = laserMarking;
diff --git a/OrderManagement/OrderManagementDlg.cs b/OrderManagement/OrderManagementDlg.cs
index 14b0f2dd8..b889f801f 100644
--- a/OrderManagement/OrderManagementDlg.cs
+++ b/OrderManagement/OrderManagementDlg.cs
@@ -86,6 +86,7 @@ namespace OrderManagement
Workflow,
Procedure,
Variant,
+ ModuleParam,
LaserMarking,
Pieces,
SNPrefix,
@@ -94,7 +95,6 @@ namespace OrderManagement
SNSuffix,
RAPrefix,
RAFirst,
- RADigitsCount,
RASuffix,
Remark,
Count
@@ -107,6 +107,7 @@ namespace OrderManagement
lv.Columns.Add(new ColumnHeader { Text = Strings.Workflow, Width = 150 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Test_procedure, Width = 150 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Variant_code, Width = 150 });
+ lv.Columns.Add(new ColumnHeader { Text = Strings.Module_parameter, Width = 150 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Laser_marking, Width = 150 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Pieces_count, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.prefix, Width = 80 });
@@ -115,7 +116,6 @@ namespace OrderManagement
lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.suffix, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.RA + " " + Strings.prefix, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.RA + " " + Strings.first, Width = 80 });
- lv.Columns.Add(new ColumnHeader { Text = Strings.RA + " " + Strings.digits_count, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.RA + " " + Strings.suffix, Width = 80 });
lv.Columns.Add(new ColumnHeader { Text = Strings.Remark, Width = 200 });
}
@@ -127,6 +127,7 @@ namespace OrderManagement
lvi.SubItems.Add(o.Workflow);
lvi.SubItems.Add(o.TestProcedure);
lvi.SubItems.Add(o.VariantCode);
+ lvi.SubItems.Add(o.ModuleParam);
lvi.SubItems.Add(o.LaserMarking);
lvi.SubItems.Add(o.PiecesCount.ToString());
lvi.SubItems.Add(o.SNPrefix);
@@ -134,8 +135,7 @@ namespace OrderManagement
lvi.SubItems.Add(o.SNDigitsCount.ToString());
lvi.SubItems.Add(o.SNSuffix);
lvi.SubItems.Add(o.RAPrefix);
- lvi.SubItems.Add(o.RAFirst.ToString(string.Format("D{0}", o.RADigitsCount)));
- lvi.SubItems.Add(o.RADigitsCount.ToString());
+ lvi.SubItems.Add(o.RAFirst.ToString("D9"));
lvi.SubItems.Add(o.RASuffix);
lvi.SubItems.Add(o.Remark);
lvi.Tag = o;
@@ -150,6 +150,7 @@ namespace OrderManagement
lvi.SubItems[i++].Text = o.Workflow;
lvi.SubItems[i++].Text = o.TestProcedure;
lvi.SubItems[i++].Text = o.VariantCode;
+ lvi.SubItems[i++].Text = o.ModuleParam;
lvi.SubItems[i++].Text = o.LaserMarking;
lvi.SubItems[i++].Text = o.PiecesCount.ToString();
lvi.SubItems[i++].Text = o.SNPrefix;
@@ -157,8 +158,7 @@ namespace OrderManagement
lvi.SubItems[i++].Text = o.SNDigitsCount.ToString();
lvi.SubItems[i++].Text = o.SNSuffix;
lvi.SubItems[i++].Text = o.RAPrefix;
- lvi.SubItems[i++].Text = o.RAFirst.ToString(string.Format("D{0}", o.RADigitsCount));
- lvi.SubItems[i++].Text = o.RADigitsCount.ToString();
+ lvi.SubItems[i++].Text = o.RAFirst.ToString("D9");
lvi.SubItems[i++].Text = o.RASuffix;
lvi.SubItems[i++].Text = o.Remark;
}
@@ -298,9 +298,8 @@ namespace OrderManagement
sortOrder = MySortOrder.Ascending;
}
- if (sortColumn == (int)Clmn.Pieces ||
- sortColumn == (int)Clmn.SNFirst || sortColumn == (int)Clmn.SNDigitsCount ||
- sortColumn == (int)Clmn.RAFirst || sortColumn == (int)Clmn.RADigitsCount)
+ if (sortColumn == (int)Clmn.Pieces || sortColumn == (int)Clmn.SNFirst ||
+ sortColumn == (int)Clmn.SNDigitsCount || sortColumn == (int)Clmn.RAFirst)
{
listViewEx1.ListViewItemSorter = new LviIntColumnComparer(sortColumn, sortOrder);
}
diff --git a/OrderManagement/OrderPrintDocument.cs b/OrderManagement/OrderPrintDocument.cs
index 235221776..d760dcbab 100644
--- a/OrderManagement/OrderPrintDocument.cs
+++ b/OrderManagement/OrderPrintDocument.cs
@@ -91,11 +91,11 @@ namespace OrderManagement
(order.SNSuffix != null) ? order.SNSuffix : string.Empty),
Strings.First_radio_address + " :",
string.Format("{0}{1}{2}", (order.RAPrefix != null) ? order.RAPrefix : string.Empty,
- order.RADigitsCount != 0 ? order.RAFirst.ToString(string.Format("D{0}", order.RADigitsCount)) : string.Empty,
+ order.RAFirst.ToString("D9"),
(order.RASuffix != null) ? order.RASuffix : string.Empty),
Strings.Last_radio_address + " :",
string.Format("{0}{1}{2}", (order.RAPrefix != null) ? order.RAPrefix : string.Empty,
- order.RADigitsCount != 0 ? (order.RAFirst + order.PiecesCount - 1).ToString(string.Format("D{0}", order.RADigitsCount)) : string.Empty,
+ (order.RAFirst + order.PiecesCount - 1).ToString("D9"),
(order.RASuffix != null) ? order.RASuffix : string.Empty),
Strings.Workflow + " :",
(order.Workflow != null) ? order.Workflow : string.Empty,
diff --git a/OrderManagement/Properties/AssemblyInfo.cs b/OrderManagement/Properties/AssemblyInfo.cs
index 31ce3e1fd..02253ddad 100644
--- a/OrderManagement/Properties/AssemblyInfo.cs
+++ b/OrderManagement/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.4.0")]
-[assembly: AssemblyFileVersion("3.0.4.0")]
+[assembly: AssemblyVersion("3.0.6.0")]
+[assembly: AssemblyFileVersion("3.0.6.0")]
diff --git a/OrderManagement/Resources/Strings.Designer.cs b/OrderManagement/Resources/Strings.Designer.cs
index e22c70075..22df24b30 100644
--- a/OrderManagement/Resources/Strings.Designer.cs
+++ b/OrderManagement/Resources/Strings.Designer.cs
@@ -213,6 +213,15 @@ namespace OrderManagement.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Module parameter.
+ ///
+ internal static string Module_parameter {
+ get {
+ return ResourceManager.GetString("Module_parameter", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to OK.
///
diff --git a/OrderManagement/Resources/Strings.resx b/OrderManagement/Resources/Strings.resx
index 663d92fe5..dbd80424f 100644
--- a/OrderManagement/Resources/Strings.resx
+++ b/OrderManagement/Resources/Strings.resx
@@ -252,4 +252,7 @@
Show predefined orders
+
+ Module parameter
+
\ No newline at end of file
diff --git a/SchematicDrawing/Properties/AssemblyInfo.cs b/SchematicDrawing/Properties/AssemblyInfo.cs
index 9be2dcab5..13465b620 100644
--- a/SchematicDrawing/Properties/AssemblyInfo.cs
+++ b/SchematicDrawing/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("3.0.2.0")]
+[assembly: AssemblyFileVersion("3.0.2.0")]
diff --git a/SharedDatabase/Entities/OrderInfo.cs b/SharedDatabase/Entities/OrderInfo.cs
index afcc21278..0828e27d9 100644
--- a/SharedDatabase/Entities/OrderInfo.cs
+++ b/SharedDatabase/Entities/OrderInfo.cs
@@ -6,7 +6,7 @@ using SharedDatabase.Resources;
namespace SharedDatabase.Entities
{
- public class OrderInfo : IParamsProvider
+ public class OrderInfo : IParamsProvider, Common.IOrderInfo
{
public virtual int Id { get; protected set; }
public virtual string POName { get; set; } /// 0
@@ -14,16 +14,19 @@ namespace SharedDatabase.Entities
public virtual string Workflow { get; set; } /// 2
public virtual string TestProcedure { get; set; } /// 3
public virtual string VariantCode { get; set; } /// 4
- public virtual string LaserMarking { get; set; } /// 5
- public virtual int PiecesCount { get; set; } /// 6
- public virtual string SNPrefix { get; set; } /// 7
- public virtual int SNFirst { get; set; } /// 8
- public virtual int SNDigitsCount { get; set; } /// 9
- public virtual string SNSuffix { get; set; } /// 10
- public virtual string RAPrefix { get; set; } /// 11
- public virtual int RAFirst { get; set; } /// 12
- public virtual int RADigitsCount { get; set; } /// 13
+ public virtual string ModuleParam { get; set; } /// 5
+ public virtual string LaserMarking { get; set; } /// 6
+ public virtual int PiecesCount { get; set; } /// 7
+ public virtual string SNPrefix { get; set; } /// 8
+ public virtual int SNFirst { get; set; } /// 9
+ public virtual int SNDigitsCount { get; set; } /// 10
+ public virtual string SNSuffix { get; set; } /// 11
+ public virtual string RAPrefix { get; set; } /// 12
+ public virtual int RAFirst { get; set; } /// 13
public virtual string RASuffix { get; set; } /// 14
+ public virtual int CurrentPcsCount { get; set; }
+ public virtual int CurrentSN { get; set; }
+ public virtual int CurrentRA { get; set; }
public virtual int BaseNr1 { get; set; }
public virtual int BaseNr2 { get; set; }
public virtual int BaseNr3 { get; set; }
@@ -50,6 +53,7 @@ namespace SharedDatabase.Entities
Workflow = string.Empty;
TestProcedure = string.Empty;
VariantCode = string.Empty;
+ ModuleParam = string.Empty;
LaserMarking = string.Empty;
SNPrefix = string.Empty;
SNSuffix = string.Empty;
@@ -69,6 +73,7 @@ namespace SharedDatabase.Entities
Strings.Workflow,
Strings.Test_procedure,
Strings.Variant_code,
+ Strings.Module_parameter,
Strings.Laser_marking,
Strings.Pieces_count,
Strings.Serial_nr + " " + Strings.prefix,
@@ -77,7 +82,6 @@ namespace SharedDatabase.Entities
Strings.Serial_nr + " " + Strings.suffix,
Strings.Radio_address + " " + Strings.prefix,
Strings.Radio_address + " " + Strings.first,
- Strings.Radio_address + " " + Strings.digits_count,
Strings.Radio_address + " " + Strings.suffix,
Strings.Remark,
};
@@ -107,15 +111,15 @@ namespace SharedDatabase.Entities
case 2: return Workflow;
case 3: return TestProcedure;
case 4: return VariantCode;
- case 5: return LaserMarking;
- case 6: return PiecesCount.ToString();
- case 7: return SNPrefix;
- case 8: return SNFirst.ToString();
- case 9: return SNDigitsCount.ToString();
- case 10: return SNSuffix;
- case 11: return RAPrefix;
- case 12: return RAFirst.ToString();
- case 13: return RADigitsCount.ToString();
+ case 5: return ModuleParam;
+ case 6: return LaserMarking;
+ case 7: return PiecesCount.ToString();
+ case 8: return SNPrefix;
+ case 9: return SNFirst.ToString();
+ case 10: return SNDigitsCount.ToString();
+ case 11: return SNSuffix;
+ case 12: return RAPrefix;
+ case 13: return RAFirst.ToString();
case 14: return RASuffix;
case 15: return Remark;
default:
@@ -146,31 +150,31 @@ namespace SharedDatabase.Entities
VariantCode = str;
return CfgUpdateFlags.RestartRqrd;
case 5:
- LaserMarking = str;
+ ModuleParam = str;
return CfgUpdateFlags.RestartRqrd;
case 6:
- PiecesCount = int.Parse(str);
+ LaserMarking = str;
return CfgUpdateFlags.RestartRqrd;
case 7:
- SNPrefix = str;
+ PiecesCount = int.Parse(str);
return CfgUpdateFlags.RestartRqrd;
case 8:
- SNFirst = int.Parse(str);
+ SNPrefix = str;
return CfgUpdateFlags.RestartRqrd;
case 9:
- SNDigitsCount = int.Parse(str);
+ SNFirst = int.Parse(str);
return CfgUpdateFlags.RestartRqrd;
case 10:
- SNSuffix = str;
+ SNDigitsCount = int.Parse(str);
return CfgUpdateFlags.RestartRqrd;
case 11:
- RAPrefix = str;
+ SNSuffix = str;
return CfgUpdateFlags.RestartRqrd;
case 12:
- RAFirst = int.Parse(str);
+ RAPrefix = str;
return CfgUpdateFlags.RestartRqrd;
case 13:
- RADigitsCount = int.Parse(str);
+ RAFirst = int.Parse(str);
return CfgUpdateFlags.RestartRqrd;
case 14:
RASuffix = str;
@@ -204,29 +208,33 @@ namespace SharedDatabase.Entities
return true;
case 2:
case 3:
- case 4:
- case 5:
+ case 6:
/// nonempty string
if (!string.IsNullOrEmpty(str)) return true;
message = string.Format(Strings._0_should_not_be_empty, ParamName(i));
return false;
+ case 4:
+ case 5:
+ /// string (incl. an empty one)
+ if (str != null) return true;
+ message = string.Format("Should not be null", ParamName(i));
+ return false;
case 1:
if (ParamValues(i).Contains(str)) return true;
break;
- case 6:
- case 9:
+ case 7:
+ case 10:
/// positive integers
if (int.TryParse(str, out idummy) && idummy > 0) return true;
break;
- case 7:
- case 10:
+ case 8:
case 11:
+ case 12:
case 14:
case 15:
/// strings
return true;
- case 8:
- case 12:
+ case 9:
case 13:
/// non-negative integer
if (int.TryParse(str, out idummy) && idummy >= 0) return true;
@@ -247,6 +255,7 @@ namespace SharedDatabase.Entities
dest.Workflow = Workflow;
dest.TestProcedure = TestProcedure;
dest.VariantCode = VariantCode;
+ dest.ModuleParam = ModuleParam;
dest.LaserMarking = LaserMarking;
dest.PiecesCount = PiecesCount;
dest.SNPrefix = SNPrefix;
@@ -255,7 +264,6 @@ namespace SharedDatabase.Entities
dest.SNSuffix = SNSuffix;
dest.RAPrefix = RAPrefix;
dest.RAFirst = RAFirst;
- dest.RADigitsCount = RADigitsCount;
dest.RASuffix = RASuffix;
dest.BaseNr1 = BaseNr1;
dest.BaseNr2 = BaseNr2;
@@ -283,6 +291,11 @@ namespace SharedDatabase.Entities
{
return true; /// =OK, do nothing
}
+
+ public override string ToString()
+ {
+ return POName;
+ }
}
public enum OrderState : sbyte
diff --git a/SharedDatabase/Mappings/OrderInfoMap.cs b/SharedDatabase/Mappings/OrderInfoMap.cs
index 6f6b84a51..ad9253124 100644
--- a/SharedDatabase/Mappings/OrderInfoMap.cs
+++ b/SharedDatabase/Mappings/OrderInfoMap.cs
@@ -13,16 +13,21 @@ namespace SharedDatabase.Mappings
Map(x => x.Workflow);
Map(x => x.TestProcedure);
Map(x => x.VariantCode);
+ Map(x => x.ModuleParam)
+ .CustomType("StringClob")
+ .CustomSqlType("varchar(2000)");
Map(x => x.LaserMarking);
Map(x => x.PiecesCount);
- Map(x => x.SNFirst);
Map(x => x.SNPrefix);
+ Map(x => x.SNFirst);
Map(x => x.SNDigitsCount);
Map(x => x.SNSuffix);
- Map(x => x.RAFirst);
Map(x => x.RAPrefix);
- Map(x => x.RADigitsCount);
+ Map(x => x.RAFirst);
Map(x => x.RASuffix);
+ Map(x => x.CurrentPcsCount);
+ Map(x => x.CurrentSN);
+ Map(x => x.CurrentRA);
Map(x => x.BaseNr1);
Map(x => x.BaseNr2);
Map(x => x.BaseNr3);
diff --git a/SharedDatabase/Resources/Strings.Designer.cs b/SharedDatabase/Resources/Strings.Designer.cs
index 5f8cbf6e7..81f599fed 100644
--- a/SharedDatabase/Resources/Strings.Designer.cs
+++ b/SharedDatabase/Resources/Strings.Designer.cs
@@ -366,6 +366,15 @@ namespace SharedDatabase.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Module parameter.
+ ///
+ internal static string Module_parameter {
+ get {
+ return ResourceManager.GetString("Module_parameter", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to {0} users copied.
///
diff --git a/SharedDatabase/Resources/Strings.resx b/SharedDatabase/Resources/Strings.resx
index 7c1326a76..0cde87da3 100644
--- a/SharedDatabase/Resources/Strings.resx
+++ b/SharedDatabase/Resources/Strings.resx
@@ -414,4 +414,7 @@
Laser marking
+
+ Module parameter
+
\ No newline at end of file
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index b1cb76c57..1c0ad038c 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.1.1819.0")]
-[assembly: AssemblyFileVersion("3.1.1819.0")]
+[assembly: AssemblyVersion("3.1.1827.0")]
+[assembly: AssemblyFileVersion("3.1.1827.0")]
diff --git a/TBF/Rig/DataEntry/S620/EntryForm.cs b/TBF/Rig/DataEntry/S620/EntryForm.cs
index 01952a1c4..f917527e3 100644
--- a/TBF/Rig/DataEntry/S620/EntryForm.cs
+++ b/TBF/Rig/DataEntry/S620/EntryForm.cs
@@ -7,6 +7,7 @@ using log4net;
using Config.Entities;
using TBF.Rig;
using TBF.Rig.GenericDevices;
+using TBF.Rig.Sequences;
namespace TBF.Rig.DataEntry.S620
{
@@ -90,7 +91,7 @@ namespace TBF.Rig.DataEntry.S620
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.ShowFormAtCycleBeginning;
- this.waterMeters = TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters;
+ this.waterMeters = ProcessData.BatchRslts.Batch.WaterMeters;
return this;
}
@@ -133,8 +134,8 @@ namespace TBF.Rig.DataEntry.S620
{
if (entryFormCfg.ProductionTracing)
{
- string order = (TBF.Rig.Sequences.ProcessData.BatchRslts != null) ? TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.PurchaseOrder : null;
- string workflow = (TBF.Rig.Sequences.ProcessData.BatchRslts != null) ? TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.Workflow : null;
+ string order = ProcessData.SelectedProcedure.OrderInfo.POName;
+ string workflow = ProcessData.SelectedProcedure.Workflow;
myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, false,
true, entryFormCfg.OrdersFromProdTracing, order, workflow);
@@ -150,8 +151,8 @@ namespace TBF.Rig.DataEntry.S620
{
if (entryFormCfg.ProductionTracing)
{
- string order = (TBF.Rig.Sequences.ProcessData.BatchRslts != null) ? TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.PurchaseOrder : null;
- string workflow = (TBF.Rig.Sequences.ProcessData.BatchRslts != null) ? TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.Workflow : null;
+ string order = ProcessData.SelectedProcedure.OrderInfo.POName;
+ string workflow = ProcessData.SelectedProcedure.Workflow;
myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, true,
true, entryFormCfg.OrdersFromProdTracing, order, workflow);
diff --git a/TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs b/TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs
index 4a9023ed8..7efcaf841 100644
--- a/TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs
@@ -11,6 +11,7 @@ using TBF.Rig.Sequences;
using TBF.Rig.Output.DB.SensusOracle;
using TBF.Resources;
using System.Drawing;
+using NHibernate;
namespace TBF.Rig.DataEntry.iPerl
{
@@ -23,7 +24,8 @@ namespace TBF.Rig.DataEntry.iPerl
readonly EntryFormCfg cfg;
/// Loaded from database beforethe form is open
- IList listOfOrders;
+ IList listOfOrders;
+ string preselectedOrder;
/// To be retrieved after the form is closed
public string PurchaseOrder;
@@ -40,6 +42,7 @@ namespace TBF.Rig.DataEntry.iPerl
{
InitializeComponent();
ControlBox = false;
+ preselectedOrder = null;
completed = false;
StartForceCloseHandler();
@@ -50,11 +53,12 @@ namespace TBF.Rig.DataEntry.iPerl
/// Constructor
///
/// Number of text boxes for serial numbers
- public CycleBeginningForm(int waterMetersCount, EntryFormCfg cfg)
+ public CycleBeginningForm(int waterMetersCount, EntryFormCfg cfg, string preselectedOrder = null)
: this()
{
this.WaterMetersCount = waterMetersCount;
this.cfg = cfg;
+ this.preselectedOrder = preselectedOrder;
SNText = null;
Disabled = null;
}
@@ -66,19 +70,38 @@ namespace TBF.Rig.DataEntry.iPerl
orderGroupBox.Text = Strings.Purchase_order;
okButton.Text = Strings.OkBtnText;
- listOfOrders = ((cfg.Orders == Orders.FromOracle || cfg.Orders == Orders.CombinedAndFromOracle) && ProcessData.OracleDB != null)
- ? ProcessData.OracleDB.ReadOrderNumbers()
- : new List();
+ listOfOrders = new List();
+
+ if ((cfg.Orders == Orders.FromOracle || cfg.Orders == Orders.CombinedAndFromOracle) && ProcessData.OracleDB != null)
+ {
+ var list = ProcessData.OracleDB.ReadOrders();
+ foreach (var o in list) listOfOrders.Add(o);
+ }
+
+ if ((cfg.Orders == Orders.FromTracingDB || cfg.Orders == Orders.CombinedAndFromTracingDB) && ProcessData.TracingDB != null)
+ {
+ ISession session = ProcessData.TracingDB.SessionFactory.OpenSession();
+ var list = ProcessData.TracingDB.ReadOrders(session);
+ if (session.IsOpen) session.Close();
+ foreach (var o in list) listOfOrders.Add(o);
+ }
string insertFirst = null;
- if (Program.LocalSettings.PurchaseOrderHistoryCount > 0)
+ if (!string.IsNullOrEmpty(preselectedOrder))
{
- foreach (var o in listOfOrders)
+ insertFirst = preselectedOrder;
+ }
+ else
+ {
+ if (Program.LocalSettings.PurchaseOrderHistoryCount > 0)
{
- if (o.AuftragsNummer == Program.LocalSettings.PurchaseOrderHistory[0])
+ foreach (var o in listOfOrders)
{
- insertFirst = o.AuftragsNummer;
- break;
+ if (o.POName == Program.LocalSettings.PurchaseOrderHistory[0])
+ {
+ insertFirst = o.POName;
+ break;
+ }
}
}
}
@@ -90,6 +113,7 @@ namespace TBF.Rig.DataEntry.iPerl
break;
case Orders.FromOracle:
+ case Orders.FromTracingDB:
if (insertFirst != null)
{
orderComboBox.Items.Add(insertFirst);
@@ -97,11 +121,12 @@ namespace TBF.Rig.DataEntry.iPerl
}
foreach (var o in listOfOrders)
- if (o.AuftragsNummer != insertFirst)
- orderComboBox.Items.Add(o.AuftragsNummer);
+ if (o.POName != insertFirst)
+ orderComboBox.Items.Add(o.POName);
break;
case Orders.CombinedAndFromOracle:
+ case Orders.CombinedAndFromTracingDB:
if (insertFirst != null)
{
orderComboBox.Items.Add(insertFirst);
@@ -141,8 +166,8 @@ namespace TBF.Rig.DataEntry.iPerl
orderComboBox.Items.Add("GFAATMXX");
foreach (var o in listOfOrders)
- if (o.AuftragsNummer != insertFirst)
- orderComboBox.Items.Add(o.AuftragsNummer);
+ if (o.POName != insertFirst)
+ orderComboBox.Items.Add(o.POName);
break;
}
@@ -201,7 +226,7 @@ namespace TBF.Rig.DataEntry.iPerl
return;
}
- ProcessData.OrderDetails = (listOfOrders == null) ? null : listOfOrders.FirstOrDefault(x => x.AuftragsNummer == orderComboBox.Text);
+ ProcessData.OrderInfo = (listOfOrders == null) ? null : listOfOrders.FirstOrDefault(x => x.POName == orderComboBox.Text);
PurchaseOrder = orderComboBox.Text;
Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
diff --git a/TBF/Rig/DataEntry/iPerl/EntryForm.cs b/TBF/Rig/DataEntry/iPerl/EntryForm.cs
index 210209b15..962a73e47 100644
--- a/TBF/Rig/DataEntry/iPerl/EntryForm.cs
+++ b/TBF/Rig/DataEntry/iPerl/EntryForm.cs
@@ -7,6 +7,7 @@ using log4net;
using Config.Entities;
using TBF.Rig;
using TBF.Rig.GenericDevices;
+using TBF.Rig.Sequences;
namespace TBF.Rig.DataEntry.iPerl
{
@@ -84,7 +85,7 @@ namespace TBF.Rig.DataEntry.iPerl
{
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
currentOp = CurrentOp.ShowFormAtCycleBeginning;
- this.waterMeters = TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters;
+ this.waterMeters = ProcessData.BatchRslts.Batch.WaterMeters;
return this;
}
@@ -116,7 +117,8 @@ namespace TBF.Rig.DataEntry.iPerl
///
void OpenBeginningDlg(EntryForm myRef)
{
- myRef.modelessDlg = new CycleBeginningForm(TBF.Data.WMsCount, myRef.entryFormCfg);
+ myRef.modelessDlg = new CycleBeginningForm(TBF.Data.WMsCount, myRef.entryFormCfg,
+ ProcessData.SelectedProcedure.OrderInfo != null ? ProcessData.SelectedProcedure.OrderInfo.POName : string.Empty);
modelessDlg.Show();
}
///
@@ -139,7 +141,14 @@ namespace TBF.Rig.DataEntry.iPerl
switch (currentOp)
{
case CurrentOp.ShowFormAtCycleBeginning:
- Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
+ if (ProcessData.SelectedProcedure.OrderInfo == null || entryFormCfg.Direction != Direction.S640)
+ {
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
+ }
+ else
+ {
+ modelessDlg = null;
+ }
break;
case CurrentOp.EnterTestStartStates:
Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this);
@@ -154,7 +163,17 @@ namespace TBF.Rig.DataEntry.iPerl
/// Event.ResultsPrinted
public Event Run()
{
- if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
+ if (ProcessData.SelectedProcedure.OrderInfo != null && entryFormCfg.Direction == Direction.S640)
+ {
+ for (int i = 0; i < waterMeters.Count; i++)
+ {
+ if (waterMeters[i] != null)
+ waterMeters[i].PurchaseOrder = ProcessData.SelectedProcedure.OrderInfo.POName;
+ }
+ return Event.ModelessFormClosed;
+ }
+
+ if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
{
return Event.ModelessFormIsOpen;
}
diff --git a/TBF/Rig/DataEntry/iPerl/EntryFormCfg.cs b/TBF/Rig/DataEntry/iPerl/EntryFormCfg.cs
index 607318220..69b9faa07 100644
--- a/TBF/Rig/DataEntry/iPerl/EntryFormCfg.cs
+++ b/TBF/Rig/DataEntry/iPerl/EntryFormCfg.cs
@@ -32,17 +32,23 @@ namespace TBF.Rig.DataEntry.iPerl
public enum Orders
{
#if LANG_SK
- [Description("Ľubovolné")] Arbitrary,
- [Description("Aktívne z Oracle")] FromOracle,
- [Description("Združené a aktívne z Oracle")] CombinedAndFromOracle,
-#elif LANG_DE
- [Description("Arbitrary")] Arbitrary,
- [Description("Active from Oracle")] FromOracle,
- [Description("Combined and active from Oracle")] CombinedAndFromOracle,
+ [Description("Ľubovolné")] Arbitrary,
+ [Description("Z Oracle databázy")] FromOracle,
+ [Description("Zo sledovacej databázy")] FromTracingDB,
+ [Description("Združené a z Oracle")] CombinedAndFromOracle,
+ [Description("Združené a zo sledovacej databázy")] CombinedAndFromTracingDB,
+#elif LANG_CZ
+ [Description("Libovolné")] Arbitrary,
+ [Description("Z Oracle databáze")] FromOracle,
+ [Description("Ze sledovací databáze")] FromTracingDB,
+ [Description("Sdružené a z Oracle")] CombinedAndFromOracle,
+ [Description("Sdružené a ze sledovací databáze")] CombinedAndFromTracingDB,
#else
- [Description("Arbitrary")] Arbitrary,
- [Description("Active from Oracle")] FromOracle,
- [Description("Combined and active from Oracle")] CombinedAndFromOracle,
+ [Description("Arbitrary")] Arbitrary,
+ [Description("From Oracle")] FromOracle,
+ [Description("From Tracing DB")] FromTracingDB,
+ [Description("Combined and from Oracle")] CombinedAndFromOracle,
+ [Description("Combined and from Tracing DB")] CombinedAndFromTracingDB,
#endif
Count,
}
@@ -93,22 +99,15 @@ namespace TBF.Rig.DataEntry.iPerl
public ICollection ParamValues(int i)
{
+ var list = new List();
switch (i)
{
case 0:
- return new string[]
- {
- Direction.Forward_RL.ToDescription(),
- Direction.Reversed_LR.ToDescription(),
- Direction.S640.ToDescription(),
- };
+ for (Direction d = 0; d < Direction.Count; d++) list.Add(d.ToDescription());
+ return list;
case 1:
- return new string[]
- {
- Orders.Arbitrary.ToDescription(),
- Orders.FromOracle.ToDescription(),
- Orders.CombinedAndFromOracle.ToDescription(),
- };
+ for (Orders o = 0; o < Orders.Count; o++) list.Add(o.ToDescription());
+ return list;
default:
return null;
}
diff --git a/TBF/Rig/Output/DB/ProductionTracing/Tracing.cs b/TBF/Rig/Output/DB/ProductionTracing/Tracing.cs
index 8e60b37cf..bd83e4f13 100644
--- a/TBF/Rig/Output/DB/ProductionTracing/Tracing.cs
+++ b/TBF/Rig/Output/DB/ProductionTracing/Tracing.cs
@@ -75,7 +75,8 @@ namespace TBF.Rig.Output.DB.ProductionTracing
Results.Entities.Batch batch;
- ISessionFactory sessionFactory; /// Factory to create database sessions that is initialized in the constructor
+ public ISessionFactory SessionFactory; /// Factory to create database sessions that is initialized in the constructor
+
IList processes;
Dictionary processDictionary;
Dictionary> workstepsDictionary;
@@ -125,7 +126,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
///
/// Session factory is used to create database sessions
///
- sessionFactory = FluentNHibernate.Cfg.Fluently.Configure()
+ SessionFactory = FluentNHibernate.Cfg.Fluently.Configure()
.Database(FluentNHibernate.Cfg.Db.MySQLConfiguration.Standard.ConnectionString(tracingCfg.ConnStr))
.Mappings(m => m.FluentMappings.AddFromAssemblyOf())
.ExposeConfiguration(SharedDatabase.TracingDB.BuildSchema)
@@ -146,7 +147,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
///
/// Register this test bench in the tracing DB for approx. 2 weeks
///
- ISession session = sessionFactory.OpenSession();
+ ISession session = SessionFactory.OpenSession();
#if !DEBUG
/// Only a release version registers a workplace
@@ -160,7 +161,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
#endif
session.Flush();
session.Close();
- SharedDatabase.TracingDB.SessionFactory = sessionFactory;
+ SharedDatabase.TracingDB.SessionFactory = SessionFactory;
if (session != null) session.Dispose();
currentWorkflow = null;
@@ -178,7 +179,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
{
if (tracingCfg.DebugLevel == DebugMode.Simulate) return;
- using (ISession session = sessionFactory.OpenSession())
+ using (ISession session = SessionFactory.OpenSession())
{
SharedDatabase.TracingDB.UnregisterWorkplaceObsolete(session, workplace);
session.Flush();
@@ -187,6 +188,69 @@ namespace TBF.Rig.Output.DB.ProductionTracing
public void StopDevice2() {}
+ public IList ReadOrders(ISession session)
+ {
+ try
+ {
+ session = SessionFactory.OpenSession();
+ var result = session.QueryOver()
+ .Where(x => (x.POState == (sbyte)OrderState.New || x.POState == (sbyte)OrderState.Active))
+ .List();
+ return result;
+ }
+ catch (Exception exc)
+ {
+ log.ErrorFormat("Cannot read orders from the tracing DB: {0}", exc.Message);
+ return new List();
+ }
+ }
+
+
+ ///
+ /// Read reference records belonging to specified order
+ ///
+ /// DB sesson
+ /// Order
+ /// List of reference records-s
+ public IList ReadRefRecords(ISession session, OrderInfo order)
+ {
+ try
+ {
+ return session.QueryOver()
+ .Where(x => (x.POrder == order))
+ .List();
+ }
+ catch (Exception exc)
+ {
+ log.ErrorFormat("Cannot read orders from the tracing DB: {0}", exc.Message);
+ return new List();
+ }
+ }
+
+
+ ///
+ /// Read records belonging to specified order
+ ///
+ /// DB sesson
+ /// Order
+ /// List of records
+ public IList ReadRecords(ISession session, OrderInfo order)
+ {
+ try
+ {
+ return session.QueryOver()
+ .JoinQueryOver(rec => rec.ReferenceRecord)
+ .Where(rr => rr.POrder.Id == order.Id)
+ .List();
+ }
+ catch (Exception exc)
+ {
+ log.ErrorFormat("Cannot read orders from the tracing DB: {0}", exc.Message);
+ return new List();
+ }
+ }
+
+
///
/// Reads information on start of a cycle, Events: Event.InfoRead
///
@@ -349,7 +413,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
if (sampleWM != null)
{
bool isAtLeastOneNOK = false;
- using (ISession session = sessionFactory.OpenSession())
+ using (ISession session = SessionFactory.OpenSession())
{
var cOrders = session.QueryOver()
.Where(x => x.POName == sampleWM.PurchaseOrder)
@@ -518,7 +582,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
///
try
{
- session = sessionFactory.OpenSession();
+ session = SessionFactory.OpenSession();
transaction = session.BeginTransaction();
var cOrders = session.QueryOver()
diff --git a/TBF/Rig/Output/DB/SensusOracle/Database.cs b/TBF/Rig/Output/DB/SensusOracle/Database.cs
index 7d74215a0..13dcb521f 100644
--- a/TBF/Rig/Output/DB/SensusOracle/Database.cs
+++ b/TBF/Rig/Output/DB/SensusOracle/Database.cs
@@ -1546,7 +1546,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
///
/// Oracle DB connection
/// List of active purchase orders
- public IList ReadOrderNumbers()
+ public IList ReadOrders()
{
OracleConnection connection = ProductionDB;
@@ -1588,18 +1588,18 @@ namespace TBF.Rig.Output.DB.SensusOracle
int znrlaenge = dr.GetInt32(i++);
string modul_param; try { modul_param = dr.GetString(i++); } catch { modul_param = string.Empty; }
- orders.Add(new OrderDetails { AuftragsNummer = auftragsnummer,
- VariantenCode = variantencode,
- EsrsteZaehlerNr = erste_zaehlernr,
- Prefix = prefix,
- Suffix = suffix,
+ orders.Add(new OrderDetails { POName = auftragsnummer,
+ VariantCode = variantencode,
+ SNFirst = erste_zaehlernr,
+ SNPrefix = prefix,
+ SNSuffix = suffix,
Zaehlwerk = zaehlwerk,
Created = erfasst_am,
DueDate = sollende,
- TargetPcsCount = sollstueck,
+ PiecesCount = sollstueck,
Remark = zusatztext,
- SNLength = znrlaenge,
- ModuleParameter = modul_param });
+ SNDigitsCount = znrlaenge,
+ ModuleParam = modul_param });
}
dr.Close();
}
@@ -1615,10 +1615,10 @@ namespace TBF.Rig.Output.DB.SensusOracle
}
else
{
- orders = new List ()
+ orders = new List()
{
- new OrderDetails { AuftragsNummer = "1234567", EsrsteZaehlerNr = 1, TargetPcsCount = 100, Prefix = "Pre", Suffix = "Suf", VariantenCode = "abeceda" },
- new OrderDetails { AuftragsNummer = "2345678", EsrsteZaehlerNr = 1, TargetPcsCount = 200, Prefix = "Pfx", Suffix = "Sfx", VariantenCode = "zjedla_deda" },
+ new OrderDetails { POName = "1234567", SNFirst = 1, PiecesCount = 100, SNPrefix = "Pre", SNSuffix = "Suf", VariantCode = "abeceda" },
+ new OrderDetails { POName = "2345678", SNFirst = 1, PiecesCount = 200, SNPrefix = "Pfx", SNSuffix = "Sfx", VariantCode = "zjedla_deda" },
};
}
@@ -1631,7 +1631,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
///
/// Oracle DB connection
/// List of active purchase orders
- public bool ReadOrderDetails(ref OrderDetails auftrag)
+ public bool ReadOrderDetails(ref OrderDetails order)
{
if (dbCfg.DebugLevel == DebugMode.Normal)
{
@@ -1643,12 +1643,12 @@ namespace TBF.Rig.Output.DB.SensusOracle
OracleCommand cmd = new OracleCommand("SELECT iststueck FROM vt_auftrag_pd WHERE auftragsnummer=:1 AND anbid=:2", connection);
- cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.AuftragsNummer });
+ cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = order.POName });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
OracleDataReader dr = cmd.ExecuteReader();
if (dr.Read())
{
- try { auftrag.CurrentPcsCount = dr.GetInt32(0); } catch { auftrag.CurrentPcsCount = 0; }
+ try { order.CurrentPcsCount = dr.GetInt32(0); } catch { order.CurrentPcsCount = 0; }
}
dr.Close();
@@ -1657,20 +1657,20 @@ namespace TBF.Rig.Output.DB.SensusOracle
" prefix_adresse, suffix_adresse, akt_adresse " +
"FROM vt_auft_zaehlernr_pd " +
"WHERE auftragsnummer=:1 AND anbid=:2", connection);
- cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.AuftragsNummer });
+ cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = order.POName });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
dr = cmd.ExecuteReader();
if (dr.Read())
{
int i = 0;
- auftrag.FirstSerialNr = dr.GetInt32(i++);
- auftrag.LastSerialNr = dr.GetInt32(i++);
- auftrag.CurrentSerialNr = dr.GetInt32(i++);
- auftrag.FirstRadioAddress = dr.GetInt32(i++);
- auftrag.LastRadioAddress = dr.GetInt32(i++);
- try { auftrag.RadioAddressPrefix = dr.GetString(i++); } catch { auftrag.RadioAddressPrefix = string.Empty; }
- try { auftrag.RadioAddressSuffix = dr.GetString(i++); } catch { auftrag.RadioAddressSuffix = string.Empty; }
- auftrag.CurrentRadioAddress = dr.GetInt32(i++);
+ order.SNFirst = dr.GetInt32(i++);
+ order.LastSerialNr = dr.GetInt32(i++);
+ order.CurrentSN = dr.GetInt32(i++);
+ order.RAFirst = dr.GetInt32(i++);
+ order.LastRadioAddress = dr.GetInt32(i++);
+ try { order.RAPrefix = dr.GetString(i++); } catch { order.RAPrefix = string.Empty; }
+ try { order.RASuffix = dr.GetString(i++); } catch { order.RASuffix = string.Empty; }
+ order.CurrentRA = dr.GetInt32(i++);
}
dr.Close();
@@ -1681,7 +1681,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
catch (Exception exc)
{
log.ErrorFormat("ERROR: Oracle DB query SELECT ... FROM vt_auft_zaehlernr_pd WHERE auftragsnummer={0} failed: {1}",
- auftrag.AuftragsNummer, exc.Message);
+ order.POName, exc.Message);
if (connection != null) connection.Close();
return false;
}
@@ -1711,16 +1711,16 @@ namespace TBF.Rig.Output.DB.SensusOracle
OracleCommand cmd = new OracleCommand("UPDATE vt_auftrag_pd SET iststueck=:1 WHERE auftragsnummer=:2 AND anbid=:3", connection);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = auftrag.CurrentPcsCount });
- cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.AuftragsNummer });
+ cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.POName });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
int updatedRows = cmd.ExecuteNonQuery();
cmd = new OracleCommand("UPDATE vt_auft_zaehlernr_pd SET akt_nummer=:1, akt_adresse=:2 " +
"WHERE auftragsnummer=:3 AND anbid=:4", connection);
- cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = auftrag.CurrentSerialNr });
- cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = auftrag.CurrentRadioAddress });
- cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.AuftragsNummer });
+ cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = auftrag.CurrentSN });
+ cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = auftrag.CurrentRA });
+ cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.POName });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
updatedRows = Math.Min(cmd.ExecuteNonQuery(), updatedRows);
@@ -1731,7 +1731,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
catch (Exception exc)
{
log.ErrorFormat("ERROR: Oracle DB query SELECT ... FROM vt_auft_zaehlernr_pd WHERE auftragsnummer={0} failed: {1}",
- auftrag.AuftragsNummer, exc.Message);
+ auftrag.POName, exc.Message);
if (connection != null) connection.Close();
return 0;
}
diff --git a/TBF/Rig/Output/DB/SensusOracle/OrderDetails.cs b/TBF/Rig/Output/DB/SensusOracle/OrderDetails.cs
index 8d7c125e2..036ebf618 100644
--- a/TBF/Rig/Output/DB/SensusOracle/OrderDetails.cs
+++ b/TBF/Rig/Output/DB/SensusOracle/OrderDetails.cs
@@ -5,49 +5,48 @@ using System;
namespace TBF.Rig.Output.DB.SensusOracle
{
- public class OrderDetails
+ public class OrderDetails : Common.IOrderInfo
{
///
/// Fixed
///
- public string AuftragsNummer; /// Production order
- public string VariantenCode; /// Spec
- public int EsrsteZaehlerNr; /// First S/N
- public string Prefix; /// S/N prefix
- public string Suffix; /// S/N suffix
- public int Zaehlwerk; /// SAP number of the counter
+ public string POName { get; set; } /// Production order
+ public string VariantCode { get; set; } /// Spec
+ public string ModuleParam { get; set; }
+ public int PiecesCount { get; set; } /// Target pieces count
+ public string SNPrefix { get; set; } /// S/N prefix
+ public int SNFirst { get; set; } /// First S/N
+ public int SNDigitsCount { get; set; }
+ public string SNSuffix { get; set; } /// S/N suffix
+ public string RAPrefix { get; set; }
+ public int RAFirst { get; set; }
+ public string RASuffix { get; set; }
+ public string Remark { get; set; }
public DateTime Created;
public DateTime DueDate;
- public int TargetPcsCount; /// Target pieces count
- public string Remark;
- public int SNLength;
- public string ModuleParameter;
- public int FirstSerialNr;
+ public int Zaehlwerk; /// SAP number of the counter
public int LastSerialNr;
- public int FirstRadioAddress;
public int LastRadioAddress;
- public string RadioAddressPrefix;
- public string RadioAddressSuffix;
///
/// Incremented
///
- public int CurrentPcsCount;
- public int CurrentSerialNr;
- public int CurrentRadioAddress;
+ public int CurrentPcsCount { get; set; }
+ public int CurrentSN { get; set; }
+ public int CurrentRA { get; set; }
public OrderDetails()
{
- Prefix = string.Empty;
- Suffix = string.Empty;
+ SNPrefix = string.Empty;
+ SNSuffix = string.Empty;
Remark = string.Empty;
- ModuleParameter = string.Empty;
- RadioAddressPrefix = string.Empty;
- RadioAddressSuffix = string.Empty;
+ ModuleParam = string.Empty;
+ RAPrefix = string.Empty;
+ RASuffix = string.Empty;
}
public override string ToString()
{
- return string.Format("{0} [{1}] {2}", AuftragsNummer, TargetPcsCount, VariantenCode);
+ return string.Format("{0} [{1}] {2}", POName, PiecesCount, VariantCode);
}
}
}
diff --git a/TBF/Rig/Sequences/MainSeq.cs b/TBF/Rig/Sequences/MainSeq.cs
index b9dd279fd..6f8309122 100644
--- a/TBF/Rig/Sequences/MainSeq.cs
+++ b/TBF/Rig/Sequences/MainSeq.cs
@@ -101,7 +101,8 @@ namespace TBF.Rig.Sequences
/// 2nd argument: as is
/// 3rd argument: as is
- myRef.modelessDlg = new TestMethods.S640Communication.S640CommForm(activities, config, procParams, tests);
+ myRef.modelessDlg = new TestMethods.S640Communication.S640CommForm(activities, config, procParams, tests,
+ ProcessData.BatchRslts.Batch.WaterMeters);
myRef.modelessDlg.Show();
}
catch (Exception e)
@@ -212,9 +213,12 @@ namespace TBF.Rig.Sequences
}
while (selection == Selection.Shutdown);
+ ProcessData.SelectedProcedure = Program.MainWnd.SelectedProcedure;
+ ProcessData.OrderInfo = Program.MainWnd.SelectedProcedure.OrderInfo;
+
selectedTestName = (selection == Selection.Q1) ? "Q1"
: ((selection == Selection.Q2) ? "Q2"
- : ((selection == Selection.Q3) ? "Q3" : Bridge.SelectedTestName));
+ : ((selection == Selection.Q3) ? "Q3" : Program.MainWnd.BenchControlPanel.TestName));
///
/// Auto invocation actions
@@ -286,9 +290,9 @@ namespace TBF.Rig.Sequences
foreach (var test in StateMachine.Procedure.Tests) a += test.MoreParams.Count;
}
}
- else if (Bridge.SelectedProcedure != null &&
- Bridge.SelectedProcedure.ResolvedSource != ProcedureSelection.None &&
- !string.IsNullOrEmpty(Bridge.SelectedProcedure.ResolvedName))
+ else if (SelectedProcedure != null &&
+ SelectedProcedure.ResolvedSource != ProcedureSelection.None &&
+ !string.IsNullOrEmpty(SelectedProcedure.ResolvedName))
{
if (selection == Selection.Cycle)
{
@@ -306,13 +310,13 @@ namespace TBF.Rig.Sequences
}
/// TODO: Repeate twice for DBKind.Config and DBKind.RemoteConfig
- using (ISession remoteOrLocalSession = TBF.DB.CreateSession((Bridge.SelectedProcedure.ResolvedSource == ProcedureSelection.FromSharedDB) ?
+ using (ISession remoteOrLocalSession = TBF.DB.CreateSession((SelectedProcedure.ResolvedSource == ProcedureSelection.FromSharedDB) ?
DBKind.RemoteConfig :
DBKind.Config))
{
StateMachine.LoadProcedure(remoteOrLocalSession,
- Bridge.SelectedProcedure.ResolvedName,
- (Bridge.SelectedProcedure.ResolvedSource == ProcedureSelection.FromSharedDB),
+ SelectedProcedure.ResolvedName,
+ (SelectedProcedure.ResolvedSource == ProcedureSelection.FromSharedDB),
testsInside);
StateMachine.LoadProcedureParams(StateMachine.Procedure);
@@ -426,10 +430,12 @@ namespace TBF.Rig.Sequences
else if (selection != Selection.RestoreInterruptedSession)
{
/// This is a regular session => initialize BatchRslts
- BatchRslts = CreateNewBatchResults(newBatchNr, StateMachine.Procedure, Bridge.SelectedProcedure.Variant,
- Bridge.SelectedProcedure.Order,
- Bridge.SelectedProcedure.Workflow,
- Bridge.SelectedProcedure.LaserMarking);
+ string vaco = (SelectedProcedure != null) ? SelectedProcedure.Variant : string.Empty;
+ string order = (SelectedProcedure != null && SelectedProcedure.OrderInfo != null) ? SelectedProcedure.OrderInfo.POName : string.Empty;
+ string wflow = (SelectedProcedure != null) ? SelectedProcedure.Workflow : string.Empty;
+ string laser = (SelectedProcedure != null) ? SelectedProcedure.LaserMarking : string.Empty;
+ ///
+ BatchRslts = CreateNewBatchResults(newBatchNr, StateMachine.Procedure, vaco, order, wflow, laser);
}
@@ -684,10 +690,12 @@ namespace TBF.Rig.Sequences
}
switch (selection)
{
- case Selection.Q1: selectedTestName = "Q1"; break;
- case Selection.Q2: selectedTestName = "Q2"; break;
- case Selection.Q3: selectedTestName = "Q3"; break;
- default: selectedTestName = Bridge.SelectedTestName; break;
+ case Selection.Q1: selectedTestName = "Q1"; break;
+ case Selection.Q2: selectedTestName = "Q2"; break;
+ case Selection.Q3: selectedTestName = "Q3"; break;
+ default:
+ selectedTestName = Program.MainWnd.BenchControlPanel.TestName;
+ break;
}
///
UiBridge.Bridge.OnError(this, string.Empty); /// Clear an error message (if any)
diff --git a/TBF/Rig/Sequences/ProcessData.cs b/TBF/Rig/Sequences/ProcessData.cs
index f91eb0db5..701ceec59 100644
--- a/TBF/Rig/Sequences/ProcessData.cs
+++ b/TBF/Rig/Sequences/ProcessData.cs
@@ -22,7 +22,6 @@ namespace TBF.Rig.Sequences
public static IErrorFlags ErrorFlagsComp;
public static IStatisticsMonitoring StatisticsMonitoringComp;
public static Output.DB.SensusOracle.Database OracleDB;
- public static Output.DB.SensusOracle.OrderDetails OrderDetails;
public static Output.DB.ProductionTracing.Tracing TracingDB;
///
@@ -33,11 +32,17 @@ namespace TBF.Rig.Sequences
public static int LineSize { get { return BenchInfo != null ? BenchInfo.WaterMetersCount / Math.Max(1, BenchInfo.LinesCount) : 10; } }
public static int CompoundWMsCount { get { return BenchInfo != null ? BenchInfo.CompoundMetersCount : 1; } }
- ///------------------------------------------------------------
+ ///
+ /// Procedure related state variables
+ ///
+ public static ProcedureInfo SelectedProcedure;
+ public static Common.IOrderInfo OrderInfo;
+
+ ///
/// Test related (instance) variables.
/// Created when test sequence is open.
/// They persist during all repetitions of the same test
- ///------------------------------------------------------------
+ ///
protected static Rig.BenchPath benchPath;
protected static Rig.OutputPath outPath;
public static Rig.OutputPath Devices { get { return outPath; } }
diff --git a/TBF/Rig/TestMethods/S640Communication/Constants.cs b/TBF/Rig/TestMethods/S640Communication/Constants.cs
index 569eea70b..5bb184c2b 100644
--- a/TBF/Rig/TestMethods/S640Communication/Constants.cs
+++ b/TBF/Rig/TestMethods/S640Communication/Constants.cs
@@ -29,6 +29,15 @@ namespace TBF.Rig.TestMethods.S640Communication
IndividualKey,
}
+ public enum SerialNumbers
+ {
+ None,
+ DisplayReadonly,
+ EnterManually,
+ FromProductionTracing,
+ Count
+ }
+
public enum Result
{
None,
diff --git a/TBF/Rig/TestMethods/S640Communication/I640Cfg.cs b/TBF/Rig/TestMethods/S640Communication/I640Cfg.cs
index 78050eb40..fa1968083 100644
--- a/TBF/Rig/TestMethods/S640Communication/I640Cfg.cs
+++ b/TBF/Rig/TestMethods/S640Communication/I640Cfg.cs
@@ -10,7 +10,8 @@ namespace TBF.Rig.TestMethods.S640Communication
int OptoDataTimeout { get; }
string FileExchangePath { get; }
int FileExchangeTimeout { get; }
- bool EnterSerialNumbers { get; }
+ SerialNumbers SerialNumbers { get; }
+ SerialNumbers AssignedNumbers { get; }
bool SkipBadMeters { get; }
}
}
diff --git a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
index b45fa43f3..b4a54cddf 100644
--- a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
+++ b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
@@ -5,13 +5,16 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
+using System.IO;
+using System.Linq;
using System.Windows.Forms;
using log4net;
+using NHibernate;
using Common;
using Config.Entities;
+using SharedDatabase.Entities;
using TBF.Resources;
using TBF.Rig.Sequences;
-using System.IO;
namespace TBF.Rig.TestMethods.S640Communication
{
@@ -32,7 +35,8 @@ namespace TBF.Rig.TestMethods.S640Communication
private static readonly ILog log = LogManager.GetLogger(typeof(S640CommForm));
protected static readonly ILog sirtDataLogger = LogManager.GetLogger("SirtData");
- public const int UIBoxesCount = 40;
+ public const int UIBoxesCount = 20;
+
public static Color DisabledColor = Color.DarkGray;
public static Color OptoOKColor = Color.Green;
public static Color OptoNokColor = Color.Red;
@@ -43,6 +47,7 @@ namespace TBF.Rig.TestMethods.S640Communication
enum Step
{
/// Start
+ ReadSNsFromTracing,
WatchOptoHeads,
SaveStartPro,
EnterSNsAndAwaitResponseToStartPro,
@@ -76,10 +81,13 @@ namespace TBF.Rig.TestMethods.S640Communication
///
bool[] enabledInConfiguration;
Label[] labels;
- PictureBox[] pictures;
- TextBox[] messages;
- TextBox[] serialNumbers;
CheckBoxImage[] checkBoxes;
+ PictureBox[] pictures;
+ TextBox[] eRegisterNumbers;
+ TextBox[] radioAddresses;
+ TextBox[] serialNumbers;
+ TextBox[] assignedSNs;
+ TextBox[] assignedRadioAddresses;
int[] ckbIndex; /// Initialized by ShuffleTextBoxes() ... to be used in the future in case of test benches with two lines
@@ -94,9 +102,11 @@ namespace TBF.Rig.TestMethods.S640Communication
int optoDataTimeout;
string fileExchangePath;
int fileExchangeTimeout;
- bool enterSerialNumbers;
+ SerialNumbers serialNumbersMode;
+ SerialNumbers assignedNumbersMode;
bool skipBadMeters;
ProcParams pPars;
+ IList waterMeters;
///
IList activities;
IList tests;
@@ -105,9 +115,19 @@ namespace TBF.Rig.TestMethods.S640Communication
///
Step step;
DateTime savedTimestamp;
+ bool isAnySNMissing;
+ bool areValuesDisplayed;
bool areNewSNsAndRadioAddressesAssigned;
+ ///
+ /// Production tracing support
+ ///
+ IList refRecords;
+ IList records;
+
+
+
System.Windows.Forms.Timer timer;
///
@@ -124,64 +144,70 @@ namespace TBF.Rig.TestMethods.S640Communication
InitializeComponent();
labels = new Label[UIBoxesCount]
- {
- wmLabel1, wmLabel2, wmLabel3, wmLabel4, wmLabel5, wmLabel6, wmLabel7, wmLabel8,
- wmLabel9, wmLabel10, wmLabel11, wmLabel12, wmLabel13, wmLabel14, wmLabel15, wmLabel16,
- wmLabel17, wmLabel18, wmLabel19, wmLabel20, wmLabel21, wmLabel22, wmLabel23, wmLabel24,
- wmLabel25, wmLabel26, wmLabel27, wmLabel28, wmLabel29, wmLabel30, wmLabel31, wmLabel32,
- wmLabel33, wmLabel34, wmLabel35, wmLabel36, wmLabel37, wmLabel38, wmLabel39, wmLabel40,
- };
- pictures = new PictureBox[UIBoxesCount]
- {
- pictureBox1, pictureBox2, pictureBox3, pictureBox4, pictureBox5,
- pictureBox6, pictureBox7, pictureBox8, pictureBox9, pictureBox10,
- pictureBox11, pictureBox12, pictureBox13, pictureBox14, pictureBox15,
- pictureBox16, pictureBox17, pictureBox18, pictureBox19, pictureBox20,
- pictureBox21, pictureBox22, pictureBox23, pictureBox24, pictureBox25,
- pictureBox26, pictureBox27, pictureBox28, pictureBox29, pictureBox30,
- pictureBox31, pictureBox32, pictureBox33, pictureBox34, pictureBox35,
- pictureBox36, pictureBox37, pictureBox38, pictureBox39, pictureBox40,
- };
- messages = new TextBox[UIBoxesCount]
- {
- fromOptoTextBox1, fromOptoTextBox2, fromOptoTextBox3, fromOptoTextBox4, fromOptoTextBox5,
- fromOptoTextBox6, fromOptoTextBox7, fromOptoTextBox8, fromOptoTextBox9, fromOptoTextBox10,
- fromOptoTextBox11, fromOptoTextBox12, fromOptoTextBox13, fromOptoTextBox14, fromOptoTextBox15,
- fromOptoTextBox16, fromOptoTextBox17, fromOptoTextBox18, fromOptoTextBox19, fromOptoTextBox20,
- fromOptoTextBox21, fromOptoTextBox22, fromOptoTextBox23, fromOptoTextBox24, fromOptoTextBox25,
- fromOptoTextBox26, fromOptoTextBox27, fromOptoTextBox28, fromOptoTextBox29, fromOptoTextBox30,
- fromOptoTextBox31, fromOptoTextBox32, fromOptoTextBox33, fromOptoTextBox34, fromOptoTextBox35,
- fromOptoTextBox36, fromOptoTextBox37, fromOptoTextBox38, fromOptoTextBox39, fromOptoTextBox40,
- };
- serialNumbers = new TextBox[UIBoxesCount]
- {
- textBox1, textBox2, textBox3, textBox4, textBox5, textBox6, textBox7, textBox8,
- textBox9, textBox10, textBox11, textBox12, textBox13, textBox14, textBox15, textBox16,
- textBox17, textBox18, textBox19, textBox20, textBox21, textBox22, textBox23, textBox24,
- textBox25, textBox26, textBox27, textBox28, textBox29, textBox30, textBox31, textBox32,
- textBox33, textBox34, textBox35, textBox36, textBox37, textBox38, textBox39, textBox40,
- };
+ {
+ wmLabel1, wmLabel2, wmLabel3, wmLabel4, wmLabel5, wmLabel6, wmLabel7,
+ wmLabel8, wmLabel9, wmLabel10, wmLabel11, wmLabel12, wmLabel13, wmLabel14,
+ wmLabel15, wmLabel16, wmLabel17, wmLabel18, wmLabel19, wmLabel20
+ };
checkBoxes = new CheckBoxImage[UIBoxesCount]
- {
- checkBoxImage1, checkBoxImage2, checkBoxImage3, checkBoxImage4, checkBoxImage5,
- checkBoxImage6, checkBoxImage7, checkBoxImage8, checkBoxImage9, checkBoxImage10,
- checkBoxImage11, checkBoxImage12, checkBoxImage13, checkBoxImage14, checkBoxImage15,
- checkBoxImage16, checkBoxImage17, checkBoxImage18, checkBoxImage19, checkBoxImage20,
- checkBoxImage21, checkBoxImage22, checkBoxImage23, checkBoxImage24, checkBoxImage25,
- checkBoxImage26, checkBoxImage27, checkBoxImage28, checkBoxImage29, checkBoxImage30,
- checkBoxImage31, checkBoxImage32, checkBoxImage33, checkBoxImage34, checkBoxImage35,
- checkBoxImage36, checkBoxImage37, checkBoxImage38, checkBoxImage39, checkBoxImage40,
- };
+ {
+ checkBoxImage1, checkBoxImage2, checkBoxImage3, checkBoxImage4, checkBoxImage5,
+ checkBoxImage6, checkBoxImage7, checkBoxImage8, checkBoxImage9, checkBoxImage10,
+ checkBoxImage11, checkBoxImage12, checkBoxImage13, checkBoxImage14, checkBoxImage15,
+ checkBoxImage16, checkBoxImage17, checkBoxImage18, checkBoxImage19, checkBoxImage20,
+ };
+ pictures = new PictureBox[UIBoxesCount]
+ {
+ pictureBox1, pictureBox2, pictureBox3, pictureBox4, pictureBox5, pictureBox6, pictureBox7,
+ pictureBox8, pictureBox9, pictureBox10, pictureBox11, pictureBox12, pictureBox13, pictureBox14,
+ pictureBox15, pictureBox16, pictureBox17, pictureBox18, pictureBox19, pictureBox20,
+ };
+ eRegisterNumbers = new TextBox[UIBoxesCount]
+ {
+ fromOptoTextBox1, fromOptoTextBox2, fromOptoTextBox3, fromOptoTextBox4, fromOptoTextBox5,
+ fromOptoTextBox6, fromOptoTextBox7, fromOptoTextBox8, fromOptoTextBox9, fromOptoTextBox10,
+ fromOptoTextBox11, fromOptoTextBox12, fromOptoTextBox13, fromOptoTextBox14, fromOptoTextBox15,
+ fromOptoTextBox16, fromOptoTextBox17, fromOptoTextBox18, fromOptoTextBox19, fromOptoTextBox20,
+ };
+ radioAddresses = new TextBox[UIBoxesCount]
+ {
+ radioAddressTB1, radioAddressTB2, radioAddressTB3, radioAddressTB4, radioAddressTB5,
+ radioAddressTB6, radioAddressTB7, radioAddressTB8, radioAddressTB9, radioAddressTB10,
+ radioAddressTB11, radioAddressTB12, radioAddressTB13, radioAddressTB14, radioAddressTB15,
+ radioAddressTB16, radioAddressTB17, radioAddressTB18, radioAddressTB19, radioAddressTB20,
+ };
+ serialNumbers = new TextBox[UIBoxesCount]
+ {
+ serialNrTB1, serialNrTB2, serialNrTB3, serialNrTB4, serialNrTB5, serialNrTB6, serialNrTB7,
+ serialNrTB8, serialNrTB9, serialNrTB10, serialNrTB11, serialNrTB12, serialNrTB13, serialNrTB14,
+ serialNrTB15, serialNrTB16, serialNrTB17, serialNrTB18, serialNrTB19, serialNrTB20,
+ };
+ assignedSNs = new TextBox[UIBoxesCount]
+ {
+ assignedSnTB1, assignedSnTB2, assignedSnTB3, assignedSnTB4, assignedSnTB5,
+ assignedSnTB6, assignedSnTB7, assignedSnTB8, assignedSnTB9, assignedSnTB10,
+ assignedSnTB11, assignedSnTB12, assignedSnTB13, assignedSnTB14, assignedSnTB15,
+ assignedSnTB16, assignedSnTB17, assignedSnTB18, assignedSnTB19, assignedSnTB20,
+ };
+ assignedRadioAddresses = new TextBox[UIBoxesCount]
+ {
+ assignedRadAddrTB1, assignedRadAddrTB2, assignedRadAddrTB3, assignedRadAddrTB4, assignedRadAddrTB5,
+ assignedRadAddrTB6, assignedRadAddrTB7, assignedRadAddrTB8, assignedRadAddrTB9, assignedRadAddrTB10,
+ assignedRadAddrTB11, assignedRadAddrTB12, assignedRadAddrTB13, assignedRadAddrTB14, assignedRadAddrTB15,
+ assignedRadAddrTB16, assignedRadAddrTB17, assignedRadAddrTB18, assignedRadAddrTB19, assignedRadAddrTB20,
+ };
ckbIndex = new int[UIBoxesCount]; /// Initialized by ShuffleTextBoxes() ... to be used in the future in case of test benches with two lines
+ refRecords = new List();
+ records = new List();
}
///
/// Constructor for one S640Communication test
///
/// Number of text boxes for serial numbers
- public S640CommForm(S640Activity activity, I640Cfg cfg, Generic.IProcedureParams procParams, Test test)
- : this(new List { activity }, cfg, procParams, new List { test })
+ public S640CommForm(S640Activity activity, I640Cfg cfg, Generic.IProcedureParams procParams, Test test, IList waterMeters)
+ : this(new List { activity }, cfg, procParams, new List { test }, waterMeters)
{
}
@@ -189,7 +215,7 @@ namespace TBF.Rig.TestMethods.S640Communication
/// Constructor for multiple S640Communication tests
///
/// Number of text boxes for serial numbers
- public S640CommForm(IList activities, I640Cfg cfg, Generic.IProcedureParams procParams, IList tests)
+ public S640CommForm(IList activities, I640Cfg cfg, Generic.IProcedureParams procParams, IList tests, IList waterMeters)
: this()
{
this.activities = activities;
@@ -197,10 +223,12 @@ namespace TBF.Rig.TestMethods.S640Communication
optoDataTimeout = cfg.OptoDataTimeout;
fileExchangePath = string.IsNullOrEmpty(cfg.FileExchangePath) ? string.Empty : cfg.FileExchangePath;
fileExchangeTimeout = cfg.FileExchangeTimeout;
- enterSerialNumbers = cfg.EnterSerialNumbers;
+ serialNumbersMode = cfg.SerialNumbers;
+ assignedNumbersMode = cfg.AssignedNumbers;
skipBadMeters = cfg.SkipBadMeters;
this.tests = tests;
this.pPars = procParams as ProcParams;
+ this.waterMeters = waterMeters;
if (activities.Count != tests.Count)
{
@@ -233,6 +261,8 @@ namespace TBF.Rig.TestMethods.S640Communication
enabledInConfiguration[i] = (optoHeads[i] != null) && ((Program.LocalSettings.OptoHeadsEnabled & (1L << i)) != 0L);
}
+ isAnySNMissing = false;
+ areValuesDisplayed = false;
areNewSNsAndRadioAddressesAssigned = false;
formCompleted = false;
StartForceCloseHandler();
@@ -260,10 +290,13 @@ namespace TBF.Rig.TestMethods.S640Communication
for (int i = 0; i < lineSize; i++)
{
labels[dest] = labels[l * lineSize + l * gap + i];
- pictures[dest] = pictures[l * lineSize + l * gap + i];
- messages[dest] = messages[l * lineSize + l * gap + i];
- serialNumbers[dest] = serialNumbers[l * lineSize + l * gap + i];
checkBoxes[dest] = checkBoxes[l * lineSize + l * gap + i];
+ pictures[dest] = pictures[l * lineSize + l * gap + i];
+ eRegisterNumbers[dest] = eRegisterNumbers[l * lineSize + l * gap + i];
+ radioAddresses[dest] = radioAddresses[l * lineSize + l * gap + i];
+ serialNumbers[dest] = serialNumbers[l * lineSize + l * gap + i];
+ assignedSNs[dest] = assignedSNs[l * lineSize + l * gap + i];
+ assignedRadioAddresses[dest] = assignedRadioAddresses[l * lineSize + l * gap + i];
ckbIndex[l * lineSize + l * gap + i] = dest;
dest++;
}
@@ -274,7 +307,8 @@ namespace TBF.Rig.TestMethods.S640Communication
for (int i = 0; i < textBoxesCount; i++)
{
- labels[i].Visible = pictures[i].Visible = messages[i].Visible = checkBoxes[i].Visible = true;
+ labels[i].Visible = checkBoxes[i].Visible = pictures[i].Visible
+ = eRegisterNumbers[i].Visible = radioAddresses[i].Visible = true;
if (optoHeads[i] != null) labels[i].Text = (i + 1).ToString();
}
@@ -316,35 +350,44 @@ namespace TBF.Rig.TestMethods.S640Communication
checkBoxes[i].Checked = false;
checkBoxes[i].Enabled = false;
pictures[i].BackColor = DisabledColor;
- messages[i].Text = Strings.Opto_head_is_disabled_in_configuration;
+ eRegisterNumbers[i].Visible = false;
+ radioAddresses[i].Visible = false;
+ serialNumbers[i].Visible = false;
}
- else if ((i >= ProcessData.BatchRslts.Batch.WaterMeters.Count) ||
- ProcessData.BatchRslts.Batch.WaterMeters[i] == null ||
- ProcessData.BatchRslts.Batch.WaterMeters[i].Disabled)
+ else if ((i >= waterMeters.Count) || waterMeters[i] == null || waterMeters[i].Disabled)
{
/// Opto head was disabled by an operator
checkBoxes[i].Checked = false;
checkBoxes[i].Enabled = false;
pictures[i].BackColor = DisabledColor;
- messages[i].Text = Strings.Head_was_disabled_by_the_user;
+ eRegisterNumbers[i].Text = "xxx";
+ radioAddresses[i].Text = "xxx";
}
else
{
/// Opto head is enabled
checkBoxes[i].Checked = true;
checkBoxes[i].Enabled = true;
- messages[i].Text = "---";
+ eRegisterNumbers[i].Text = "---";
+ radioAddresses[i].Text = "---";
}
/// Reset opto-data indication
pictures[i].BackColor = OptoNokColor;
- messages[i].Enabled = true;
+ eRegisterNumbers[i].Enabled = false;
+ eRegisterNumbers[i].Enabled = false;
- if (enterSerialNumbers)
+ serialNumbers[i].Visible = enabledInConfiguration[i] && (serialNumbersMode != SerialNumbers.None);
+ serialNumbers[i].Enabled = (serialNumbersMode == SerialNumbers.EnterManually);
+
+ if (activities.Contains(S640Activity.End))
{
- serialNumbers[i].Visible = enabledInConfiguration[i];
- serialNumbers[i].Enabled = (activities[currentActivityIx] == S640Activity.End);
+ assignedSNs[i].Visible = enabledInConfiguration[i] && (serialNumbersMode != SerialNumbers.None);
+ assignedSNs[i].Enabled = (serialNumbersMode == SerialNumbers.EnterManually);
+
+ assignedRadioAddresses[i].Visible = enabledInConfiguration[i] && (serialNumbersMode != SerialNumbers.None);
+ assignedRadioAddresses[i].Enabled = (serialNumbersMode == SerialNumbers.EnterManually);
}
}
@@ -376,13 +419,20 @@ namespace TBF.Rig.TestMethods.S640Communication
startTime = DateTime.Now;
activityLabel.Text = activities[acIx].ToString();
currentActivityIx = acIx;
- step = (activities[acIx] == S640Activity.Start) ? Step.WatchOptoHeads : enterSerialNumbers ? Step.EnterSNs : Step.ConfirmSNsAndRadioAddresses;
+ if (activities[acIx] == S640Activity.Start)
+ {
+ step = serialNumbersMode == SerialNumbers.FromProductionTracing ? Step.ReadSNsFromTracing : Step.WatchOptoHeads;
+ }
+ else
+ {
+ step = serialNumbersMode == SerialNumbers.EnterManually ? Step.EnterSNs : Step.ConfirmSNsAndRadioAddresses;
+ }
closeButton.Visible = false;
retryButton.Visible = false;
responseTextBox.Text = string.Empty;
- if (step == Step.WatchOptoHeads)
+ if (step == Step.ReadSNsFromTracing || step == Step.WatchOptoHeads)
{
/// Start watching optical heads --> reset OK loop counters
if (commOkLoopsCount == null || commOkLoopsCount.Length != textBoxesCount)
@@ -412,53 +462,80 @@ namespace TBF.Rig.TestMethods.S640Communication
void timer_Tick(object sender, EventArgs args)
{
///--------------------------------------------------------------------------
- if (step == Step.WatchOptoHeads)
+ if (step == Step.ReadSNsFromTracing)
{
- long optoHeadsConfig = Program.LocalSettings.OptoHeadsEnabled;
+ if (ProcessData.TracingDB != null && ProcessData.OrderInfo is OrderInfo)
+ {
+ ISession session = ProcessData.TracingDB.SessionFactory.OpenSession();
+ refRecords = ProcessData.TracingDB.ReadRefRecords(session, ProcessData.OrderInfo as OrderInfo);
+ records = ProcessData.TracingDB.ReadRecords(session, ProcessData.OrderInfo as OrderInfo);
+ session.Close();
+ }
+
+ step = Step.WatchOptoHeads;
+ }
+ ///--------------------------------------------------------------------------
+ else if (step == Step.WatchOptoHeads)
+ {
+ activityLabel.Text = "Heads are sensing opto-data";
bool allOK = true;
for (int i = 0; i < textBoxesCount; i++)
{
- if ((optoHeadsConfig & (1L << i)) == 0 || optoHeads[i] == null)
+ if (enabledInConfiguration[i])
{
- /// Opto head is disabled in configuration
- checkBoxes[i].Checked = false;
- checkBoxes[i].Enabled = false;
- pictures[i].BackColor = DisabledColor;
- messages[i].Text = Strings.Opto_head_is_disabled_in_configuration;
- }
- else if (!checkBoxes[i].Checked)
- {
- /// Opto head was disabled by the user
- pictures[i].BackColor = DisabledColor;
- }
- else
- {
- /// Opto head is enabled
- checkBoxes[i].Checked = true;
- checkBoxes[i].Enabled = true;
-
- if (optoHeads[i].PcbNumber == 0)
+ if (!checkBoxes[i].Checked)
{
- /// Communication is NOK right now
- pictures[i].BackColor = OptoNokColor;
- messages[i].Text = "---";
- commOkLoopsCount[i] = 0;
- allOK = false;
+ /// Disabled by the user
+ pictures[i].BackColor = DisabledColor;
+ eRegisterNumbers[i].Text = "xxx";
+ radioAddresses[i].Text = "xxx";
+ serialNumbers[i].Text = string.Empty;
}
else
{
- /// Communication is OK right now
- messages[i].Text = string.Format("pcb = {0} radio = {1}", optoHeads[i].PcbNumber, optoHeads[i].RadioAddress);
- pictures[i].BackColor = OptoOKColor;
+ /// Opto head is enabled
- /// increment commOkLoopsCount[i] and check its value, considered OK just after 5 repeats
- commOkLoopsCount[i] = commOkLoopsCount[i] + 1;
- if (commOkLoopsCount[i] < 5) allOK = false;
+ if (optoHeads[i].PcbNumber == 0)
+ {
+ /// Communication is NOK right now
+ pictures[i].BackColor = OptoNokColor;
+ eRegisterNumbers[i].Text = "---";
+ radioAddresses[i].Text = "---";
+ serialNumbers[i].Text = string.Empty;
+ commOkLoopsCount[i] = 0;
+ allOK = false;
+ }
+ else
+ {
+ /// Communication is OK right now
+ string pcbNumber = optoHeads[i].PcbNumber.ToString();
+ eRegisterNumbers[i].Text = pcbNumber;
+ radioAddresses[i].Text = optoHeads[i].RadioAddress.ToString();
+
+ Record rec;
+ ReferenceRecord refRec;
+ if ((rec = records.FirstOrDefault(x => x.Code == pcbNumber)) != null &&
+ (refRec = refRecords.FirstOrDefault(x => x.Id == rec.ReferenceRecord.Id)) != null)
+ {
+ serialNumbers[i].Text = refRec.Code;
+ }
+ else
+ {
+ serialNumbers[i].Text = string.Empty;
+ }
+
+ pictures[i].BackColor = OptoOKColor;
+
+ /// increment commOkLoopsCount[i] and check its value, considered OK just after 5 repeats
+ commOkLoopsCount[i] = commOkLoopsCount[i] + 1;
+ if (commOkLoopsCount[i] < 5) allOK = false;
+ }
}
}
}
+ isAnySNMissing = false;
if (allOK)
{
log.WarnFormat("allOk");
@@ -466,21 +543,21 @@ namespace TBF.Rig.TestMethods.S640Communication
/// Update water meter properties
for (int i = 0; i < textBoxesCount; i++)
{
- if (i < ProcessData.BatchRslts.Batch.WaterMeters.Count &&
- ProcessData.BatchRslts.Batch.WaterMeters[i] != null &&
- !ProcessData.BatchRslts.Batch.WaterMeters[i].Disabled)
+ if (i < waterMeters.Count && waterMeters[i] != null && !waterMeters[i].Disabled)
{
- if ((optoHeadsConfig & (1L << i)) != 0 && checkBoxes[i].Checked && optoHeads[i] != null)
+ if (enabledInConfiguration[i] && checkBoxes[i].Checked)
{
/// Save PCB Number of the water meter
- ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNrAux = optoHeads[i].PcbNumber.ToString(); /// PCB number (640)
- ProcessData.BatchRslts.Batch.WaterMeters[i].OriRadioAddress = /// Original radio address (640)
- ProcessData.BatchRslts.Batch.WaterMeters[i].RadioAddress = optoHeads[i].RadioAddress.ToString(); /// New radio address (640)
+ waterMeters[i].SerialNrAux = optoHeads[i].PcbNumber.ToString(); /// PCB number (640)
+ waterMeters[i].OriRadioAddress = optoHeads[i].RadioAddress.ToString(); /// New radio address (640)
+ waterMeters[i].RadioAddress = optoHeads[i].RadioAddress.ToString(); /// New radio address (640)
+
+ if (string.IsNullOrEmpty(serialNumbers[i].Text)) isAnySNMissing = true;
}
else
{
/// Disable the water meter
- ProcessData.BatchRslts.Batch.WaterMeters[i].Disabled = true;
+ waterMeters[i].Disabled = true;
}
}
@@ -491,20 +568,21 @@ namespace TBF.Rig.TestMethods.S640Communication
}
else if (optoDataTimeout != 0 && DateTime.Now - startTime > new TimeSpan(0, 0, optoDataTimeout))
{
+ /// Opto-data timeout occured
+
activityLabel.Text = String.Format("{0}: {1} {2}", Strings.Start, Strings.Optical_heads, Strings.Timeout);
log.Error("Start: Optical heads timeout");
step = Step.ConfirmError;
}
else if (optoDataTimeout != 0)
{
+ /// Count down
progressBar1.Value = (int)Math.Round((DateTime.Now - startTime).TotalSeconds);
}
}
///--------------------------------------------------------------------------
else if (step == Step.SaveStartPro)
{
- activityLabel.Text = string.Format("Start: SIRT Communication");
-
int count = 0;
for (int i = 0; i < textBoxesCount; i++)
{
@@ -527,14 +605,14 @@ namespace TBF.Rig.TestMethods.S640Communication
progressBar1.Maximum = Math.Max(fileExchangeTimeout, 1);
progressBar1.Value = 0;
- for (int i = 0; i < textBoxesCount; i++) { messages[i].Enabled = false; }
+ for (int i = 0; i < textBoxesCount; i++) { eRegisterNumbers[i].Enabled = false; }
bool focused = false;
- if (enterSerialNumbers)
+ if (serialNumbersMode == SerialNumbers.EnterManually || isAnySNMissing)
{
for (int i = 0; i < textBoxesCount; i++)
{
- if (serialNumbers[i].Visible)
+ if (serialNumbers[i].Visible && string.IsNullOrEmpty(serialNumbers[i].Text))
{
serialNumbers[i].Enabled = true;
if (!focused)
@@ -552,28 +630,46 @@ namespace TBF.Rig.TestMethods.S640Communication
}
else
{
+ /// Update water meter properties
+ UpdateAndDisableSerialNumbers();
step = Step.AwaitResponseToStartPro;
}
}
///--------------------------------------------------------------------------
else if (step == Step.EnterSNsAndAwaitResponseToStartPro)
{
+ activityLabel.Text = "Enter or scan housing S/N-s";
+
/// Don't do anything, move to the next step in closeButton_Click(...)
}
///--------------------------------------------------------------------------
else if (step == Step.AwaitResponseToStartPro)
{
- if (!File.Exists(Path.Combine(fileExchangePath, StartFileName)))
+ activityLabel.Text = "SIRT communication in progress";
+
+ if (debugLevel == DebugMode.Simulate)
{
- /// File disappeared in time
+ /// Simulation: After 'Next' button click a similar action as when Start.pro file disappears
+
+ closeButton.Text = "Next";
+ closeButton.Visible = true;
+ retryButton.Visible = false;
+ }
+ else if (!File.Exists(Path.Combine(fileExchangePath, StartFileName)))
+ {
+ /// Normal flow of actions ... Start.pro file disappeared in time
+
+ /// Updatetest results
UpdateFirstTestResult(tests);
UiBridge.Bridge.OnTestProgress(null, new TBF.UiBridge.TestProgressEventArgs(tests[currentActivityIx], Progress.Completed));
+
step = Step.Idle;
NormalClose();
}
else if (File.Exists(Path.Combine(fileExchangePath, ErrorFileName)))
{
/// Error file detected
+
string destination = Path.Combine(Constants.SirtLogDir,
string.Format("{0:yyMMdd-HHmmss}-b{1}-{2}", DateTime.Now, ProcessData.BatchRslts.Batch.BatchNr, ErrorFileName));
File.Move(Path.Combine(fileExchangePath, ErrorFileName), destination);
@@ -584,16 +680,22 @@ namespace TBF.Rig.TestMethods.S640Communication
}
else if (fileExchangeTimeout != 0 && DateTime.Now - savedTimestamp > new TimeSpan(0, 0, fileExchangeTimeout))
{
+ /// Timeout
+
activityLabel.Text = String.Format("{0}: SIRT {1}", Strings.Start, Strings.Timeout);
log.Error("Start: SIRT timeout");
step = Step.ConfirmError;
}
else if (fileExchangeTimeout != 0)
{
+ /// Nothing special, timeout is counting down
+
progressBar1.Value = (int)Math.Round((DateTime.Now - savedTimestamp).TotalSeconds);
}
else
{
+ /// Nothing special, there is no timeout, Close adn Retry buttons are visible
+
progressBar1.Visible = false;
closeButton.Text = Strings.CloseBtnText;
closeButton.Visible = true;
@@ -603,14 +705,28 @@ namespace TBF.Rig.TestMethods.S640Communication
///--------------------------------------------------------------------------
else if (step == Step.EnterSNs)
{
- /// Don't do anything, move to the next step in closeButton_Click(...)
+ /// Don't do anything just display values, move to the next step in closeButton_Click(...)
+
+ if (!areValuesDisplayed)
+ {
+ DisplayValues();
+ areValuesDisplayed = true;
+ }
}
///--------------------------------------------------------------------------
else if (step == Step.ConfirmSNsAndRadioAddresses)
{
+ activityLabel.Text = "Confirm new S/N-s and radio addresses";
+
+ if (!areValuesDisplayed)
+ {
+ DisplayValues();
+ areValuesDisplayed = true;
+ }
+
if (!areNewSNsAndRadioAddressesAssigned)
{
- AssignNewSNsAndRadioAddresses(optoHeads);
+ AssignNewSNsAndRadioAddresses(waterMeters, optoHeads);
closeButton.Visible = true;
closeButton.Text = Strings.Continue;
}
@@ -618,7 +734,7 @@ namespace TBF.Rig.TestMethods.S640Communication
///--------------------------------------------------------------------------
else if (step == Step.SaveEndePro)
{
- activityLabel.Text = string.Format("End: SIRT Communication");
+ activityLabel.Text = "SIRT communication in progress";
log.DebugFormat("Saving '{0}' file", EndFileName);
if (debugLevel == DebugMode.Normal)
@@ -636,9 +752,10 @@ namespace TBF.Rig.TestMethods.S640Communication
progressBar1.Maximum = Math.Max(fileExchangeTimeout, 1);
progressBar1.Value = 0;
- if (ProcessData.OracleDB != null && ProcessData.OrderDetails != null)
+ if (ProcessData.OracleDB != null && ProcessData.OrderInfo is TBF.Rig.Output.DB.SensusOracle.OrderDetails)
{
- int updatedCount = ProcessData.OracleDB.UpdateOrderDetails(ProcessData.OrderDetails);
+ int updatedCount = ProcessData.OracleDB
+ .UpdateOrderDetails(ProcessData.OrderInfo as TBF.Rig.Output.DB.SensusOracle.OrderDetails);
}
step = Step.AwaitResponseToEndePro;
@@ -646,9 +763,19 @@ namespace TBF.Rig.TestMethods.S640Communication
///--------------------------------------------------------------------------
else if (step == Step.AwaitResponseToEndePro)
{
- if (!File.Exists(Path.Combine(fileExchangePath, EndFileName)))
+ if (debugLevel == DebugMode.Simulate)
{
- /// File disappeared in time
+ /// Simulation: After 'Next' button click a similar action as when Ende.pro file disappears
+
+ closeButton.Text = "Next";
+ closeButton.Visible = true;
+ retryButton.Visible = false;
+ }
+ else if (!File.Exists(Path.Combine(fileExchangePath, EndFileName)))
+ {
+ /// Normal flow of actions ... Ende.pro file disappeared in time
+
+ /// Update test results
UpdateFirstTestResult(tests);
UiBridge.Bridge.OnTestProgress(null, new TBF.UiBridge.TestProgressEventArgs(tests[currentActivityIx], Progress.Completed));
step = Step.Idle;
@@ -704,30 +831,110 @@ namespace TBF.Rig.TestMethods.S640Communication
}
}
-
- bool AssignNewSNsAndRadioAddresses(RegisterReaders.S640Stream.S640Stream[] optoHeads)
+ private void closeButton_Click(object sender, EventArgs e)
{
- TBF.Rig.Output.DB.SensusOracle.OrderDetails ord = ProcessData.OrderDetails;
+ if (step == Step.EnterSNsAndAwaitResponseToStartPro)
+ {
+ UpdateAndDisableSerialNumbers();
+ step = Step.AwaitResponseToStartPro;
+ closeButton.Visible = false;
+ }
+ else if (debugLevel == DebugMode.Simulate && step == Step.AwaitResponseToStartPro)
+ {
+ UpdateFirstTestResult(tests);
+ UiBridge.Bridge.OnTestProgress(null, new TBF.UiBridge.TestProgressEventArgs(tests[currentActivityIx], Progress.Completed));
+ NormalClose();
+ }
+ else if (step == Step.EnterSNs)
+ {
+ UpdateAndDisableSerialNumbers();
+ step = Step.ConfirmSNsAndRadioAddresses;
+ closeButton.Visible = false;
+ }
+ else if (step == Step.ConfirmSNsAndRadioAddresses)
+ {
+ step = Step.SaveEndePro;
+ closeButton.Visible = false;
+ }
+ else if (debugLevel == DebugMode.Simulate && step == Step.AwaitResponseToEndePro)
+ {
+ UpdateFirstTestResult(tests);
+ UiBridge.Bridge.OnTestProgress(null, new TBF.UiBridge.TestProgressEventArgs(tests[currentActivityIx], Progress.Completed));
+ NormalClose();
+ }
+ else
+ {
+ log.Error("User is closing this form, communication failed");
+ UpdateFirstTestResult(tests, true);
+ UiBridge.Bridge.OnTestProgress(null, new TBF.UiBridge.TestProgressEventArgs(tests[currentActivityIx], Progress.Aborted));
+ NormalClose();
+ }
+ }
+
+
+ ///
+ /// Updates SerialNr of all enabled water meters from respective visible TextBoxes.
+ ///
+ void UpdateAndDisableSerialNumbers()
+ {
+ /// Update water meter properties
+ for (int i = 0; i < textBoxesCount; i++)
+ {
+ if (serialNumbers[i].Visible)
+ {
+ if (i < waterMeters.Count && waterMeters[i] != null && !waterMeters[i].Disabled &&
+ enabledInConfiguration[i] && checkBoxes[i].Checked)
+ {
+ /// Save brass water meter body serial number
+ waterMeters[i].SerialNr = serialNumbers[i].Text;
+ }
+
+ serialNumbers[i].Enabled = false;
+ }
+ }
+ }
+
+
+ void DisplayValues()
+ {
+ for (int i = 0; i < textBoxesCount; i++)
+ {
+ if (i < waterMeters.Count && waterMeters[i] != null && !waterMeters[i].Disabled &&
+ enabledInConfiguration[i] && checkBoxes[i].Checked)
+ {
+ /// Save PCB Number of the water meter
+ eRegisterNumbers[i].Text = waterMeters[i].SerialNrAux; /// PCB number (640)
+ radioAddresses[i].Text = waterMeters[i].OriRadioAddress; /// New radio address (640)
+ serialNumbers[i].Text = waterMeters[i].SerialNr; /// Serial unmber (housing number
+ }
+ }
+ }
+
+
+ bool AssignNewSNsAndRadioAddresses(IList waterMeters, RegisterReaders.S640Stream.S640Stream[] optoHeads)
+ {
+ var order = ProcessData.OrderInfo;
+ var oraOrder = order as TBF.Rig.Output.DB.SensusOracle.OrderDetails;
///
- if (ProcessData.OracleDB == null || ord == null || !ProcessData.OracleDB.ReadOrderDetails(ref ord))
+ if (oraOrder != null && (ProcessData.OracleDB == null || !ProcessData.OracleDB.ReadOrderDetails(ref oraOrder)))
{
return false;
}
- if (ord.CurrentSerialNr < ord.FirstSerialNr)
+ if (order.CurrentSN < order.SNFirst)
{
- ord.CurrentSerialNr = ord.FirstSerialNr - 1;
+ order.CurrentSN = order.SNFirst - 1;
}
for (int i = 0; i < optoHeads.Length; i++)
{
- int currentSerialNr = (ord.CurrentSerialNr < ord.FirstSerialNr)
- ? ord.FirstSerialNr
- : ord.CurrentSerialNr + 1;
+ int currentSerialNr = (order.CurrentSN < order.SNFirst)
+ ? order.SNFirst
+ : order.CurrentSN + 1;
- int currentRadioAddress = (ord.CurrentRadioAddress < ord.FirstRadioAddress)
- ? ord.FirstRadioAddress
- : ord.CurrentSerialNr + 1;
+ int currentRadioAddress = (order.CurrentRA < order.RAFirst)
+ ? order.RAFirst
+ : order.CurrentRA + 1;
Results.Entities.WaterMeter wm = ProcessData.BatchRslts.Batch.WaterMeters[i];
if (optoHeads[i] != null && optoHeads[i].PcbNumber != 0 && wm != null && !wm.Disabled)
@@ -735,9 +942,16 @@ namespace TBF.Rig.TestMethods.S640Communication
if (!wm.PassedFromTests())
{
/// Red background
- messages[i].BackColor = Color.Pink;
+ eRegisterNumbers[i].BackColor = Color.Pink;
+ wm.AssignedSerialNr = -1;
+ wm.Prefix = order.SNPrefix;
+ wm.Suffix = order.SNSuffix;
+ wm.CompleteSerialNr = string.Empty;
+
+ assignedSNs[i].Text = wm.CompleteSerialNr;
+ assignedRadioAddresses[i].Text = wm.RadioAddress;
}
- else if (ord.CurrentPcsCount >= ord.TargetPcsCount)
+ else if (order.CurrentPcsCount >= order.PiecesCount)
{
/// Disable the water meter to prevent sealing
wm.Disabled = true;
@@ -745,19 +959,24 @@ namespace TBF.Rig.TestMethods.S640Communication
else
{
/// Assign numbers
- wm.RadioAddress = string.Format("{0}{1}{2}", ord.RadioAddressPrefix, currentRadioAddress.ToString("D9"), ord.RadioAddressSuffix);
-#if ORACLE_DB
wm.AssignedSerialNr = currentSerialNr;
- string assingedSNStr = currentSerialNr.ToString(string.Format("D{0}", ord.SNLength));
- wm.Prefix = ord.Prefix;
- wm.Suffix = ord.Suffix;
- wm.CompleteSerialNr = string.Format("{0}{1}{2}", wm.Prefix, assingedSNStr, wm.Suffix);
+ wm.Prefix = order.SNPrefix;
+ wm.Suffix = order.SNSuffix;
+ wm.CompleteSerialNr = string.Format("{0}{1}{2}",
+ order.SNPrefix,
+ currentSerialNr.ToString(string.Format("D{0}", order.SNDigitsCount)),
+ order.SNSuffix);
+ assignedSNs[i].Text = wm.CompleteSerialNr;
- messages[i].Text = string.Format("s/n = {0} radio = {1}", assingedSNStr, wm.RadioAddress);
-#endif
- ord.CurrentSerialNr = currentSerialNr;
- ord.CurrentRadioAddress = currentRadioAddress;
- ord.CurrentPcsCount++;
+ wm.RadioAddress = string.Format("{0}{1}{2}",
+ order.RAPrefix,
+ currentRadioAddress.ToString("D9"),
+ order.RASuffix);
+ assignedRadioAddresses[i].Text = wm.RadioAddress;
+
+ order.CurrentSN = currentSerialNr;
+ order.CurrentRA = currentRadioAddress;
+ order.CurrentPcsCount++;
}
}
}
@@ -770,15 +989,15 @@ namespace TBF.Rig.TestMethods.S640Communication
void SaveProFile(string filename, S640Activity activity, RegisterReaders.S640Stream.S640Stream[] optoHeads)
{
/// Variant: 1.from OrderDetails, 2.from Procedure.WatermetersStr, 3.empty
- string variant = (ProcessData.OrderDetails != null && !string.IsNullOrEmpty(ProcessData.OrderDetails.VariantenCode))
- ? ProcessData.OrderDetails.VariantenCode /// 1
+ string variant = (ProcessData.OrderInfo != null && !string.IsNullOrEmpty(ProcessData.OrderInfo.VariantCode))
+ ? ProcessData.OrderInfo.VariantCode /// 1
: !string.IsNullOrEmpty(ProcessData.BatchRslts.Batch.WatermetersStr)
? ProcessData.BatchRslts.Batch.WatermetersStr /// 2
: string.Empty; /// 3
/// Module parameter
- string moduleParam = (pPars.ModuleParameter.ToLower().Contains("vt_auftrag_pd") && ProcessData.OrderDetails != null)
- ? ProcessData.OrderDetails.ModuleParameter
+ string moduleParam = (pPars.ModuleParameter.ToLower().Contains("vt_auftrag_pd") && ProcessData.OrderInfo != null)
+ ? ProcessData.OrderInfo.ModuleParam
: pPars.ModuleParameter;
/// Purchase order and water meters count
@@ -786,11 +1005,9 @@ namespace TBF.Rig.TestMethods.S640Communication
string purchaseOrder = null;
for (int i = 0; i < optoHeads.Length; i++)
{
- if (optoHeads[i] != null &&
- optoHeads[i].PcbNumber != 0 &&
- ProcessData.BatchRslts.Batch.WaterMeters[i] != null &&
- !ProcessData.BatchRslts.Batch.WaterMeters[i].Disabled &&
- (activity == S640Activity.Start || ProcessData.BatchRslts.Batch.WaterMeters[i].PassedFromTests()))
+ if (optoHeads[i] != null && optoHeads[i].PcbNumber != 0 &&
+ waterMeters[i] != null && !waterMeters[i].Disabled &&
+ (activity == S640Activity.Start || waterMeters[i].PassedFromTests()))
{
count++;
@@ -800,9 +1017,9 @@ namespace TBF.Rig.TestMethods.S640Communication
}
}
}
- if (ProcessData.OrderDetails != null)
+ if (ProcessData.OrderInfo != null)
{
- purchaseOrder = ProcessData.OrderDetails.AuftragsNummer;
+ purchaseOrder = ProcessData.OrderInfo.POName;
}
using (StreamWriter file = new StreamWriter(filename))
@@ -948,51 +1165,6 @@ namespace TBF.Rig.TestMethods.S640Communication
}
}
- private void closeButton_Click(object sender, EventArgs e)
- {
- if (step == Step.EnterSNsAndAwaitResponseToStartPro)
- {
- UpdateSerialNumbers();
- step = Step.AwaitResponseToEndePro;
- closeButton.Visible = false;
- }
- else if (step == Step.EnterSNs)
- {
- UpdateSerialNumbers();
- step = Step.ConfirmSNsAndRadioAddresses;
- closeButton.Visible = false;
- }
- else if (step == Step.ConfirmSNsAndRadioAddresses)
- {
- step = Step.SaveEndePro;
- closeButton.Visible = false;
- }
- else
- {
- log.Error("User is closing this form, communication failed");
- UpdateFirstTestResult(tests, true);
- UiBridge.Bridge.OnTestProgress(null, new TBF.UiBridge.TestProgressEventArgs(tests[currentActivityIx], Progress.Aborted));
- NormalClose();
- }
- }
-
- private void UpdateSerialNumbers()
- {
- /// Update water meter properties
- for (int i = 0; i < textBoxesCount; i++)
- {
- if (i < ProcessData.BatchRslts.Batch.WaterMeters.Count &&
- ProcessData.BatchRslts.Batch.WaterMeters[i] != null &&
- !ProcessData.BatchRslts.Batch.WaterMeters[i].Disabled &&
- serialNumbers[i].Visible)
- {
- /// Save brass water meter body serial number
- ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNr = serialNumbers[i].Text;
- serialNumbers[i].Enabled = false;
- }
- }
- }
-
private void NormalClose()
{
if (Program.LocalSettings.S640CommFormLeft != Location.X ||
@@ -1046,26 +1218,26 @@ namespace TBF.Rig.TestMethods.S640Communication
}
}
- private void textBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox1); }
- private void textBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox2); }
- private void textBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox3); }
- private void textBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox4); }
- private void textBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox5); }
- private void textBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox6); }
- private void textBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox7); }
- private void textBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox8); }
- private void textBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox9); }
- private void textBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox10); }
- private void textBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox11); }
- private void textBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox12); }
- private void textBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox13); }
- private void textBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox14); }
- private void textBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox15); }
- private void textBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox16); }
- private void textBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox17); }
- private void textBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox18); }
- private void textBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox19); }
- private void textBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox20); }
+ private void textBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB1); }
+ private void textBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB2); }
+ private void textBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB3); }
+ private void textBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB4); }
+ private void textBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB5); }
+ private void textBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB6); }
+ private void textBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB7); }
+ private void textBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB8); }
+ private void textBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB9); }
+ private void textBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB10); }
+ private void textBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB11); }
+ private void textBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB12); }
+ private void textBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB13); }
+ private void textBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB14); }
+ private void textBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB15); }
+ private void textBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB16); }
+ private void textBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB17); }
+ private void textBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB18); }
+ private void textBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB19); }
+ private void textBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, serialNrTB20); }
private void textBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox21); }
private void textBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox22); }
private void textBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, textBox23); }
@@ -1119,50 +1291,57 @@ namespace TBF.Rig.TestMethods.S640Communication
}
}
- private void checkBoxImage1_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage1, fromOptoTextBox1, textBox1); }
- private void checkBoxImage2_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage2, fromOptoTextBox2, textBox2); }
- private void checkBoxImage3_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage3, fromOptoTextBox3, textBox3); }
- private void checkBoxImage4_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage4, fromOptoTextBox4, textBox4); }
- private void checkBoxImage5_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage5, fromOptoTextBox5, textBox5); }
- private void checkBoxImage6_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage6, fromOptoTextBox6, textBox6); }
- private void checkBoxImage7_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage7, fromOptoTextBox7, textBox7); }
- private void checkBoxImage8_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage8, fromOptoTextBox8, textBox8); }
- private void checkBoxImage9_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage9, fromOptoTextBox9, textBox9); }
- private void checkBoxImage10_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage10, fromOptoTextBox10, textBox10); }
- private void checkBoxImage11_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage11, fromOptoTextBox11, textBox11); }
- private void checkBoxImage12_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage12, fromOptoTextBox12, textBox12); }
- private void checkBoxImage13_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage13, fromOptoTextBox13, textBox13); }
- private void checkBoxImage14_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage14, fromOptoTextBox14, textBox14); }
- private void checkBoxImage15_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage15, fromOptoTextBox15, textBox15); }
- private void checkBoxImage16_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage16, fromOptoTextBox16, textBox16); }
- private void checkBoxImage17_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage17, fromOptoTextBox17, textBox17); }
- private void checkBoxImage18_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage18, fromOptoTextBox18, textBox18); }
- private void checkBoxImage19_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage19, fromOptoTextBox19, textBox19); }
- private void checkBoxImage20_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage20, fromOptoTextBox20, textBox20); }
- private void checkBoxImage21_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage21, fromOptoTextBox21, textBox21); }
- private void checkBoxImage22_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage22, fromOptoTextBox22, textBox22); }
- private void checkBoxImage23_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage23, fromOptoTextBox23, textBox23); }
- private void checkBoxImage24_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage24, fromOptoTextBox24, textBox24); }
- private void checkBoxImage25_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage25, fromOptoTextBox25, textBox25); }
- private void checkBoxImage26_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage26, fromOptoTextBox26, textBox26); }
- private void checkBoxImage27_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage27, fromOptoTextBox27, textBox27); }
- private void checkBoxImage28_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage28, fromOptoTextBox28, textBox28); }
- private void checkBoxImage29_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage29, fromOptoTextBox29, textBox29); }
- private void checkBoxImage30_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage30, fromOptoTextBox30, textBox30); }
- private void checkBoxImage31_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage31, fromOptoTextBox31, textBox31); }
- private void checkBoxImage32_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage32, fromOptoTextBox32, textBox32); }
- private void checkBoxImage33_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage33, fromOptoTextBox33, textBox33); }
- private void checkBoxImage34_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage34, fromOptoTextBox34, textBox34); }
- private void checkBoxImage35_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage35, fromOptoTextBox35, textBox35); }
- private void checkBoxImage36_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage36, fromOptoTextBox36, textBox36); }
- private void checkBoxImage37_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage37, fromOptoTextBox37, textBox37); }
- private void checkBoxImage38_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage38, fromOptoTextBox38, textBox38); }
- private void checkBoxImage39_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage39, fromOptoTextBox39, textBox39); }
- private void checkBoxImage40_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage40, fromOptoTextBox40, textBox40); }
+ private void checkBoxImage1_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage1, fromOptoTextBox1, radioAddressTB1, serialNrTB1); }
+ private void checkBoxImage2_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage2, fromOptoTextBox2, radioAddressTB2, serialNrTB2); }
+ private void checkBoxImage3_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage3, fromOptoTextBox3, radioAddressTB3, serialNrTB3); }
+ private void checkBoxImage4_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage4, fromOptoTextBox4, radioAddressTB4, serialNrTB4); }
+ private void checkBoxImage5_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage5, fromOptoTextBox5, radioAddressTB5, serialNrTB5); }
+ private void checkBoxImage6_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage6, fromOptoTextBox6, radioAddressTB6, serialNrTB6); }
+ private void checkBoxImage7_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage7, fromOptoTextBox7, radioAddressTB7, serialNrTB7); }
+ private void checkBoxImage8_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage8, fromOptoTextBox8, radioAddressTB8, serialNrTB8); }
+ private void checkBoxImage9_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage9, fromOptoTextBox9, radioAddressTB9, serialNrTB9); }
+ private void checkBoxImage10_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage10, fromOptoTextBox10, radioAddressTB10, serialNrTB10); }
+ private void checkBoxImage11_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage11, fromOptoTextBox11, radioAddressTB11, serialNrTB11); }
+ private void checkBoxImage12_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage12, fromOptoTextBox12, radioAddressTB12, serialNrTB12); }
+ private void checkBoxImage13_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage13, fromOptoTextBox13, radioAddressTB13, serialNrTB13); }
+ private void checkBoxImage14_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage14, fromOptoTextBox14, radioAddressTB14, serialNrTB14); }
+ private void checkBoxImage15_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage15, fromOptoTextBox15, radioAddressTB15, serialNrTB15); }
+ private void checkBoxImage16_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage16, fromOptoTextBox16, radioAddressTB16, serialNrTB16); }
+ private void checkBoxImage17_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage17, fromOptoTextBox17, radioAddressTB17, serialNrTB17); }
+ private void checkBoxImage18_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage18, fromOptoTextBox18, radioAddressTB18, serialNrTB18); }
+ private void checkBoxImage19_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage19, fromOptoTextBox19, radioAddressTB19, serialNrTB19); }
+ private void checkBoxImage20_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage20, fromOptoTextBox20, radioAddressTB20, serialNrTB20); }
+ private void checkBoxImage21_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage21, fromOptoTextBox21, radioAddressTB21, textBox21); }
+ private void checkBoxImage22_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage22, fromOptoTextBox22, radioAddressTB22, textBox22); }
+ private void checkBoxImage23_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage23, fromOptoTextBox23, radioAddressTB23, textBox23); }
+ private void checkBoxImage24_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage24, fromOptoTextBox24, radioAddressTB24, textBox24); }
+ private void checkBoxImage25_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage25, fromOptoTextBox25, radioAddressTB25, textBox25); }
+ private void checkBoxImage26_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage26, fromOptoTextBox26, radioAddressTB26, textBox26); }
+ private void checkBoxImage27_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage27, fromOptoTextBox27, radioAddressTB27, textBox27); }
+ private void checkBoxImage28_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage28, fromOptoTextBox28, radioAddressTB28, textBox28); }
+ private void checkBoxImage29_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage29, fromOptoTextBox29, radioAddressTB29, textBox29); }
+ private void checkBoxImage30_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage30, fromOptoTextBox30, radioAddressTB30, textBox30); }
+ private void checkBoxImage31_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage31, fromOptoTextBox31, radioAddressTB31, textBox31); }
+ private void checkBoxImage32_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage32, fromOptoTextBox32, radioAddressTB32, textBox32); }
+ private void checkBoxImage33_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage33, fromOptoTextBox33, radioAddressTB33, textBox33); }
+ private void checkBoxImage34_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage34, fromOptoTextBox34, radioAddressTB34, textBox34); }
+ private void checkBoxImage35_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage35, fromOptoTextBox35, radioAddressTB35, textBox35); }
+ private void checkBoxImage36_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage36, fromOptoTextBox36, radioAddressTB36, textBox36); }
+ private void checkBoxImage37_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage37, fromOptoTextBox37, radioAddressTB37, textBox37); }
+ private void checkBoxImage38_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage38, fromOptoTextBox38, radioAddressTB38, textBox38); }
+ private void checkBoxImage39_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage39, fromOptoTextBox39, radioAddressTB39, textBox39); }
+ private void checkBoxImage40_Click(object sender, EventArgs e) { ProcessClick(checkBoxImage40, fromOptoTextBox40, radioAddressTB40, textBox40); }
- void ProcessClick(CheckBoxImage checkBox, TextBox messageBox, TextBox snTextBox)
+ void ProcessClick(CheckBoxImage checkBox, TextBox eRegisterNrTB, TextBox radioAddrTB, TextBox snTextBox)
{
- messageBox.Text = checkBox.Checked ? string.Empty : Strings.Head_was_disabled_by_the_user;
+ if (checkBox.Checked)
+ {
+ eRegisterNrTB.Text = radioAddrTB.Text = string.Empty;
+ }
+ else
+ {
+ eRegisterNrTB.Text = radioAddrTB.Text = "xxx";
+ }
if (skipBadMeters)
{
diff --git a/TBF/Rig/TestMethods/S640Communication/S640CommForm.designer.cs b/TBF/Rig/TestMethods/S640Communication/S640CommForm.designer.cs
index ec674b6b8..6df907a10 100644
--- a/TBF/Rig/TestMethods/S640Communication/S640CommForm.designer.cs
+++ b/TBF/Rig/TestMethods/S640Communication/S640CommForm.designer.cs
@@ -161,26 +161,26 @@ namespace TBF.Rig.TestMethods.S640Communication
this.wmLabel25 = new System.Windows.Forms.Label();
this.fromOptoTextBox24 = new System.Windows.Forms.TextBox();
this.wmLabel24 = new System.Windows.Forms.Label();
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.textBox2 = new System.Windows.Forms.TextBox();
- this.textBox3 = new System.Windows.Forms.TextBox();
- this.textBox4 = new System.Windows.Forms.TextBox();
- this.textBox5 = new System.Windows.Forms.TextBox();
- this.textBox6 = new System.Windows.Forms.TextBox();
- this.textBox7 = new System.Windows.Forms.TextBox();
- this.textBox8 = new System.Windows.Forms.TextBox();
- this.textBox9 = new System.Windows.Forms.TextBox();
- this.textBox10 = new System.Windows.Forms.TextBox();
- this.textBox11 = new System.Windows.Forms.TextBox();
- this.textBox12 = new System.Windows.Forms.TextBox();
- this.textBox13 = new System.Windows.Forms.TextBox();
- this.textBox14 = new System.Windows.Forms.TextBox();
- this.textBox15 = new System.Windows.Forms.TextBox();
- this.textBox16 = new System.Windows.Forms.TextBox();
- this.textBox17 = new System.Windows.Forms.TextBox();
- this.textBox18 = new System.Windows.Forms.TextBox();
- this.textBox19 = new System.Windows.Forms.TextBox();
- this.textBox20 = new System.Windows.Forms.TextBox();
+ this.serialNrTB1 = new System.Windows.Forms.TextBox();
+ this.serialNrTB2 = new System.Windows.Forms.TextBox();
+ this.serialNrTB3 = new System.Windows.Forms.TextBox();
+ this.serialNrTB4 = new System.Windows.Forms.TextBox();
+ this.serialNrTB5 = new System.Windows.Forms.TextBox();
+ this.serialNrTB6 = new System.Windows.Forms.TextBox();
+ this.serialNrTB7 = new System.Windows.Forms.TextBox();
+ this.serialNrTB8 = new System.Windows.Forms.TextBox();
+ this.serialNrTB9 = new System.Windows.Forms.TextBox();
+ this.serialNrTB10 = new System.Windows.Forms.TextBox();
+ this.serialNrTB11 = new System.Windows.Forms.TextBox();
+ this.serialNrTB12 = new System.Windows.Forms.TextBox();
+ this.serialNrTB13 = new System.Windows.Forms.TextBox();
+ this.serialNrTB14 = new System.Windows.Forms.TextBox();
+ this.serialNrTB15 = new System.Windows.Forms.TextBox();
+ this.serialNrTB16 = new System.Windows.Forms.TextBox();
+ this.serialNrTB17 = new System.Windows.Forms.TextBox();
+ this.serialNrTB18 = new System.Windows.Forms.TextBox();
+ this.serialNrTB19 = new System.Windows.Forms.TextBox();
+ this.serialNrTB20 = new System.Windows.Forms.TextBox();
this.textBox21 = new System.Windows.Forms.TextBox();
this.textBox22 = new System.Windows.Forms.TextBox();
this.textBox23 = new System.Windows.Forms.TextBox();
@@ -201,10 +201,10 @@ namespace TBF.Rig.TestMethods.S640Communication
this.textBox38 = new System.Windows.Forms.TextBox();
this.textBox39 = new System.Windows.Forms.TextBox();
this.textBox40 = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
+ this.eRegisterLabel1 = new System.Windows.Forms.Label();
+ this.eRegisterLabel2 = new System.Windows.Forms.Label();
+ this.housingSnLabel1 = new System.Windows.Forms.Label();
+ this.housingSnLabel2 = new System.Windows.Forms.Label();
this.checkBoxImage40 = new TBF.Rig.TestMethods.S640Communication.CheckBoxImage();
this.checkBoxImage39 = new TBF.Rig.TestMethods.S640Communication.CheckBoxImage();
this.checkBoxImage38 = new TBF.Rig.TestMethods.S640Communication.CheckBoxImage();
@@ -245,6 +245,90 @@ namespace TBF.Rig.TestMethods.S640Communication
this.checkBoxImage3 = new TBF.Rig.TestMethods.S640Communication.CheckBoxImage();
this.checkBoxImage2 = new TBF.Rig.TestMethods.S640Communication.CheckBoxImage();
this.checkBoxImage1 = new TBF.Rig.TestMethods.S640Communication.CheckBoxImage();
+ this.radioAddressTB1 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB2 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB3 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB4 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB5 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB6 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB7 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB8 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB9 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB10 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB11 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB12 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB13 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB14 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB15 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB16 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB17 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB18 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB19 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB20 = new System.Windows.Forms.TextBox();
+ this.radioAddressLabel1 = new System.Windows.Forms.Label();
+ this.assignedSNLabel1 = new System.Windows.Forms.Label();
+ this.assignedRadioAddressLabel1 = new System.Windows.Forms.Label();
+ this.assignedRadAddrTB20 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB19 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB18 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB17 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB16 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB15 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB14 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB13 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB12 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB11 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB10 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB9 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB8 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB7 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB6 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB5 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB4 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB3 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB2 = new System.Windows.Forms.TextBox();
+ this.assignedRadAddrTB1 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB20 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB19 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB18 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB17 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB16 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB15 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB14 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB13 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB12 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB11 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB10 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB9 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB8 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB7 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB6 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB5 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB4 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB3 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB2 = new System.Windows.Forms.TextBox();
+ this.assignedSnTB1 = new System.Windows.Forms.TextBox();
+ this.radioAddressLabel2 = new System.Windows.Forms.Label();
+ this.radioAddressTB40 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB39 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB38 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB37 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB36 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB35 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB34 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB33 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB32 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB31 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB30 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB29 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB28 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB27 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB26 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB25 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB24 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB23 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB22 = new System.Windows.Forms.TextBox();
+ this.radioAddressTB21 = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox18)).BeginInit();
@@ -334,7 +418,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox2.Location = new System.Drawing.Point(130, 137);
this.fromOptoTextBox2.Name = "fromOptoTextBox2";
- this.fromOptoTextBox2.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox2.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox2.TabIndex = 1;
this.fromOptoTextBox2.Visible = false;
//
@@ -365,7 +449,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox3.Location = new System.Drawing.Point(130, 166);
this.fromOptoTextBox3.Name = "fromOptoTextBox3";
- this.fromOptoTextBox3.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox3.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox3.TabIndex = 1;
this.fromOptoTextBox3.Visible = false;
//
@@ -385,7 +469,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox4.Location = new System.Drawing.Point(130, 195);
this.fromOptoTextBox4.Name = "fromOptoTextBox4";
- this.fromOptoTextBox4.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox4.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox4.TabIndex = 1;
this.fromOptoTextBox4.Visible = false;
//
@@ -405,7 +489,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox5.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox5.Location = new System.Drawing.Point(130, 224);
this.fromOptoTextBox5.Name = "fromOptoTextBox5";
- this.fromOptoTextBox5.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox5.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox5.TabIndex = 1;
this.fromOptoTextBox5.Visible = false;
//
@@ -425,7 +509,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox6.Location = new System.Drawing.Point(130, 253);
this.fromOptoTextBox6.Name = "fromOptoTextBox6";
- this.fromOptoTextBox6.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox6.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox6.TabIndex = 1;
this.fromOptoTextBox6.Visible = false;
//
@@ -445,7 +529,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox1.Location = new System.Drawing.Point(130, 108);
this.fromOptoTextBox1.Name = "fromOptoTextBox1";
- this.fromOptoTextBox1.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox1.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox1.TabIndex = 1;
this.fromOptoTextBox1.Visible = false;
//
@@ -454,7 +538,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox7.Location = new System.Drawing.Point(130, 282);
this.fromOptoTextBox7.Name = "fromOptoTextBox7";
- this.fromOptoTextBox7.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox7.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox7.TabIndex = 9;
this.fromOptoTextBox7.Visible = false;
//
@@ -474,7 +558,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox8.Location = new System.Drawing.Point(130, 311);
this.fromOptoTextBox8.Name = "fromOptoTextBox8";
- this.fromOptoTextBox8.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox8.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox8.TabIndex = 11;
this.fromOptoTextBox8.Visible = false;
//
@@ -494,7 +578,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox9.Location = new System.Drawing.Point(130, 340);
this.fromOptoTextBox9.Name = "fromOptoTextBox9";
- this.fromOptoTextBox9.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox9.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox9.TabIndex = 13;
this.fromOptoTextBox9.Visible = false;
//
@@ -514,7 +598,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox10.Location = new System.Drawing.Point(130, 369);
this.fromOptoTextBox10.Name = "fromOptoTextBox10";
- this.fromOptoTextBox10.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox10.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox10.TabIndex = 15;
this.fromOptoTextBox10.Visible = false;
//
@@ -534,7 +618,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox12.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox12.Location = new System.Drawing.Point(130, 427);
this.fromOptoTextBox12.Name = "fromOptoTextBox12";
- this.fromOptoTextBox12.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox12.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox12.TabIndex = 19;
this.fromOptoTextBox12.Visible = false;
//
@@ -554,7 +638,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox11.Location = new System.Drawing.Point(130, 398);
this.fromOptoTextBox11.Name = "fromOptoTextBox11";
- this.fromOptoTextBox11.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox11.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox11.TabIndex = 17;
this.fromOptoTextBox11.Visible = false;
//
@@ -574,7 +658,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox20.Location = new System.Drawing.Point(130, 659);
this.fromOptoTextBox20.Name = "fromOptoTextBox20";
- this.fromOptoTextBox20.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox20.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox20.TabIndex = 35;
this.fromOptoTextBox20.Visible = false;
//
@@ -594,7 +678,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox19.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox19.Location = new System.Drawing.Point(130, 630);
this.fromOptoTextBox19.Name = "fromOptoTextBox19";
- this.fromOptoTextBox19.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox19.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox19.TabIndex = 33;
this.fromOptoTextBox19.Visible = false;
//
@@ -614,7 +698,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox18.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox18.Location = new System.Drawing.Point(130, 601);
this.fromOptoTextBox18.Name = "fromOptoTextBox18";
- this.fromOptoTextBox18.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox18.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox18.TabIndex = 27;
this.fromOptoTextBox18.Visible = false;
//
@@ -634,7 +718,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox17.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox17.Location = new System.Drawing.Point(130, 572);
this.fromOptoTextBox17.Name = "fromOptoTextBox17";
- this.fromOptoTextBox17.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox17.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox17.TabIndex = 26;
this.fromOptoTextBox17.Visible = false;
//
@@ -654,7 +738,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox16.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox16.Location = new System.Drawing.Point(130, 543);
this.fromOptoTextBox16.Name = "fromOptoTextBox16";
- this.fromOptoTextBox16.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox16.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox16.TabIndex = 30;
this.fromOptoTextBox16.Visible = false;
//
@@ -674,7 +758,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox15.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox15.Location = new System.Drawing.Point(130, 514);
this.fromOptoTextBox15.Name = "fromOptoTextBox15";
- this.fromOptoTextBox15.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox15.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox15.TabIndex = 31;
this.fromOptoTextBox15.Visible = false;
//
@@ -694,7 +778,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox14.Location = new System.Drawing.Point(130, 485);
this.fromOptoTextBox14.Name = "fromOptoTextBox14";
- this.fromOptoTextBox14.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox14.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox14.TabIndex = 28;
this.fromOptoTextBox14.Visible = false;
//
@@ -714,7 +798,7 @@ namespace TBF.Rig.TestMethods.S640Communication
this.fromOptoTextBox13.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.fromOptoTextBox13.Location = new System.Drawing.Point(130, 456);
this.fromOptoTextBox13.Name = "fromOptoTextBox13";
- this.fromOptoTextBox13.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox13.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox13.TabIndex = 29;
this.fromOptoTextBox13.Visible = false;
//
@@ -946,7 +1030,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.closeButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.closeButton.Location = new System.Drawing.Point(1341, 25);
+ this.closeButton.Location = new System.Drawing.Point(1245, 25);
this.closeButton.Name = "closeButton";
this.closeButton.Size = new System.Drawing.Size(118, 37);
this.closeButton.TabIndex = 199;
@@ -958,7 +1042,7 @@ namespace TBF.Rig.TestMethods.S640Communication
// progressBar1
//
this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.progressBar1.Location = new System.Drawing.Point(940, 25);
+ this.progressBar1.Location = new System.Drawing.Point(844, 25);
this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(238, 37);
this.progressBar1.TabIndex = 200;
@@ -968,7 +1052,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.retryButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.retryButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.retryButton.Location = new System.Drawing.Point(1201, 25);
+ this.retryButton.Location = new System.Drawing.Point(1105, 25);
this.retryButton.Name = "retryButton";
this.retryButton.Size = new System.Drawing.Size(118, 37);
this.retryButton.TabIndex = 201;
@@ -979,7 +1063,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox21
//
- this.pictureBox21.Location = new System.Drawing.Point(816, 107);
+ this.pictureBox21.Location = new System.Drawing.Point(1003, 107);
this.pictureBox21.Name = "pictureBox21";
this.pictureBox21.Size = new System.Drawing.Size(23, 23);
this.pictureBox21.TabIndex = 204;
@@ -988,9 +1072,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox21
//
this.fromOptoTextBox21.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox21.Location = new System.Drawing.Point(856, 107);
+ this.fromOptoTextBox21.Location = new System.Drawing.Point(1043, 107);
this.fromOptoTextBox21.Name = "fromOptoTextBox21";
- this.fromOptoTextBox21.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox21.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox21.TabIndex = 203;
this.fromOptoTextBox21.Visible = false;
//
@@ -998,7 +1082,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel21.AutoSize = true;
this.wmLabel21.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel21.Location = new System.Drawing.Point(743, 112);
+ this.wmLabel21.Location = new System.Drawing.Point(930, 112);
this.wmLabel21.Name = "wmLabel21";
this.wmLabel21.Size = new System.Drawing.Size(24, 16);
this.wmLabel21.TabIndex = 202;
@@ -1007,7 +1091,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox22
//
- this.pictureBox22.Location = new System.Drawing.Point(816, 137);
+ this.pictureBox22.Location = new System.Drawing.Point(1003, 137);
this.pictureBox22.Name = "pictureBox22";
this.pictureBox22.Size = new System.Drawing.Size(23, 23);
this.pictureBox22.TabIndex = 208;
@@ -1016,9 +1100,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox22
//
this.fromOptoTextBox22.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox22.Location = new System.Drawing.Point(856, 136);
+ this.fromOptoTextBox22.Location = new System.Drawing.Point(1043, 136);
this.fromOptoTextBox22.Name = "fromOptoTextBox22";
- this.fromOptoTextBox22.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox22.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox22.TabIndex = 207;
this.fromOptoTextBox22.Visible = false;
//
@@ -1026,7 +1110,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel22.AutoSize = true;
this.wmLabel22.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel22.Location = new System.Drawing.Point(743, 142);
+ this.wmLabel22.Location = new System.Drawing.Point(930, 142);
this.wmLabel22.Name = "wmLabel22";
this.wmLabel22.Size = new System.Drawing.Size(24, 16);
this.wmLabel22.TabIndex = 206;
@@ -1035,7 +1119,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox23
//
- this.pictureBox23.Location = new System.Drawing.Point(816, 166);
+ this.pictureBox23.Location = new System.Drawing.Point(1003, 166);
this.pictureBox23.Name = "pictureBox23";
this.pictureBox23.Size = new System.Drawing.Size(23, 23);
this.pictureBox23.TabIndex = 212;
@@ -1044,9 +1128,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox23
//
this.fromOptoTextBox23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox23.Location = new System.Drawing.Point(856, 165);
+ this.fromOptoTextBox23.Location = new System.Drawing.Point(1043, 165);
this.fromOptoTextBox23.Name = "fromOptoTextBox23";
- this.fromOptoTextBox23.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox23.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox23.TabIndex = 211;
this.fromOptoTextBox23.Visible = false;
//
@@ -1054,7 +1138,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel23.AutoSize = true;
this.wmLabel23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel23.Location = new System.Drawing.Point(743, 171);
+ this.wmLabel23.Location = new System.Drawing.Point(930, 171);
this.wmLabel23.Name = "wmLabel23";
this.wmLabel23.Size = new System.Drawing.Size(24, 16);
this.wmLabel23.TabIndex = 210;
@@ -1063,7 +1147,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox40
//
- this.pictureBox40.Location = new System.Drawing.Point(816, 658);
+ this.pictureBox40.Location = new System.Drawing.Point(1003, 658);
this.pictureBox40.Name = "pictureBox40";
this.pictureBox40.Size = new System.Drawing.Size(23, 23);
this.pictureBox40.TabIndex = 264;
@@ -1071,7 +1155,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox39
//
- this.pictureBox39.Location = new System.Drawing.Point(816, 629);
+ this.pictureBox39.Location = new System.Drawing.Point(1003, 629);
this.pictureBox39.Name = "pictureBox39";
this.pictureBox39.Size = new System.Drawing.Size(23, 23);
this.pictureBox39.TabIndex = 263;
@@ -1079,7 +1163,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox38
//
- this.pictureBox38.Location = new System.Drawing.Point(816, 600);
+ this.pictureBox38.Location = new System.Drawing.Point(1003, 600);
this.pictureBox38.Name = "pictureBox38";
this.pictureBox38.Size = new System.Drawing.Size(23, 23);
this.pictureBox38.TabIndex = 262;
@@ -1087,7 +1171,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox37
//
- this.pictureBox37.Location = new System.Drawing.Point(816, 571);
+ this.pictureBox37.Location = new System.Drawing.Point(1003, 571);
this.pictureBox37.Name = "pictureBox37";
this.pictureBox37.Size = new System.Drawing.Size(23, 23);
this.pictureBox37.TabIndex = 261;
@@ -1095,7 +1179,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox36
//
- this.pictureBox36.Location = new System.Drawing.Point(816, 542);
+ this.pictureBox36.Location = new System.Drawing.Point(1003, 542);
this.pictureBox36.Name = "pictureBox36";
this.pictureBox36.Size = new System.Drawing.Size(23, 23);
this.pictureBox36.TabIndex = 260;
@@ -1103,7 +1187,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox35
//
- this.pictureBox35.Location = new System.Drawing.Point(816, 513);
+ this.pictureBox35.Location = new System.Drawing.Point(1003, 513);
this.pictureBox35.Name = "pictureBox35";
this.pictureBox35.Size = new System.Drawing.Size(23, 23);
this.pictureBox35.TabIndex = 259;
@@ -1111,7 +1195,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox34
//
- this.pictureBox34.Location = new System.Drawing.Point(816, 484);
+ this.pictureBox34.Location = new System.Drawing.Point(1003, 484);
this.pictureBox34.Name = "pictureBox34";
this.pictureBox34.Size = new System.Drawing.Size(23, 23);
this.pictureBox34.TabIndex = 258;
@@ -1119,7 +1203,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox33
//
- this.pictureBox33.Location = new System.Drawing.Point(816, 455);
+ this.pictureBox33.Location = new System.Drawing.Point(1003, 455);
this.pictureBox33.Name = "pictureBox33";
this.pictureBox33.Size = new System.Drawing.Size(23, 23);
this.pictureBox33.TabIndex = 257;
@@ -1127,7 +1211,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox32
//
- this.pictureBox32.Location = new System.Drawing.Point(816, 426);
+ this.pictureBox32.Location = new System.Drawing.Point(1003, 426);
this.pictureBox32.Name = "pictureBox32";
this.pictureBox32.Size = new System.Drawing.Size(23, 23);
this.pictureBox32.TabIndex = 256;
@@ -1135,7 +1219,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox31
//
- this.pictureBox31.Location = new System.Drawing.Point(816, 397);
+ this.pictureBox31.Location = new System.Drawing.Point(1003, 397);
this.pictureBox31.Name = "pictureBox31";
this.pictureBox31.Size = new System.Drawing.Size(23, 23);
this.pictureBox31.TabIndex = 255;
@@ -1143,7 +1227,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox30
//
- this.pictureBox30.Location = new System.Drawing.Point(816, 368);
+ this.pictureBox30.Location = new System.Drawing.Point(1003, 368);
this.pictureBox30.Name = "pictureBox30";
this.pictureBox30.Size = new System.Drawing.Size(23, 23);
this.pictureBox30.TabIndex = 254;
@@ -1151,7 +1235,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox29
//
- this.pictureBox29.Location = new System.Drawing.Point(816, 339);
+ this.pictureBox29.Location = new System.Drawing.Point(1003, 339);
this.pictureBox29.Name = "pictureBox29";
this.pictureBox29.Size = new System.Drawing.Size(23, 23);
this.pictureBox29.TabIndex = 253;
@@ -1159,7 +1243,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox28
//
- this.pictureBox28.Location = new System.Drawing.Point(816, 310);
+ this.pictureBox28.Location = new System.Drawing.Point(1003, 310);
this.pictureBox28.Name = "pictureBox28";
this.pictureBox28.Size = new System.Drawing.Size(23, 23);
this.pictureBox28.TabIndex = 252;
@@ -1167,7 +1251,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox27
//
- this.pictureBox27.Location = new System.Drawing.Point(816, 281);
+ this.pictureBox27.Location = new System.Drawing.Point(1003, 281);
this.pictureBox27.Name = "pictureBox27";
this.pictureBox27.Size = new System.Drawing.Size(23, 23);
this.pictureBox27.TabIndex = 251;
@@ -1175,7 +1259,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox26
//
- this.pictureBox26.Location = new System.Drawing.Point(816, 252);
+ this.pictureBox26.Location = new System.Drawing.Point(1003, 252);
this.pictureBox26.Name = "pictureBox26";
this.pictureBox26.Size = new System.Drawing.Size(23, 23);
this.pictureBox26.TabIndex = 250;
@@ -1183,7 +1267,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox25
//
- this.pictureBox25.Location = new System.Drawing.Point(816, 223);
+ this.pictureBox25.Location = new System.Drawing.Point(1003, 223);
this.pictureBox25.Name = "pictureBox25";
this.pictureBox25.Size = new System.Drawing.Size(23, 23);
this.pictureBox25.TabIndex = 249;
@@ -1191,7 +1275,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
// pictureBox24
//
- this.pictureBox24.Location = new System.Drawing.Point(816, 194);
+ this.pictureBox24.Location = new System.Drawing.Point(1003, 194);
this.pictureBox24.Name = "pictureBox24";
this.pictureBox24.Size = new System.Drawing.Size(23, 23);
this.pictureBox24.TabIndex = 248;
@@ -1200,9 +1284,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox40
//
this.fromOptoTextBox40.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox40.Location = new System.Drawing.Point(856, 657);
+ this.fromOptoTextBox40.Location = new System.Drawing.Point(1043, 657);
this.fromOptoTextBox40.Name = "fromOptoTextBox40";
- this.fromOptoTextBox40.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox40.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox40.TabIndex = 247;
this.fromOptoTextBox40.Visible = false;
//
@@ -1210,7 +1294,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel40.AutoSize = true;
this.wmLabel40.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel40.Location = new System.Drawing.Point(743, 664);
+ this.wmLabel40.Location = new System.Drawing.Point(930, 664);
this.wmLabel40.Name = "wmLabel40";
this.wmLabel40.Size = new System.Drawing.Size(24, 16);
this.wmLabel40.TabIndex = 246;
@@ -1220,9 +1304,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox39
//
this.fromOptoTextBox39.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox39.Location = new System.Drawing.Point(856, 628);
+ this.fromOptoTextBox39.Location = new System.Drawing.Point(1043, 628);
this.fromOptoTextBox39.Name = "fromOptoTextBox39";
- this.fromOptoTextBox39.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox39.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox39.TabIndex = 245;
this.fromOptoTextBox39.Visible = false;
//
@@ -1230,7 +1314,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel39.AutoSize = true;
this.wmLabel39.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel39.Location = new System.Drawing.Point(743, 635);
+ this.wmLabel39.Location = new System.Drawing.Point(930, 635);
this.wmLabel39.Name = "wmLabel39";
this.wmLabel39.Size = new System.Drawing.Size(24, 16);
this.wmLabel39.TabIndex = 244;
@@ -1240,9 +1324,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox38
//
this.fromOptoTextBox38.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox38.Location = new System.Drawing.Point(856, 599);
+ this.fromOptoTextBox38.Location = new System.Drawing.Point(1043, 599);
this.fromOptoTextBox38.Name = "fromOptoTextBox38";
- this.fromOptoTextBox38.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox38.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox38.TabIndex = 239;
this.fromOptoTextBox38.Visible = false;
//
@@ -1250,7 +1334,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel38.AutoSize = true;
this.wmLabel38.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel38.Location = new System.Drawing.Point(743, 606);
+ this.wmLabel38.Location = new System.Drawing.Point(930, 606);
this.wmLabel38.Name = "wmLabel38";
this.wmLabel38.Size = new System.Drawing.Size(24, 16);
this.wmLabel38.TabIndex = 235;
@@ -1260,9 +1344,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox37
//
this.fromOptoTextBox37.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox37.Location = new System.Drawing.Point(856, 570);
+ this.fromOptoTextBox37.Location = new System.Drawing.Point(1043, 570);
this.fromOptoTextBox37.Name = "fromOptoTextBox37";
- this.fromOptoTextBox37.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox37.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox37.TabIndex = 238;
this.fromOptoTextBox37.Visible = false;
//
@@ -1270,7 +1354,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel37.AutoSize = true;
this.wmLabel37.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel37.Location = new System.Drawing.Point(743, 576);
+ this.wmLabel37.Location = new System.Drawing.Point(930, 576);
this.wmLabel37.Name = "wmLabel37";
this.wmLabel37.Size = new System.Drawing.Size(24, 16);
this.wmLabel37.TabIndex = 234;
@@ -1280,9 +1364,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox36
//
this.fromOptoTextBox36.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox36.Location = new System.Drawing.Point(856, 541);
+ this.fromOptoTextBox36.Location = new System.Drawing.Point(1043, 541);
this.fromOptoTextBox36.Name = "fromOptoTextBox36";
- this.fromOptoTextBox36.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox36.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox36.TabIndex = 242;
this.fromOptoTextBox36.Visible = false;
//
@@ -1290,7 +1374,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel36.AutoSize = true;
this.wmLabel36.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel36.Location = new System.Drawing.Point(743, 547);
+ this.wmLabel36.Location = new System.Drawing.Point(930, 547);
this.wmLabel36.Name = "wmLabel36";
this.wmLabel36.Size = new System.Drawing.Size(24, 16);
this.wmLabel36.TabIndex = 233;
@@ -1300,9 +1384,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox35
//
this.fromOptoTextBox35.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox35.Location = new System.Drawing.Point(856, 512);
+ this.fromOptoTextBox35.Location = new System.Drawing.Point(1043, 512);
this.fromOptoTextBox35.Name = "fromOptoTextBox35";
- this.fromOptoTextBox35.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox35.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox35.TabIndex = 243;
this.fromOptoTextBox35.Visible = false;
//
@@ -1310,7 +1394,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel35.AutoSize = true;
this.wmLabel35.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel35.Location = new System.Drawing.Point(743, 518);
+ this.wmLabel35.Location = new System.Drawing.Point(930, 518);
this.wmLabel35.Name = "wmLabel35";
this.wmLabel35.Size = new System.Drawing.Size(24, 16);
this.wmLabel35.TabIndex = 232;
@@ -1320,9 +1404,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox34
//
this.fromOptoTextBox34.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox34.Location = new System.Drawing.Point(856, 483);
+ this.fromOptoTextBox34.Location = new System.Drawing.Point(1043, 483);
this.fromOptoTextBox34.Name = "fromOptoTextBox34";
- this.fromOptoTextBox34.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox34.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox34.TabIndex = 240;
this.fromOptoTextBox34.Visible = false;
//
@@ -1330,7 +1414,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel34.AutoSize = true;
this.wmLabel34.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel34.Location = new System.Drawing.Point(743, 489);
+ this.wmLabel34.Location = new System.Drawing.Point(930, 489);
this.wmLabel34.Name = "wmLabel34";
this.wmLabel34.Size = new System.Drawing.Size(24, 16);
this.wmLabel34.TabIndex = 237;
@@ -1340,9 +1424,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox33
//
this.fromOptoTextBox33.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox33.Location = new System.Drawing.Point(856, 454);
+ this.fromOptoTextBox33.Location = new System.Drawing.Point(1043, 454);
this.fromOptoTextBox33.Name = "fromOptoTextBox33";
- this.fromOptoTextBox33.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox33.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox33.TabIndex = 241;
this.fromOptoTextBox33.Visible = false;
//
@@ -1350,7 +1434,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel33.AutoSize = true;
this.wmLabel33.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel33.Location = new System.Drawing.Point(743, 460);
+ this.wmLabel33.Location = new System.Drawing.Point(930, 460);
this.wmLabel33.Name = "wmLabel33";
this.wmLabel33.Size = new System.Drawing.Size(24, 16);
this.wmLabel33.TabIndex = 236;
@@ -1360,9 +1444,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox32
//
this.fromOptoTextBox32.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox32.Location = new System.Drawing.Point(856, 425);
+ this.fromOptoTextBox32.Location = new System.Drawing.Point(1043, 425);
this.fromOptoTextBox32.Name = "fromOptoTextBox32";
- this.fromOptoTextBox32.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox32.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox32.TabIndex = 231;
this.fromOptoTextBox32.Visible = false;
//
@@ -1370,7 +1454,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel32.AutoSize = true;
this.wmLabel32.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel32.Location = new System.Drawing.Point(743, 431);
+ this.wmLabel32.Location = new System.Drawing.Point(930, 431);
this.wmLabel32.Name = "wmLabel32";
this.wmLabel32.Size = new System.Drawing.Size(24, 16);
this.wmLabel32.TabIndex = 230;
@@ -1380,9 +1464,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox31
//
this.fromOptoTextBox31.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox31.Location = new System.Drawing.Point(856, 396);
+ this.fromOptoTextBox31.Location = new System.Drawing.Point(1043, 396);
this.fromOptoTextBox31.Name = "fromOptoTextBox31";
- this.fromOptoTextBox31.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox31.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox31.TabIndex = 229;
this.fromOptoTextBox31.Visible = false;
//
@@ -1390,7 +1474,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel31.AutoSize = true;
this.wmLabel31.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel31.Location = new System.Drawing.Point(743, 402);
+ this.wmLabel31.Location = new System.Drawing.Point(930, 402);
this.wmLabel31.Name = "wmLabel31";
this.wmLabel31.Size = new System.Drawing.Size(24, 16);
this.wmLabel31.TabIndex = 228;
@@ -1400,9 +1484,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox30
//
this.fromOptoTextBox30.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox30.Location = new System.Drawing.Point(856, 367);
+ this.fromOptoTextBox30.Location = new System.Drawing.Point(1043, 367);
this.fromOptoTextBox30.Name = "fromOptoTextBox30";
- this.fromOptoTextBox30.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox30.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox30.TabIndex = 227;
this.fromOptoTextBox30.Visible = false;
//
@@ -1410,7 +1494,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel30.AutoSize = true;
this.wmLabel30.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel30.Location = new System.Drawing.Point(743, 373);
+ this.wmLabel30.Location = new System.Drawing.Point(930, 373);
this.wmLabel30.Name = "wmLabel30";
this.wmLabel30.Size = new System.Drawing.Size(24, 16);
this.wmLabel30.TabIndex = 226;
@@ -1420,9 +1504,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox29
//
this.fromOptoTextBox29.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox29.Location = new System.Drawing.Point(856, 338);
+ this.fromOptoTextBox29.Location = new System.Drawing.Point(1043, 338);
this.fromOptoTextBox29.Name = "fromOptoTextBox29";
- this.fromOptoTextBox29.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox29.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox29.TabIndex = 225;
this.fromOptoTextBox29.Visible = false;
//
@@ -1430,7 +1514,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel29.AutoSize = true;
this.wmLabel29.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel29.Location = new System.Drawing.Point(743, 344);
+ this.wmLabel29.Location = new System.Drawing.Point(930, 344);
this.wmLabel29.Name = "wmLabel29";
this.wmLabel29.Size = new System.Drawing.Size(24, 16);
this.wmLabel29.TabIndex = 224;
@@ -1440,9 +1524,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox28
//
this.fromOptoTextBox28.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox28.Location = new System.Drawing.Point(856, 309);
+ this.fromOptoTextBox28.Location = new System.Drawing.Point(1043, 309);
this.fromOptoTextBox28.Name = "fromOptoTextBox28";
- this.fromOptoTextBox28.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox28.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox28.TabIndex = 223;
this.fromOptoTextBox28.Visible = false;
//
@@ -1450,7 +1534,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel28.AutoSize = true;
this.wmLabel28.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel28.Location = new System.Drawing.Point(743, 316);
+ this.wmLabel28.Location = new System.Drawing.Point(930, 316);
this.wmLabel28.Name = "wmLabel28";
this.wmLabel28.Size = new System.Drawing.Size(24, 16);
this.wmLabel28.TabIndex = 222;
@@ -1460,9 +1544,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox27
//
this.fromOptoTextBox27.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox27.Location = new System.Drawing.Point(856, 280);
+ this.fromOptoTextBox27.Location = new System.Drawing.Point(1043, 280);
this.fromOptoTextBox27.Name = "fromOptoTextBox27";
- this.fromOptoTextBox27.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox27.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox27.TabIndex = 221;
this.fromOptoTextBox27.Visible = false;
//
@@ -1470,7 +1554,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel27.AutoSize = true;
this.wmLabel27.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel27.Location = new System.Drawing.Point(743, 287);
+ this.wmLabel27.Location = new System.Drawing.Point(930, 287);
this.wmLabel27.Name = "wmLabel27";
this.wmLabel27.Size = new System.Drawing.Size(24, 16);
this.wmLabel27.TabIndex = 220;
@@ -1480,9 +1564,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox26
//
this.fromOptoTextBox26.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox26.Location = new System.Drawing.Point(856, 251);
+ this.fromOptoTextBox26.Location = new System.Drawing.Point(1043, 251);
this.fromOptoTextBox26.Name = "fromOptoTextBox26";
- this.fromOptoTextBox26.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox26.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox26.TabIndex = 217;
this.fromOptoTextBox26.Visible = false;
//
@@ -1490,7 +1574,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel26.AutoSize = true;
this.wmLabel26.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel26.Location = new System.Drawing.Point(743, 258);
+ this.wmLabel26.Location = new System.Drawing.Point(930, 258);
this.wmLabel26.Name = "wmLabel26";
this.wmLabel26.Size = new System.Drawing.Size(24, 16);
this.wmLabel26.TabIndex = 216;
@@ -1500,9 +1584,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox25
//
this.fromOptoTextBox25.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox25.Location = new System.Drawing.Point(856, 222);
+ this.fromOptoTextBox25.Location = new System.Drawing.Point(1043, 222);
this.fromOptoTextBox25.Name = "fromOptoTextBox25";
- this.fromOptoTextBox25.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox25.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox25.TabIndex = 219;
this.fromOptoTextBox25.Visible = false;
//
@@ -1510,7 +1594,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel25.AutoSize = true;
this.wmLabel25.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel25.Location = new System.Drawing.Point(743, 228);
+ this.wmLabel25.Location = new System.Drawing.Point(930, 228);
this.wmLabel25.Name = "wmLabel25";
this.wmLabel25.Size = new System.Drawing.Size(24, 16);
this.wmLabel25.TabIndex = 215;
@@ -1520,9 +1604,9 @@ namespace TBF.Rig.TestMethods.S640Communication
// fromOptoTextBox24
//
this.fromOptoTextBox24.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.fromOptoTextBox24.Location = new System.Drawing.Point(856, 193);
+ this.fromOptoTextBox24.Location = new System.Drawing.Point(1043, 193);
this.fromOptoTextBox24.Name = "fromOptoTextBox24";
- this.fromOptoTextBox24.Size = new System.Drawing.Size(400, 23);
+ this.fromOptoTextBox24.Size = new System.Drawing.Size(130, 23);
this.fromOptoTextBox24.TabIndex = 218;
this.fromOptoTextBox24.Visible = false;
//
@@ -1530,238 +1614,238 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.wmLabel24.AutoSize = true;
this.wmLabel24.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.wmLabel24.Location = new System.Drawing.Point(743, 199);
+ this.wmLabel24.Location = new System.Drawing.Point(930, 199);
this.wmLabel24.Name = "wmLabel24";
this.wmLabel24.Size = new System.Drawing.Size(24, 16);
this.wmLabel24.TabIndex = 214;
this.wmLabel24.Text = "24";
this.wmLabel24.Visible = false;
//
- // textBox1
+ // serialNrTB1
//
- this.textBox1.Enabled = false;
- this.textBox1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox1.Location = new System.Drawing.Point(536, 108);
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(197, 23);
- this.textBox1.TabIndex = 282;
- this.textBox1.Visible = false;
- this.textBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox1_KeyPress);
+ this.serialNrTB1.Enabled = false;
+ this.serialNrTB1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB1.Location = new System.Drawing.Point(392, 108);
+ this.serialNrTB1.Name = "serialNrTB1";
+ this.serialNrTB1.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB1.TabIndex = 282;
+ this.serialNrTB1.Visible = false;
+ this.serialNrTB1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox1_KeyPress);
//
- // textBox2
+ // serialNrTB2
//
- this.textBox2.Enabled = false;
- this.textBox2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox2.Location = new System.Drawing.Point(536, 137);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(197, 23);
- this.textBox2.TabIndex = 283;
- this.textBox2.Visible = false;
- this.textBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox2_KeyPress);
+ this.serialNrTB2.Enabled = false;
+ this.serialNrTB2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB2.Location = new System.Drawing.Point(392, 137);
+ this.serialNrTB2.Name = "serialNrTB2";
+ this.serialNrTB2.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB2.TabIndex = 283;
+ this.serialNrTB2.Visible = false;
+ this.serialNrTB2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox2_KeyPress);
//
- // textBox3
+ // serialNrTB3
//
- this.textBox3.Enabled = false;
- this.textBox3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox3.Location = new System.Drawing.Point(536, 166);
- this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(197, 23);
- this.textBox3.TabIndex = 284;
- this.textBox3.Visible = false;
- this.textBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox3_KeyPress);
+ this.serialNrTB3.Enabled = false;
+ this.serialNrTB3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB3.Location = new System.Drawing.Point(392, 166);
+ this.serialNrTB3.Name = "serialNrTB3";
+ this.serialNrTB3.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB3.TabIndex = 284;
+ this.serialNrTB3.Visible = false;
+ this.serialNrTB3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox3_KeyPress);
//
- // textBox4
+ // serialNrTB4
//
- this.textBox4.Enabled = false;
- this.textBox4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox4.Location = new System.Drawing.Point(536, 195);
- this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(197, 23);
- this.textBox4.TabIndex = 285;
- this.textBox4.Visible = false;
- this.textBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox4_KeyPress);
+ this.serialNrTB4.Enabled = false;
+ this.serialNrTB4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB4.Location = new System.Drawing.Point(392, 195);
+ this.serialNrTB4.Name = "serialNrTB4";
+ this.serialNrTB4.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB4.TabIndex = 285;
+ this.serialNrTB4.Visible = false;
+ this.serialNrTB4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox4_KeyPress);
//
- // textBox5
+ // serialNrTB5
//
- this.textBox5.Enabled = false;
- this.textBox5.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox5.Location = new System.Drawing.Point(536, 224);
- this.textBox5.Name = "textBox5";
- this.textBox5.Size = new System.Drawing.Size(197, 23);
- this.textBox5.TabIndex = 286;
- this.textBox5.Visible = false;
- this.textBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox5_KeyPress);
+ this.serialNrTB5.Enabled = false;
+ this.serialNrTB5.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB5.Location = new System.Drawing.Point(392, 224);
+ this.serialNrTB5.Name = "serialNrTB5";
+ this.serialNrTB5.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB5.TabIndex = 286;
+ this.serialNrTB5.Visible = false;
+ this.serialNrTB5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox5_KeyPress);
//
- // textBox6
+ // serialNrTB6
//
- this.textBox6.Enabled = false;
- this.textBox6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox6.Location = new System.Drawing.Point(536, 253);
- this.textBox6.Name = "textBox6";
- this.textBox6.Size = new System.Drawing.Size(197, 23);
- this.textBox6.TabIndex = 287;
- this.textBox6.Visible = false;
- this.textBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox6_KeyPress);
+ this.serialNrTB6.Enabled = false;
+ this.serialNrTB6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB6.Location = new System.Drawing.Point(392, 253);
+ this.serialNrTB6.Name = "serialNrTB6";
+ this.serialNrTB6.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB6.TabIndex = 287;
+ this.serialNrTB6.Visible = false;
+ this.serialNrTB6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox6_KeyPress);
//
- // textBox7
+ // serialNrTB7
//
- this.textBox7.Enabled = false;
- this.textBox7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox7.Location = new System.Drawing.Point(536, 282);
- this.textBox7.Name = "textBox7";
- this.textBox7.Size = new System.Drawing.Size(197, 23);
- this.textBox7.TabIndex = 288;
- this.textBox7.Visible = false;
- this.textBox7.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox7_KeyPress);
+ this.serialNrTB7.Enabled = false;
+ this.serialNrTB7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB7.Location = new System.Drawing.Point(392, 282);
+ this.serialNrTB7.Name = "serialNrTB7";
+ this.serialNrTB7.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB7.TabIndex = 288;
+ this.serialNrTB7.Visible = false;
+ this.serialNrTB7.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox7_KeyPress);
//
- // textBox8
+ // serialNrTB8
//
- this.textBox8.Enabled = false;
- this.textBox8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox8.Location = new System.Drawing.Point(536, 311);
- this.textBox8.Name = "textBox8";
- this.textBox8.Size = new System.Drawing.Size(197, 23);
- this.textBox8.TabIndex = 289;
- this.textBox8.Visible = false;
- this.textBox8.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox8_KeyPress);
+ this.serialNrTB8.Enabled = false;
+ this.serialNrTB8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB8.Location = new System.Drawing.Point(392, 311);
+ this.serialNrTB8.Name = "serialNrTB8";
+ this.serialNrTB8.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB8.TabIndex = 289;
+ this.serialNrTB8.Visible = false;
+ this.serialNrTB8.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox8_KeyPress);
//
- // textBox9
+ // serialNrTB9
//
- this.textBox9.Enabled = false;
- this.textBox9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox9.Location = new System.Drawing.Point(536, 340);
- this.textBox9.Name = "textBox9";
- this.textBox9.Size = new System.Drawing.Size(197, 23);
- this.textBox9.TabIndex = 290;
- this.textBox9.Visible = false;
- this.textBox9.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox9_KeyPress);
+ this.serialNrTB9.Enabled = false;
+ this.serialNrTB9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB9.Location = new System.Drawing.Point(392, 340);
+ this.serialNrTB9.Name = "serialNrTB9";
+ this.serialNrTB9.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB9.TabIndex = 290;
+ this.serialNrTB9.Visible = false;
+ this.serialNrTB9.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox9_KeyPress);
//
- // textBox10
+ // serialNrTB10
//
- this.textBox10.Enabled = false;
- this.textBox10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox10.Location = new System.Drawing.Point(536, 369);
- this.textBox10.Name = "textBox10";
- this.textBox10.Size = new System.Drawing.Size(197, 23);
- this.textBox10.TabIndex = 291;
- this.textBox10.Visible = false;
- this.textBox10.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox10_KeyPress);
+ this.serialNrTB10.Enabled = false;
+ this.serialNrTB10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB10.Location = new System.Drawing.Point(392, 369);
+ this.serialNrTB10.Name = "serialNrTB10";
+ this.serialNrTB10.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB10.TabIndex = 291;
+ this.serialNrTB10.Visible = false;
+ this.serialNrTB10.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox10_KeyPress);
//
- // textBox11
+ // serialNrTB11
//
- this.textBox11.Enabled = false;
- this.textBox11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox11.Location = new System.Drawing.Point(536, 398);
- this.textBox11.Name = "textBox11";
- this.textBox11.Size = new System.Drawing.Size(197, 23);
- this.textBox11.TabIndex = 292;
- this.textBox11.Visible = false;
- this.textBox11.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox11_KeyPress);
+ this.serialNrTB11.Enabled = false;
+ this.serialNrTB11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB11.Location = new System.Drawing.Point(392, 398);
+ this.serialNrTB11.Name = "serialNrTB11";
+ this.serialNrTB11.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB11.TabIndex = 292;
+ this.serialNrTB11.Visible = false;
+ this.serialNrTB11.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox11_KeyPress);
//
- // textBox12
+ // serialNrTB12
//
- this.textBox12.Enabled = false;
- this.textBox12.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox12.Location = new System.Drawing.Point(536, 427);
- this.textBox12.Name = "textBox12";
- this.textBox12.Size = new System.Drawing.Size(197, 23);
- this.textBox12.TabIndex = 293;
- this.textBox12.Visible = false;
- this.textBox12.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox12_KeyPress);
+ this.serialNrTB12.Enabled = false;
+ this.serialNrTB12.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB12.Location = new System.Drawing.Point(392, 427);
+ this.serialNrTB12.Name = "serialNrTB12";
+ this.serialNrTB12.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB12.TabIndex = 293;
+ this.serialNrTB12.Visible = false;
+ this.serialNrTB12.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox12_KeyPress);
//
- // textBox13
+ // serialNrTB13
//
- this.textBox13.Enabled = false;
- this.textBox13.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox13.Location = new System.Drawing.Point(536, 456);
- this.textBox13.Name = "textBox13";
- this.textBox13.Size = new System.Drawing.Size(197, 23);
- this.textBox13.TabIndex = 294;
- this.textBox13.Visible = false;
- this.textBox13.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox13_KeyPress);
+ this.serialNrTB13.Enabled = false;
+ this.serialNrTB13.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB13.Location = new System.Drawing.Point(392, 456);
+ this.serialNrTB13.Name = "serialNrTB13";
+ this.serialNrTB13.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB13.TabIndex = 294;
+ this.serialNrTB13.Visible = false;
+ this.serialNrTB13.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox13_KeyPress);
//
- // textBox14
+ // serialNrTB14
//
- this.textBox14.Enabled = false;
- this.textBox14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox14.Location = new System.Drawing.Point(536, 485);
- this.textBox14.Name = "textBox14";
- this.textBox14.Size = new System.Drawing.Size(197, 23);
- this.textBox14.TabIndex = 295;
- this.textBox14.Visible = false;
- this.textBox14.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox14_KeyPress);
+ this.serialNrTB14.Enabled = false;
+ this.serialNrTB14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB14.Location = new System.Drawing.Point(392, 485);
+ this.serialNrTB14.Name = "serialNrTB14";
+ this.serialNrTB14.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB14.TabIndex = 295;
+ this.serialNrTB14.Visible = false;
+ this.serialNrTB14.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox14_KeyPress);
//
- // textBox15
+ // serialNrTB15
//
- this.textBox15.Enabled = false;
- this.textBox15.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox15.Location = new System.Drawing.Point(536, 514);
- this.textBox15.Name = "textBox15";
- this.textBox15.Size = new System.Drawing.Size(197, 23);
- this.textBox15.TabIndex = 296;
- this.textBox15.Visible = false;
- this.textBox15.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox15_KeyPress);
+ this.serialNrTB15.Enabled = false;
+ this.serialNrTB15.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB15.Location = new System.Drawing.Point(392, 514);
+ this.serialNrTB15.Name = "serialNrTB15";
+ this.serialNrTB15.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB15.TabIndex = 296;
+ this.serialNrTB15.Visible = false;
+ this.serialNrTB15.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox15_KeyPress);
//
- // textBox16
+ // serialNrTB16
//
- this.textBox16.Enabled = false;
- this.textBox16.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox16.Location = new System.Drawing.Point(536, 543);
- this.textBox16.Name = "textBox16";
- this.textBox16.Size = new System.Drawing.Size(197, 23);
- this.textBox16.TabIndex = 297;
- this.textBox16.Visible = false;
- this.textBox16.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox16_KeyPress);
+ this.serialNrTB16.Enabled = false;
+ this.serialNrTB16.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB16.Location = new System.Drawing.Point(392, 543);
+ this.serialNrTB16.Name = "serialNrTB16";
+ this.serialNrTB16.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB16.TabIndex = 297;
+ this.serialNrTB16.Visible = false;
+ this.serialNrTB16.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox16_KeyPress);
//
- // textBox17
+ // serialNrTB17
//
- this.textBox17.Enabled = false;
- this.textBox17.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox17.Location = new System.Drawing.Point(536, 572);
- this.textBox17.Name = "textBox17";
- this.textBox17.Size = new System.Drawing.Size(197, 23);
- this.textBox17.TabIndex = 298;
- this.textBox17.Visible = false;
- this.textBox17.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox17_KeyPress);
+ this.serialNrTB17.Enabled = false;
+ this.serialNrTB17.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB17.Location = new System.Drawing.Point(392, 572);
+ this.serialNrTB17.Name = "serialNrTB17";
+ this.serialNrTB17.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB17.TabIndex = 298;
+ this.serialNrTB17.Visible = false;
+ this.serialNrTB17.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox17_KeyPress);
//
- // textBox18
+ // serialNrTB18
//
- this.textBox18.Enabled = false;
- this.textBox18.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox18.Location = new System.Drawing.Point(536, 601);
- this.textBox18.Name = "textBox18";
- this.textBox18.Size = new System.Drawing.Size(197, 23);
- this.textBox18.TabIndex = 299;
- this.textBox18.Visible = false;
- this.textBox18.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox18_KeyPress);
+ this.serialNrTB18.Enabled = false;
+ this.serialNrTB18.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB18.Location = new System.Drawing.Point(392, 601);
+ this.serialNrTB18.Name = "serialNrTB18";
+ this.serialNrTB18.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB18.TabIndex = 299;
+ this.serialNrTB18.Visible = false;
+ this.serialNrTB18.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox18_KeyPress);
//
- // textBox19
+ // serialNrTB19
//
- this.textBox19.Enabled = false;
- this.textBox19.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox19.Location = new System.Drawing.Point(536, 630);
- this.textBox19.Name = "textBox19";
- this.textBox19.Size = new System.Drawing.Size(197, 23);
- this.textBox19.TabIndex = 300;
- this.textBox19.Visible = false;
- this.textBox19.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox19_KeyPress);
+ this.serialNrTB19.Enabled = false;
+ this.serialNrTB19.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB19.Location = new System.Drawing.Point(392, 630);
+ this.serialNrTB19.Name = "serialNrTB19";
+ this.serialNrTB19.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB19.TabIndex = 300;
+ this.serialNrTB19.Visible = false;
+ this.serialNrTB19.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox19_KeyPress);
//
- // textBox20
+ // serialNrTB20
//
- this.textBox20.Enabled = false;
- this.textBox20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox20.Location = new System.Drawing.Point(536, 659);
- this.textBox20.Name = "textBox20";
- this.textBox20.Size = new System.Drawing.Size(197, 23);
- this.textBox20.TabIndex = 301;
- this.textBox20.Visible = false;
- this.textBox20.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox20_KeyPress);
+ this.serialNrTB20.Enabled = false;
+ this.serialNrTB20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.serialNrTB20.Location = new System.Drawing.Point(392, 659);
+ this.serialNrTB20.Name = "serialNrTB20";
+ this.serialNrTB20.Size = new System.Drawing.Size(197, 23);
+ this.serialNrTB20.TabIndex = 301;
+ this.serialNrTB20.Visible = false;
+ this.serialNrTB20.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox20_KeyPress);
//
// textBox21
//
this.textBox21.Enabled = false;
this.textBox21.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox21.Location = new System.Drawing.Point(1262, 107);
+ this.textBox21.Location = new System.Drawing.Point(1315, 106);
this.textBox21.Name = "textBox21";
this.textBox21.Size = new System.Drawing.Size(197, 23);
this.textBox21.TabIndex = 302;
@@ -1772,7 +1856,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox22.Enabled = false;
this.textBox22.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox22.Location = new System.Drawing.Point(1262, 136);
+ this.textBox22.Location = new System.Drawing.Point(1315, 135);
this.textBox22.Name = "textBox22";
this.textBox22.Size = new System.Drawing.Size(197, 23);
this.textBox22.TabIndex = 303;
@@ -1783,7 +1867,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox23.Enabled = false;
this.textBox23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox23.Location = new System.Drawing.Point(1262, 166);
+ this.textBox23.Location = new System.Drawing.Point(1315, 165);
this.textBox23.Name = "textBox23";
this.textBox23.Size = new System.Drawing.Size(197, 23);
this.textBox23.TabIndex = 304;
@@ -1794,7 +1878,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox24.Enabled = false;
this.textBox24.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox24.Location = new System.Drawing.Point(1262, 195);
+ this.textBox24.Location = new System.Drawing.Point(1315, 194);
this.textBox24.Name = "textBox24";
this.textBox24.Size = new System.Drawing.Size(197, 23);
this.textBox24.TabIndex = 305;
@@ -1805,7 +1889,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox25.Enabled = false;
this.textBox25.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox25.Location = new System.Drawing.Point(1262, 223);
+ this.textBox25.Location = new System.Drawing.Point(1315, 222);
this.textBox25.Name = "textBox25";
this.textBox25.Size = new System.Drawing.Size(197, 23);
this.textBox25.TabIndex = 306;
@@ -1816,7 +1900,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox26.Enabled = false;
this.textBox26.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox26.Location = new System.Drawing.Point(1262, 251);
+ this.textBox26.Location = new System.Drawing.Point(1315, 250);
this.textBox26.Name = "textBox26";
this.textBox26.Size = new System.Drawing.Size(197, 23);
this.textBox26.TabIndex = 307;
@@ -1827,7 +1911,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox27.Enabled = false;
this.textBox27.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox27.Location = new System.Drawing.Point(1262, 280);
+ this.textBox27.Location = new System.Drawing.Point(1315, 279);
this.textBox27.Name = "textBox27";
this.textBox27.Size = new System.Drawing.Size(197, 23);
this.textBox27.TabIndex = 308;
@@ -1838,7 +1922,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox28.Enabled = false;
this.textBox28.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox28.Location = new System.Drawing.Point(1262, 309);
+ this.textBox28.Location = new System.Drawing.Point(1315, 308);
this.textBox28.Name = "textBox28";
this.textBox28.Size = new System.Drawing.Size(197, 23);
this.textBox28.TabIndex = 309;
@@ -1849,7 +1933,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox29.Enabled = false;
this.textBox29.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox29.Location = new System.Drawing.Point(1262, 338);
+ this.textBox29.Location = new System.Drawing.Point(1315, 337);
this.textBox29.Name = "textBox29";
this.textBox29.Size = new System.Drawing.Size(197, 23);
this.textBox29.TabIndex = 310;
@@ -1860,7 +1944,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox30.Enabled = false;
this.textBox30.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox30.Location = new System.Drawing.Point(1262, 367);
+ this.textBox30.Location = new System.Drawing.Point(1315, 366);
this.textBox30.Name = "textBox30";
this.textBox30.Size = new System.Drawing.Size(197, 23);
this.textBox30.TabIndex = 311;
@@ -1871,7 +1955,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox31.Enabled = false;
this.textBox31.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox31.Location = new System.Drawing.Point(1262, 396);
+ this.textBox31.Location = new System.Drawing.Point(1315, 395);
this.textBox31.Name = "textBox31";
this.textBox31.Size = new System.Drawing.Size(197, 23);
this.textBox31.TabIndex = 312;
@@ -1882,7 +1966,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox32.Enabled = false;
this.textBox32.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox32.Location = new System.Drawing.Point(1262, 425);
+ this.textBox32.Location = new System.Drawing.Point(1315, 424);
this.textBox32.Name = "textBox32";
this.textBox32.Size = new System.Drawing.Size(197, 23);
this.textBox32.TabIndex = 313;
@@ -1893,7 +1977,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox33.Enabled = false;
this.textBox33.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox33.Location = new System.Drawing.Point(1262, 454);
+ this.textBox33.Location = new System.Drawing.Point(1315, 453);
this.textBox33.Name = "textBox33";
this.textBox33.Size = new System.Drawing.Size(197, 23);
this.textBox33.TabIndex = 314;
@@ -1904,7 +1988,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox34.Enabled = false;
this.textBox34.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox34.Location = new System.Drawing.Point(1262, 483);
+ this.textBox34.Location = new System.Drawing.Point(1315, 482);
this.textBox34.Name = "textBox34";
this.textBox34.Size = new System.Drawing.Size(197, 23);
this.textBox34.TabIndex = 315;
@@ -1915,7 +1999,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox35.Enabled = false;
this.textBox35.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox35.Location = new System.Drawing.Point(1262, 512);
+ this.textBox35.Location = new System.Drawing.Point(1315, 511);
this.textBox35.Name = "textBox35";
this.textBox35.Size = new System.Drawing.Size(197, 23);
this.textBox35.TabIndex = 316;
@@ -1926,7 +2010,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox36.Enabled = false;
this.textBox36.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox36.Location = new System.Drawing.Point(1262, 541);
+ this.textBox36.Location = new System.Drawing.Point(1315, 540);
this.textBox36.Name = "textBox36";
this.textBox36.Size = new System.Drawing.Size(197, 23);
this.textBox36.TabIndex = 317;
@@ -1937,7 +2021,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox37.Enabled = false;
this.textBox37.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox37.Location = new System.Drawing.Point(1262, 570);
+ this.textBox37.Location = new System.Drawing.Point(1315, 569);
this.textBox37.Name = "textBox37";
this.textBox37.Size = new System.Drawing.Size(197, 23);
this.textBox37.TabIndex = 318;
@@ -1948,7 +2032,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox38.Enabled = false;
this.textBox38.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox38.Location = new System.Drawing.Point(1262, 599);
+ this.textBox38.Location = new System.Drawing.Point(1315, 598);
this.textBox38.Name = "textBox38";
this.textBox38.Size = new System.Drawing.Size(197, 23);
this.textBox38.TabIndex = 319;
@@ -1959,7 +2043,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox39.Enabled = false;
this.textBox39.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox39.Location = new System.Drawing.Point(1262, 628);
+ this.textBox39.Location = new System.Drawing.Point(1315, 627);
this.textBox39.Name = "textBox39";
this.textBox39.Size = new System.Drawing.Size(197, 23);
this.textBox39.TabIndex = 320;
@@ -1970,58 +2054,60 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.textBox40.Enabled = false;
this.textBox40.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.textBox40.Location = new System.Drawing.Point(1262, 657);
+ this.textBox40.Location = new System.Drawing.Point(1315, 656);
this.textBox40.Name = "textBox40";
this.textBox40.Size = new System.Drawing.Size(197, 23);
this.textBox40.TabIndex = 321;
this.textBox40.Visible = false;
this.textBox40.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox40_KeyPress);
//
- // label1
+ // eRegisterLabel1
//
- this.label1.AutoSize = true;
- this.label1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label1.Location = new System.Drawing.Point(127, 85);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(277, 14);
- this.label1.TabIndex = 322;
- this.label1.Text = "eRegister radio address and PCB number";
+ this.eRegisterLabel1.AutoSize = true;
+ this.eRegisterLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.eRegisterLabel1.Location = new System.Drawing.Point(127, 85);
+ this.eRegisterLabel1.Name = "eRegisterLabel1";
+ this.eRegisterLabel1.Size = new System.Drawing.Size(94, 14);
+ this.eRegisterLabel1.TabIndex = 322;
+ this.eRegisterLabel1.Text = "eRegister Nr.";
//
- // label2
+ // eRegisterLabel2
//
- this.label2.AutoSize = true;
- this.label2.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label2.Location = new System.Drawing.Point(853, 85);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(277, 14);
- this.label2.TabIndex = 323;
- this.label2.Text = "eRegister radio address and PCB number";
+ this.eRegisterLabel2.AutoSize = true;
+ this.eRegisterLabel2.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.eRegisterLabel2.Location = new System.Drawing.Point(1040, 85);
+ this.eRegisterLabel2.Name = "eRegisterLabel2";
+ this.eRegisterLabel2.Size = new System.Drawing.Size(94, 14);
+ this.eRegisterLabel2.TabIndex = 323;
+ this.eRegisterLabel2.Text = "eRegister Nr.";
+ this.eRegisterLabel2.Visible = false;
//
- // label3
+ // housingSnLabel1
//
- this.label3.AutoSize = true;
- this.label3.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label3.Location = new System.Drawing.Point(533, 85);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(111, 14);
- this.label3.TabIndex = 324;
- this.label3.Text = "Brass body S/N";
+ this.housingSnLabel1.AutoSize = true;
+ this.housingSnLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.housingSnLabel1.Location = new System.Drawing.Point(389, 85);
+ this.housingSnLabel1.Name = "housingSnLabel1";
+ this.housingSnLabel1.Size = new System.Drawing.Size(91, 14);
+ this.housingSnLabel1.TabIndex = 324;
+ this.housingSnLabel1.Text = "Housing S/N";
//
- // label4
+ // housingSnLabel2
//
- this.label4.AutoSize = true;
- this.label4.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label4.Location = new System.Drawing.Point(1259, 85);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(111, 14);
- this.label4.TabIndex = 325;
- this.label4.Text = "Brass body S/N";
+ this.housingSnLabel2.AutoSize = true;
+ this.housingSnLabel2.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.housingSnLabel2.Location = new System.Drawing.Point(1312, 84);
+ this.housingSnLabel2.Name = "housingSnLabel2";
+ this.housingSnLabel2.Size = new System.Drawing.Size(91, 14);
+ this.housingSnLabel2.TabIndex = 325;
+ this.housingSnLabel2.Text = "Housing S/N";
+ this.housingSnLabel2.Visible = false;
//
// checkBoxImage40
//
this.checkBoxImage40.Checked = false;
this.checkBoxImage40.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage40.Image")));
- this.checkBoxImage40.Location = new System.Drawing.Point(778, 659);
+ this.checkBoxImage40.Location = new System.Drawing.Point(965, 659);
this.checkBoxImage40.Name = "checkBoxImage40";
this.checkBoxImage40.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage40.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2034,7 +2120,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage39.Checked = false;
this.checkBoxImage39.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage39.Image")));
- this.checkBoxImage39.Location = new System.Drawing.Point(778, 630);
+ this.checkBoxImage39.Location = new System.Drawing.Point(965, 630);
this.checkBoxImage39.Name = "checkBoxImage39";
this.checkBoxImage39.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage39.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2047,7 +2133,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage38.Checked = false;
this.checkBoxImage38.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage38.Image")));
- this.checkBoxImage38.Location = new System.Drawing.Point(778, 601);
+ this.checkBoxImage38.Location = new System.Drawing.Point(965, 601);
this.checkBoxImage38.Name = "checkBoxImage38";
this.checkBoxImage38.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage38.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2060,7 +2146,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage37.Checked = false;
this.checkBoxImage37.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage37.Image")));
- this.checkBoxImage37.Location = new System.Drawing.Point(778, 572);
+ this.checkBoxImage37.Location = new System.Drawing.Point(965, 572);
this.checkBoxImage37.Name = "checkBoxImage37";
this.checkBoxImage37.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage37.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2073,7 +2159,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage36.Checked = false;
this.checkBoxImage36.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage36.Image")));
- this.checkBoxImage36.Location = new System.Drawing.Point(778, 543);
+ this.checkBoxImage36.Location = new System.Drawing.Point(965, 543);
this.checkBoxImage36.Name = "checkBoxImage36";
this.checkBoxImage36.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage36.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2086,7 +2172,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage35.Checked = false;
this.checkBoxImage35.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage35.Image")));
- this.checkBoxImage35.Location = new System.Drawing.Point(778, 514);
+ this.checkBoxImage35.Location = new System.Drawing.Point(965, 514);
this.checkBoxImage35.Name = "checkBoxImage35";
this.checkBoxImage35.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage35.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2099,7 +2185,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage34.Checked = false;
this.checkBoxImage34.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage34.Image")));
- this.checkBoxImage34.Location = new System.Drawing.Point(778, 485);
+ this.checkBoxImage34.Location = new System.Drawing.Point(965, 485);
this.checkBoxImage34.Name = "checkBoxImage34";
this.checkBoxImage34.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage34.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2112,7 +2198,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage33.Checked = false;
this.checkBoxImage33.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage33.Image")));
- this.checkBoxImage33.Location = new System.Drawing.Point(778, 456);
+ this.checkBoxImage33.Location = new System.Drawing.Point(965, 456);
this.checkBoxImage33.Name = "checkBoxImage33";
this.checkBoxImage33.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage33.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2125,7 +2211,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage32.Checked = false;
this.checkBoxImage32.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage32.Image")));
- this.checkBoxImage32.Location = new System.Drawing.Point(778, 427);
+ this.checkBoxImage32.Location = new System.Drawing.Point(965, 427);
this.checkBoxImage32.Name = "checkBoxImage32";
this.checkBoxImage32.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage32.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2138,7 +2224,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage31.Checked = false;
this.checkBoxImage31.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage31.Image")));
- this.checkBoxImage31.Location = new System.Drawing.Point(778, 398);
+ this.checkBoxImage31.Location = new System.Drawing.Point(965, 398);
this.checkBoxImage31.Name = "checkBoxImage31";
this.checkBoxImage31.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage31.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2151,7 +2237,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage30.Checked = false;
this.checkBoxImage30.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage30.Image")));
- this.checkBoxImage30.Location = new System.Drawing.Point(778, 369);
+ this.checkBoxImage30.Location = new System.Drawing.Point(965, 369);
this.checkBoxImage30.Name = "checkBoxImage30";
this.checkBoxImage30.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage30.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2164,7 +2250,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage29.Checked = false;
this.checkBoxImage29.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage29.Image")));
- this.checkBoxImage29.Location = new System.Drawing.Point(778, 340);
+ this.checkBoxImage29.Location = new System.Drawing.Point(965, 340);
this.checkBoxImage29.Name = "checkBoxImage29";
this.checkBoxImage29.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage29.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2177,7 +2263,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage28.Checked = false;
this.checkBoxImage28.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage28.Image")));
- this.checkBoxImage28.Location = new System.Drawing.Point(778, 311);
+ this.checkBoxImage28.Location = new System.Drawing.Point(965, 311);
this.checkBoxImage28.Name = "checkBoxImage28";
this.checkBoxImage28.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage28.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2190,7 +2276,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage27.Checked = false;
this.checkBoxImage27.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage27.Image")));
- this.checkBoxImage27.Location = new System.Drawing.Point(778, 282);
+ this.checkBoxImage27.Location = new System.Drawing.Point(965, 282);
this.checkBoxImage27.Name = "checkBoxImage27";
this.checkBoxImage27.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage27.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2203,7 +2289,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage26.Checked = false;
this.checkBoxImage26.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage26.Image")));
- this.checkBoxImage26.Location = new System.Drawing.Point(778, 253);
+ this.checkBoxImage26.Location = new System.Drawing.Point(965, 253);
this.checkBoxImage26.Name = "checkBoxImage26";
this.checkBoxImage26.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage26.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2216,7 +2302,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage25.Checked = false;
this.checkBoxImage25.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage25.Image")));
- this.checkBoxImage25.Location = new System.Drawing.Point(778, 224);
+ this.checkBoxImage25.Location = new System.Drawing.Point(965, 224);
this.checkBoxImage25.Name = "checkBoxImage25";
this.checkBoxImage25.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage25.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2229,7 +2315,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage24.Checked = false;
this.checkBoxImage24.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage24.Image")));
- this.checkBoxImage24.Location = new System.Drawing.Point(778, 195);
+ this.checkBoxImage24.Location = new System.Drawing.Point(965, 195);
this.checkBoxImage24.Name = "checkBoxImage24";
this.checkBoxImage24.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage24.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2242,7 +2328,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage23.Checked = false;
this.checkBoxImage23.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage23.Image")));
- this.checkBoxImage23.Location = new System.Drawing.Point(778, 167);
+ this.checkBoxImage23.Location = new System.Drawing.Point(965, 167);
this.checkBoxImage23.Name = "checkBoxImage23";
this.checkBoxImage23.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2255,7 +2341,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage22.Checked = false;
this.checkBoxImage22.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage22.Image")));
- this.checkBoxImage22.Location = new System.Drawing.Point(778, 138);
+ this.checkBoxImage22.Location = new System.Drawing.Point(965, 138);
this.checkBoxImage22.Name = "checkBoxImage22";
this.checkBoxImage22.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2268,7 +2354,7 @@ namespace TBF.Rig.TestMethods.S640Communication
//
this.checkBoxImage21.Checked = false;
this.checkBoxImage21.Image = ((System.Drawing.Image)(resources.GetObject("checkBoxImage21.Image")));
- this.checkBoxImage21.Location = new System.Drawing.Point(778, 108);
+ this.checkBoxImage21.Location = new System.Drawing.Point(965, 108);
this.checkBoxImage21.Name = "checkBoxImage21";
this.checkBoxImage21.Size = new System.Drawing.Size(32, 21);
this.checkBoxImage21.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2537,16 +2623,901 @@ namespace TBF.Rig.TestMethods.S640Communication
this.checkBoxImage1.Visible = false;
this.checkBoxImage1.Click += new System.EventHandler(this.checkBoxImage1_Click);
//
+ // radioAddressTB1
+ //
+ this.radioAddressTB1.Enabled = false;
+ this.radioAddressTB1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB1.Location = new System.Drawing.Point(266, 108);
+ this.radioAddressTB1.Name = "radioAddressTB1";
+ this.radioAddressTB1.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB1.TabIndex = 326;
+ this.radioAddressTB1.Visible = false;
+ //
+ // radioAddressTB2
+ //
+ this.radioAddressTB2.Enabled = false;
+ this.radioAddressTB2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB2.Location = new System.Drawing.Point(266, 137);
+ this.radioAddressTB2.Name = "radioAddressTB2";
+ this.radioAddressTB2.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB2.TabIndex = 327;
+ this.radioAddressTB2.Visible = false;
+ //
+ // radioAddressTB3
+ //
+ this.radioAddressTB3.Enabled = false;
+ this.radioAddressTB3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB3.Location = new System.Drawing.Point(266, 166);
+ this.radioAddressTB3.Name = "radioAddressTB3";
+ this.radioAddressTB3.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB3.TabIndex = 328;
+ this.radioAddressTB3.Visible = false;
+ //
+ // radioAddressTB4
+ //
+ this.radioAddressTB4.Enabled = false;
+ this.radioAddressTB4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB4.Location = new System.Drawing.Point(266, 195);
+ this.radioAddressTB4.Name = "radioAddressTB4";
+ this.radioAddressTB4.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB4.TabIndex = 329;
+ this.radioAddressTB4.Visible = false;
+ //
+ // radioAddressTB5
+ //
+ this.radioAddressTB5.Enabled = false;
+ this.radioAddressTB5.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB5.Location = new System.Drawing.Point(266, 224);
+ this.radioAddressTB5.Name = "radioAddressTB5";
+ this.radioAddressTB5.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB5.TabIndex = 330;
+ this.radioAddressTB5.Visible = false;
+ //
+ // radioAddressTB6
+ //
+ this.radioAddressTB6.Enabled = false;
+ this.radioAddressTB6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB6.Location = new System.Drawing.Point(266, 253);
+ this.radioAddressTB6.Name = "radioAddressTB6";
+ this.radioAddressTB6.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB6.TabIndex = 331;
+ this.radioAddressTB6.Visible = false;
+ //
+ // radioAddressTB7
+ //
+ this.radioAddressTB7.Enabled = false;
+ this.radioAddressTB7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB7.Location = new System.Drawing.Point(266, 282);
+ this.radioAddressTB7.Name = "radioAddressTB7";
+ this.radioAddressTB7.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB7.TabIndex = 332;
+ this.radioAddressTB7.Visible = false;
+ //
+ // radioAddressTB8
+ //
+ this.radioAddressTB8.Enabled = false;
+ this.radioAddressTB8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB8.Location = new System.Drawing.Point(266, 311);
+ this.radioAddressTB8.Name = "radioAddressTB8";
+ this.radioAddressTB8.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB8.TabIndex = 333;
+ this.radioAddressTB8.Visible = false;
+ //
+ // radioAddressTB9
+ //
+ this.radioAddressTB9.Enabled = false;
+ this.radioAddressTB9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB9.Location = new System.Drawing.Point(266, 340);
+ this.radioAddressTB9.Name = "radioAddressTB9";
+ this.radioAddressTB9.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB9.TabIndex = 334;
+ this.radioAddressTB9.Visible = false;
+ //
+ // radioAddressTB10
+ //
+ this.radioAddressTB10.Enabled = false;
+ this.radioAddressTB10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB10.Location = new System.Drawing.Point(266, 369);
+ this.radioAddressTB10.Name = "radioAddressTB10";
+ this.radioAddressTB10.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB10.TabIndex = 335;
+ this.radioAddressTB10.Visible = false;
+ //
+ // radioAddressTB11
+ //
+ this.radioAddressTB11.Enabled = false;
+ this.radioAddressTB11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB11.Location = new System.Drawing.Point(266, 399);
+ this.radioAddressTB11.Name = "radioAddressTB11";
+ this.radioAddressTB11.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB11.TabIndex = 336;
+ this.radioAddressTB11.Visible = false;
+ //
+ // radioAddressTB12
+ //
+ this.radioAddressTB12.Enabled = false;
+ this.radioAddressTB12.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB12.Location = new System.Drawing.Point(266, 428);
+ this.radioAddressTB12.Name = "radioAddressTB12";
+ this.radioAddressTB12.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB12.TabIndex = 337;
+ this.radioAddressTB12.Visible = false;
+ //
+ // radioAddressTB13
+ //
+ this.radioAddressTB13.Enabled = false;
+ this.radioAddressTB13.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB13.Location = new System.Drawing.Point(266, 456);
+ this.radioAddressTB13.Name = "radioAddressTB13";
+ this.radioAddressTB13.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB13.TabIndex = 338;
+ this.radioAddressTB13.Visible = false;
+ //
+ // radioAddressTB14
+ //
+ this.radioAddressTB14.Enabled = false;
+ this.radioAddressTB14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB14.Location = new System.Drawing.Point(266, 484);
+ this.radioAddressTB14.Name = "radioAddressTB14";
+ this.radioAddressTB14.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB14.TabIndex = 339;
+ this.radioAddressTB14.Visible = false;
+ //
+ // radioAddressTB15
+ //
+ this.radioAddressTB15.Enabled = false;
+ this.radioAddressTB15.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB15.Location = new System.Drawing.Point(266, 514);
+ this.radioAddressTB15.Name = "radioAddressTB15";
+ this.radioAddressTB15.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB15.TabIndex = 340;
+ this.radioAddressTB15.Visible = false;
+ //
+ // radioAddressTB16
+ //
+ this.radioAddressTB16.Enabled = false;
+ this.radioAddressTB16.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB16.Location = new System.Drawing.Point(266, 543);
+ this.radioAddressTB16.Name = "radioAddressTB16";
+ this.radioAddressTB16.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB16.TabIndex = 341;
+ this.radioAddressTB16.Visible = false;
+ //
+ // radioAddressTB17
+ //
+ this.radioAddressTB17.Enabled = false;
+ this.radioAddressTB17.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB17.Location = new System.Drawing.Point(266, 572);
+ this.radioAddressTB17.Name = "radioAddressTB17";
+ this.radioAddressTB17.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB17.TabIndex = 342;
+ this.radioAddressTB17.Visible = false;
+ //
+ // radioAddressTB18
+ //
+ this.radioAddressTB18.Enabled = false;
+ this.radioAddressTB18.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB18.Location = new System.Drawing.Point(266, 601);
+ this.radioAddressTB18.Name = "radioAddressTB18";
+ this.radioAddressTB18.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB18.TabIndex = 343;
+ this.radioAddressTB18.Visible = false;
+ //
+ // radioAddressTB19
+ //
+ this.radioAddressTB19.Enabled = false;
+ this.radioAddressTB19.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB19.Location = new System.Drawing.Point(266, 630);
+ this.radioAddressTB19.Name = "radioAddressTB19";
+ this.radioAddressTB19.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB19.TabIndex = 344;
+ this.radioAddressTB19.Visible = false;
+ //
+ // radioAddressTB20
+ //
+ this.radioAddressTB20.Enabled = false;
+ this.radioAddressTB20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB20.Location = new System.Drawing.Point(266, 659);
+ this.radioAddressTB20.Name = "radioAddressTB20";
+ this.radioAddressTB20.Size = new System.Drawing.Size(120, 23);
+ this.radioAddressTB20.TabIndex = 345;
+ this.radioAddressTB20.Visible = false;
+ //
+ // radioAddressLabel1
+ //
+ this.radioAddressLabel1.AutoSize = true;
+ this.radioAddressLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressLabel1.Location = new System.Drawing.Point(263, 85);
+ this.radioAddressLabel1.Name = "radioAddressLabel1";
+ this.radioAddressLabel1.Size = new System.Drawing.Size(100, 14);
+ this.radioAddressLabel1.TabIndex = 346;
+ this.radioAddressLabel1.Text = "Radio address";
+ //
+ // assignedSNLabel1
+ //
+ this.assignedSNLabel1.AutoSize = true;
+ this.assignedSNLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSNLabel1.Location = new System.Drawing.Point(618, 85);
+ this.assignedSNLabel1.Name = "assignedSNLabel1";
+ this.assignedSNLabel1.Size = new System.Drawing.Size(97, 14);
+ this.assignedSNLabel1.TabIndex = 347;
+ this.assignedSNLabel1.Text = "Assigned S/N";
+ //
+ // assignedRadioAddressLabel1
+ //
+ this.assignedRadioAddressLabel1.AutoSize = true;
+ this.assignedRadioAddressLabel1.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadioAddressLabel1.Location = new System.Drawing.Point(764, 85);
+ this.assignedRadioAddressLabel1.Name = "assignedRadioAddressLabel1";
+ this.assignedRadioAddressLabel1.Size = new System.Drawing.Size(131, 14);
+ this.assignedRadioAddressLabel1.TabIndex = 348;
+ this.assignedRadioAddressLabel1.Text = "New radio address";
+ //
+ // assignedRadAddrTB20
+ //
+ this.assignedRadAddrTB20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB20.Location = new System.Drawing.Point(767, 659);
+ this.assignedRadAddrTB20.Name = "assignedRadAddrTB20";
+ this.assignedRadAddrTB20.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB20.TabIndex = 388;
+ this.assignedRadAddrTB20.Visible = false;
+ //
+ // assignedRadAddrTB19
+ //
+ this.assignedRadAddrTB19.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB19.Location = new System.Drawing.Point(767, 630);
+ this.assignedRadAddrTB19.Name = "assignedRadAddrTB19";
+ this.assignedRadAddrTB19.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB19.TabIndex = 387;
+ this.assignedRadAddrTB19.Visible = false;
+ //
+ // assignedRadAddrTB18
+ //
+ this.assignedRadAddrTB18.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB18.Location = new System.Drawing.Point(767, 601);
+ this.assignedRadAddrTB18.Name = "assignedRadAddrTB18";
+ this.assignedRadAddrTB18.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB18.TabIndex = 386;
+ this.assignedRadAddrTB18.Visible = false;
+ //
+ // assignedRadAddrTB17
+ //
+ this.assignedRadAddrTB17.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB17.Location = new System.Drawing.Point(767, 572);
+ this.assignedRadAddrTB17.Name = "assignedRadAddrTB17";
+ this.assignedRadAddrTB17.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB17.TabIndex = 385;
+ this.assignedRadAddrTB17.Visible = false;
+ //
+ // assignedRadAddrTB16
+ //
+ this.assignedRadAddrTB16.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB16.Location = new System.Drawing.Point(767, 543);
+ this.assignedRadAddrTB16.Name = "assignedRadAddrTB16";
+ this.assignedRadAddrTB16.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB16.TabIndex = 384;
+ this.assignedRadAddrTB16.Visible = false;
+ //
+ // assignedRadAddrTB15
+ //
+ this.assignedRadAddrTB15.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB15.Location = new System.Drawing.Point(767, 514);
+ this.assignedRadAddrTB15.Name = "assignedRadAddrTB15";
+ this.assignedRadAddrTB15.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB15.TabIndex = 383;
+ this.assignedRadAddrTB15.Visible = false;
+ //
+ // assignedRadAddrTB14
+ //
+ this.assignedRadAddrTB14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB14.Location = new System.Drawing.Point(767, 484);
+ this.assignedRadAddrTB14.Name = "assignedRadAddrTB14";
+ this.assignedRadAddrTB14.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB14.TabIndex = 382;
+ this.assignedRadAddrTB14.Visible = false;
+ //
+ // assignedRadAddrTB13
+ //
+ this.assignedRadAddrTB13.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB13.Location = new System.Drawing.Point(767, 456);
+ this.assignedRadAddrTB13.Name = "assignedRadAddrTB13";
+ this.assignedRadAddrTB13.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB13.TabIndex = 381;
+ this.assignedRadAddrTB13.Visible = false;
+ //
+ // assignedRadAddrTB12
+ //
+ this.assignedRadAddrTB12.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB12.Location = new System.Drawing.Point(767, 428);
+ this.assignedRadAddrTB12.Name = "assignedRadAddrTB12";
+ this.assignedRadAddrTB12.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB12.TabIndex = 380;
+ this.assignedRadAddrTB12.Visible = false;
+ //
+ // assignedRadAddrTB11
+ //
+ this.assignedRadAddrTB11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB11.Location = new System.Drawing.Point(767, 399);
+ this.assignedRadAddrTB11.Name = "assignedRadAddrTB11";
+ this.assignedRadAddrTB11.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB11.TabIndex = 379;
+ this.assignedRadAddrTB11.Visible = false;
+ //
+ // assignedRadAddrTB10
+ //
+ this.assignedRadAddrTB10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB10.Location = new System.Drawing.Point(767, 369);
+ this.assignedRadAddrTB10.Name = "assignedRadAddrTB10";
+ this.assignedRadAddrTB10.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB10.TabIndex = 378;
+ this.assignedRadAddrTB10.Visible = false;
+ //
+ // assignedRadAddrTB9
+ //
+ this.assignedRadAddrTB9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB9.Location = new System.Drawing.Point(767, 340);
+ this.assignedRadAddrTB9.Name = "assignedRadAddrTB9";
+ this.assignedRadAddrTB9.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB9.TabIndex = 377;
+ this.assignedRadAddrTB9.Visible = false;
+ //
+ // assignedRadAddrTB8
+ //
+ this.assignedRadAddrTB8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB8.Location = new System.Drawing.Point(767, 311);
+ this.assignedRadAddrTB8.Name = "assignedRadAddrTB8";
+ this.assignedRadAddrTB8.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB8.TabIndex = 376;
+ this.assignedRadAddrTB8.Visible = false;
+ //
+ // assignedRadAddrTB7
+ //
+ this.assignedRadAddrTB7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB7.Location = new System.Drawing.Point(767, 282);
+ this.assignedRadAddrTB7.Name = "assignedRadAddrTB7";
+ this.assignedRadAddrTB7.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB7.TabIndex = 375;
+ this.assignedRadAddrTB7.Visible = false;
+ //
+ // assignedRadAddrTB6
+ //
+ this.assignedRadAddrTB6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB6.Location = new System.Drawing.Point(767, 253);
+ this.assignedRadAddrTB6.Name = "assignedRadAddrTB6";
+ this.assignedRadAddrTB6.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB6.TabIndex = 374;
+ this.assignedRadAddrTB6.Visible = false;
+ //
+ // assignedRadAddrTB5
+ //
+ this.assignedRadAddrTB5.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB5.Location = new System.Drawing.Point(767, 224);
+ this.assignedRadAddrTB5.Name = "assignedRadAddrTB5";
+ this.assignedRadAddrTB5.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB5.TabIndex = 373;
+ this.assignedRadAddrTB5.Visible = false;
+ //
+ // assignedRadAddrTB4
+ //
+ this.assignedRadAddrTB4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB4.Location = new System.Drawing.Point(767, 195);
+ this.assignedRadAddrTB4.Name = "assignedRadAddrTB4";
+ this.assignedRadAddrTB4.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB4.TabIndex = 372;
+ this.assignedRadAddrTB4.Visible = false;
+ //
+ // assignedRadAddrTB3
+ //
+ this.assignedRadAddrTB3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB3.Location = new System.Drawing.Point(767, 166);
+ this.assignedRadAddrTB3.Name = "assignedRadAddrTB3";
+ this.assignedRadAddrTB3.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB3.TabIndex = 371;
+ this.assignedRadAddrTB3.Visible = false;
+ //
+ // assignedRadAddrTB2
+ //
+ this.assignedRadAddrTB2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB2.Location = new System.Drawing.Point(767, 137);
+ this.assignedRadAddrTB2.Name = "assignedRadAddrTB2";
+ this.assignedRadAddrTB2.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB2.TabIndex = 370;
+ this.assignedRadAddrTB2.Visible = false;
+ //
+ // assignedRadAddrTB1
+ //
+ this.assignedRadAddrTB1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedRadAddrTB1.Location = new System.Drawing.Point(767, 108);
+ this.assignedRadAddrTB1.Name = "assignedRadAddrTB1";
+ this.assignedRadAddrTB1.Size = new System.Drawing.Size(130, 23);
+ this.assignedRadAddrTB1.TabIndex = 369;
+ this.assignedRadAddrTB1.Visible = false;
+ //
+ // assignedSnTB20
+ //
+ this.assignedSnTB20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB20.Location = new System.Drawing.Point(621, 659);
+ this.assignedSnTB20.Name = "assignedSnTB20";
+ this.assignedSnTB20.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB20.TabIndex = 368;
+ this.assignedSnTB20.Visible = false;
+ //
+ // assignedSnTB19
+ //
+ this.assignedSnTB19.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB19.Location = new System.Drawing.Point(621, 630);
+ this.assignedSnTB19.Name = "assignedSnTB19";
+ this.assignedSnTB19.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB19.TabIndex = 367;
+ this.assignedSnTB19.Visible = false;
+ //
+ // assignedSnTB18
+ //
+ this.assignedSnTB18.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB18.Location = new System.Drawing.Point(621, 601);
+ this.assignedSnTB18.Name = "assignedSnTB18";
+ this.assignedSnTB18.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB18.TabIndex = 362;
+ this.assignedSnTB18.Visible = false;
+ //
+ // assignedSnTB17
+ //
+ this.assignedSnTB17.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB17.Location = new System.Drawing.Point(621, 572);
+ this.assignedSnTB17.Name = "assignedSnTB17";
+ this.assignedSnTB17.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB17.TabIndex = 361;
+ this.assignedSnTB17.Visible = false;
+ //
+ // assignedSnTB16
+ //
+ this.assignedSnTB16.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB16.Location = new System.Drawing.Point(621, 543);
+ this.assignedSnTB16.Name = "assignedSnTB16";
+ this.assignedSnTB16.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB16.TabIndex = 365;
+ this.assignedSnTB16.Visible = false;
+ //
+ // assignedSnTB15
+ //
+ this.assignedSnTB15.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB15.Location = new System.Drawing.Point(621, 514);
+ this.assignedSnTB15.Name = "assignedSnTB15";
+ this.assignedSnTB15.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB15.TabIndex = 366;
+ this.assignedSnTB15.Visible = false;
+ //
+ // assignedSnTB14
+ //
+ this.assignedSnTB14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB14.Location = new System.Drawing.Point(621, 485);
+ this.assignedSnTB14.Name = "assignedSnTB14";
+ this.assignedSnTB14.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB14.TabIndex = 363;
+ this.assignedSnTB14.Visible = false;
+ //
+ // assignedSnTB13
+ //
+ this.assignedSnTB13.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB13.Location = new System.Drawing.Point(621, 456);
+ this.assignedSnTB13.Name = "assignedSnTB13";
+ this.assignedSnTB13.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB13.TabIndex = 364;
+ this.assignedSnTB13.Visible = false;
+ //
+ // assignedSnTB12
+ //
+ this.assignedSnTB12.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB12.Location = new System.Drawing.Point(621, 427);
+ this.assignedSnTB12.Name = "assignedSnTB12";
+ this.assignedSnTB12.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB12.TabIndex = 360;
+ this.assignedSnTB12.Visible = false;
+ //
+ // assignedSnTB11
+ //
+ this.assignedSnTB11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB11.Location = new System.Drawing.Point(621, 398);
+ this.assignedSnTB11.Name = "assignedSnTB11";
+ this.assignedSnTB11.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB11.TabIndex = 359;
+ this.assignedSnTB11.Visible = false;
+ //
+ // assignedSnTB10
+ //
+ this.assignedSnTB10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB10.Location = new System.Drawing.Point(621, 369);
+ this.assignedSnTB10.Name = "assignedSnTB10";
+ this.assignedSnTB10.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB10.TabIndex = 358;
+ this.assignedSnTB10.Visible = false;
+ //
+ // assignedSnTB9
+ //
+ this.assignedSnTB9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB9.Location = new System.Drawing.Point(621, 340);
+ this.assignedSnTB9.Name = "assignedSnTB9";
+ this.assignedSnTB9.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB9.TabIndex = 357;
+ this.assignedSnTB9.Visible = false;
+ //
+ // assignedSnTB8
+ //
+ this.assignedSnTB8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB8.Location = new System.Drawing.Point(621, 311);
+ this.assignedSnTB8.Name = "assignedSnTB8";
+ this.assignedSnTB8.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB8.TabIndex = 356;
+ this.assignedSnTB8.Visible = false;
+ //
+ // assignedSnTB7
+ //
+ this.assignedSnTB7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB7.Location = new System.Drawing.Point(621, 282);
+ this.assignedSnTB7.Name = "assignedSnTB7";
+ this.assignedSnTB7.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB7.TabIndex = 355;
+ this.assignedSnTB7.Visible = false;
+ //
+ // assignedSnTB6
+ //
+ this.assignedSnTB6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB6.Location = new System.Drawing.Point(621, 253);
+ this.assignedSnTB6.Name = "assignedSnTB6";
+ this.assignedSnTB6.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB6.TabIndex = 350;
+ this.assignedSnTB6.Visible = false;
+ //
+ // assignedSnTB5
+ //
+ this.assignedSnTB5.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB5.Location = new System.Drawing.Point(621, 224);
+ this.assignedSnTB5.Name = "assignedSnTB5";
+ this.assignedSnTB5.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB5.TabIndex = 351;
+ this.assignedSnTB5.Visible = false;
+ //
+ // assignedSnTB4
+ //
+ this.assignedSnTB4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB4.Location = new System.Drawing.Point(621, 195);
+ this.assignedSnTB4.Name = "assignedSnTB4";
+ this.assignedSnTB4.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB4.TabIndex = 354;
+ this.assignedSnTB4.Visible = false;
+ //
+ // assignedSnTB3
+ //
+ this.assignedSnTB3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB3.Location = new System.Drawing.Point(621, 166);
+ this.assignedSnTB3.Name = "assignedSnTB3";
+ this.assignedSnTB3.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB3.TabIndex = 353;
+ this.assignedSnTB3.Visible = false;
+ //
+ // assignedSnTB2
+ //
+ this.assignedSnTB2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB2.Location = new System.Drawing.Point(621, 137);
+ this.assignedSnTB2.Name = "assignedSnTB2";
+ this.assignedSnTB2.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB2.TabIndex = 352;
+ this.assignedSnTB2.Visible = false;
+ //
+ // assignedSnTB1
+ //
+ this.assignedSnTB1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.assignedSnTB1.Location = new System.Drawing.Point(621, 108);
+ this.assignedSnTB1.Name = "assignedSnTB1";
+ this.assignedSnTB1.Size = new System.Drawing.Size(140, 23);
+ this.assignedSnTB1.TabIndex = 349;
+ this.assignedSnTB1.Visible = false;
+ //
+ // radioAddressLabel2
+ //
+ this.radioAddressLabel2.AutoSize = true;
+ this.radioAddressLabel2.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressLabel2.Location = new System.Drawing.Point(1176, 83);
+ this.radioAddressLabel2.Name = "radioAddressLabel2";
+ this.radioAddressLabel2.Size = new System.Drawing.Size(100, 14);
+ this.radioAddressLabel2.TabIndex = 409;
+ this.radioAddressLabel2.Text = "Radio address";
+ this.radioAddressLabel2.Visible = false;
+ //
+ // radioAddressTB40
+ //
+ this.radioAddressTB40.Enabled = false;
+ this.radioAddressTB40.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB40.Location = new System.Drawing.Point(1179, 657);
+ this.radioAddressTB40.Name = "radioAddressTB40";
+ this.radioAddressTB40.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB40.TabIndex = 408;
+ this.radioAddressTB40.Visible = false;
+ //
+ // radioAddressTB39
+ //
+ this.radioAddressTB39.Enabled = false;
+ this.radioAddressTB39.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB39.Location = new System.Drawing.Point(1179, 628);
+ this.radioAddressTB39.Name = "radioAddressTB39";
+ this.radioAddressTB39.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB39.TabIndex = 407;
+ this.radioAddressTB39.Visible = false;
+ //
+ // radioAddressTB38
+ //
+ this.radioAddressTB38.Enabled = false;
+ this.radioAddressTB38.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB38.Location = new System.Drawing.Point(1179, 599);
+ this.radioAddressTB38.Name = "radioAddressTB38";
+ this.radioAddressTB38.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB38.TabIndex = 406;
+ this.radioAddressTB38.Visible = false;
+ //
+ // radioAddressTB37
+ //
+ this.radioAddressTB37.Enabled = false;
+ this.radioAddressTB37.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB37.Location = new System.Drawing.Point(1179, 570);
+ this.radioAddressTB37.Name = "radioAddressTB37";
+ this.radioAddressTB37.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB37.TabIndex = 405;
+ this.radioAddressTB37.Visible = false;
+ //
+ // radioAddressTB36
+ //
+ this.radioAddressTB36.Enabled = false;
+ this.radioAddressTB36.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB36.Location = new System.Drawing.Point(1179, 541);
+ this.radioAddressTB36.Name = "radioAddressTB36";
+ this.radioAddressTB36.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB36.TabIndex = 404;
+ this.radioAddressTB36.Visible = false;
+ //
+ // radioAddressTB35
+ //
+ this.radioAddressTB35.Enabled = false;
+ this.radioAddressTB35.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB35.Location = new System.Drawing.Point(1179, 512);
+ this.radioAddressTB35.Name = "radioAddressTB35";
+ this.radioAddressTB35.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB35.TabIndex = 403;
+ this.radioAddressTB35.Visible = false;
+ //
+ // radioAddressTB34
+ //
+ this.radioAddressTB34.Enabled = false;
+ this.radioAddressTB34.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB34.Location = new System.Drawing.Point(1179, 482);
+ this.radioAddressTB34.Name = "radioAddressTB34";
+ this.radioAddressTB34.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB34.TabIndex = 402;
+ this.radioAddressTB34.Visible = false;
+ //
+ // radioAddressTB33
+ //
+ this.radioAddressTB33.Enabled = false;
+ this.radioAddressTB33.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB33.Location = new System.Drawing.Point(1179, 454);
+ this.radioAddressTB33.Name = "radioAddressTB33";
+ this.radioAddressTB33.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB33.TabIndex = 401;
+ this.radioAddressTB33.Visible = false;
+ //
+ // radioAddressTB32
+ //
+ this.radioAddressTB32.Enabled = false;
+ this.radioAddressTB32.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB32.Location = new System.Drawing.Point(1179, 426);
+ this.radioAddressTB32.Name = "radioAddressTB32";
+ this.radioAddressTB32.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB32.TabIndex = 400;
+ this.radioAddressTB32.Visible = false;
+ //
+ // radioAddressTB31
+ //
+ this.radioAddressTB31.Enabled = false;
+ this.radioAddressTB31.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB31.Location = new System.Drawing.Point(1179, 397);
+ this.radioAddressTB31.Name = "radioAddressTB31";
+ this.radioAddressTB31.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB31.TabIndex = 399;
+ this.radioAddressTB31.Visible = false;
+ //
+ // radioAddressTB30
+ //
+ this.radioAddressTB30.Enabled = false;
+ this.radioAddressTB30.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB30.Location = new System.Drawing.Point(1179, 367);
+ this.radioAddressTB30.Name = "radioAddressTB30";
+ this.radioAddressTB30.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB30.TabIndex = 398;
+ this.radioAddressTB30.Visible = false;
+ //
+ // radioAddressTB29
+ //
+ this.radioAddressTB29.Enabled = false;
+ this.radioAddressTB29.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB29.Location = new System.Drawing.Point(1179, 338);
+ this.radioAddressTB29.Name = "radioAddressTB29";
+ this.radioAddressTB29.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB29.TabIndex = 397;
+ this.radioAddressTB29.Visible = false;
+ //
+ // radioAddressTB28
+ //
+ this.radioAddressTB28.Enabled = false;
+ this.radioAddressTB28.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB28.Location = new System.Drawing.Point(1179, 309);
+ this.radioAddressTB28.Name = "radioAddressTB28";
+ this.radioAddressTB28.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB28.TabIndex = 396;
+ this.radioAddressTB28.Visible = false;
+ //
+ // radioAddressTB27
+ //
+ this.radioAddressTB27.Enabled = false;
+ this.radioAddressTB27.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB27.Location = new System.Drawing.Point(1179, 280);
+ this.radioAddressTB27.Name = "radioAddressTB27";
+ this.radioAddressTB27.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB27.TabIndex = 395;
+ this.radioAddressTB27.Visible = false;
+ //
+ // radioAddressTB26
+ //
+ this.radioAddressTB26.Enabled = false;
+ this.radioAddressTB26.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB26.Location = new System.Drawing.Point(1179, 251);
+ this.radioAddressTB26.Name = "radioAddressTB26";
+ this.radioAddressTB26.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB26.TabIndex = 394;
+ this.radioAddressTB26.Visible = false;
+ //
+ // radioAddressTB25
+ //
+ this.radioAddressTB25.Enabled = false;
+ this.radioAddressTB25.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB25.Location = new System.Drawing.Point(1179, 222);
+ this.radioAddressTB25.Name = "radioAddressTB25";
+ this.radioAddressTB25.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB25.TabIndex = 393;
+ this.radioAddressTB25.Visible = false;
+ //
+ // radioAddressTB24
+ //
+ this.radioAddressTB24.Enabled = false;
+ this.radioAddressTB24.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB24.Location = new System.Drawing.Point(1179, 193);
+ this.radioAddressTB24.Name = "radioAddressTB24";
+ this.radioAddressTB24.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB24.TabIndex = 392;
+ this.radioAddressTB24.Visible = false;
+ //
+ // radioAddressTB23
+ //
+ this.radioAddressTB23.Enabled = false;
+ this.radioAddressTB23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB23.Location = new System.Drawing.Point(1179, 164);
+ this.radioAddressTB23.Name = "radioAddressTB23";
+ this.radioAddressTB23.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB23.TabIndex = 391;
+ this.radioAddressTB23.Visible = false;
+ //
+ // radioAddressTB22
+ //
+ this.radioAddressTB22.Enabled = false;
+ this.radioAddressTB22.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB22.Location = new System.Drawing.Point(1179, 135);
+ this.radioAddressTB22.Name = "radioAddressTB22";
+ this.radioAddressTB22.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB22.TabIndex = 390;
+ this.radioAddressTB22.Visible = false;
+ //
+ // radioAddressTB21
+ //
+ this.radioAddressTB21.Enabled = false;
+ this.radioAddressTB21.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.radioAddressTB21.Location = new System.Drawing.Point(1179, 106);
+ this.radioAddressTB21.Name = "radioAddressTB21";
+ this.radioAddressTB21.Size = new System.Drawing.Size(130, 23);
+ this.radioAddressTB21.TabIndex = 389;
+ this.radioAddressTB21.Visible = false;
+ //
// S640CommForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGray;
- this.ClientSize = new System.Drawing.Size(1484, 867);
- this.Controls.Add(this.label4);
- this.Controls.Add(this.label3);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.label1);
+ this.ClientSize = new System.Drawing.Size(1388, 867);
+ this.Controls.Add(this.radioAddressLabel2);
+ this.Controls.Add(this.radioAddressTB40);
+ this.Controls.Add(this.radioAddressTB39);
+ this.Controls.Add(this.radioAddressTB38);
+ this.Controls.Add(this.radioAddressTB37);
+ this.Controls.Add(this.radioAddressTB36);
+ this.Controls.Add(this.radioAddressTB35);
+ this.Controls.Add(this.radioAddressTB34);
+ this.Controls.Add(this.radioAddressTB33);
+ this.Controls.Add(this.radioAddressTB32);
+ this.Controls.Add(this.radioAddressTB31);
+ this.Controls.Add(this.radioAddressTB30);
+ this.Controls.Add(this.radioAddressTB29);
+ this.Controls.Add(this.radioAddressTB28);
+ this.Controls.Add(this.radioAddressTB27);
+ this.Controls.Add(this.radioAddressTB26);
+ this.Controls.Add(this.radioAddressTB25);
+ this.Controls.Add(this.radioAddressTB24);
+ this.Controls.Add(this.radioAddressTB23);
+ this.Controls.Add(this.radioAddressTB22);
+ this.Controls.Add(this.radioAddressTB21);
+ this.Controls.Add(this.assignedRadAddrTB20);
+ this.Controls.Add(this.assignedRadAddrTB19);
+ this.Controls.Add(this.assignedRadAddrTB18);
+ this.Controls.Add(this.assignedRadAddrTB17);
+ this.Controls.Add(this.assignedRadAddrTB16);
+ this.Controls.Add(this.assignedRadAddrTB15);
+ this.Controls.Add(this.assignedRadAddrTB14);
+ this.Controls.Add(this.assignedRadAddrTB13);
+ this.Controls.Add(this.assignedRadAddrTB12);
+ this.Controls.Add(this.assignedRadAddrTB11);
+ this.Controls.Add(this.assignedRadAddrTB10);
+ this.Controls.Add(this.assignedRadAddrTB9);
+ this.Controls.Add(this.assignedRadAddrTB8);
+ this.Controls.Add(this.assignedRadAddrTB7);
+ this.Controls.Add(this.assignedRadAddrTB6);
+ this.Controls.Add(this.assignedRadAddrTB5);
+ this.Controls.Add(this.assignedRadAddrTB4);
+ this.Controls.Add(this.assignedRadAddrTB3);
+ this.Controls.Add(this.assignedRadAddrTB2);
+ this.Controls.Add(this.assignedRadAddrTB1);
+ this.Controls.Add(this.assignedSnTB20);
+ this.Controls.Add(this.assignedSnTB19);
+ this.Controls.Add(this.assignedSnTB18);
+ this.Controls.Add(this.assignedSnTB17);
+ this.Controls.Add(this.assignedSnTB16);
+ this.Controls.Add(this.assignedSnTB15);
+ this.Controls.Add(this.assignedSnTB14);
+ this.Controls.Add(this.assignedSnTB13);
+ this.Controls.Add(this.assignedSnTB12);
+ this.Controls.Add(this.assignedSnTB11);
+ this.Controls.Add(this.assignedSnTB10);
+ this.Controls.Add(this.assignedSnTB9);
+ this.Controls.Add(this.assignedSnTB8);
+ this.Controls.Add(this.assignedSnTB7);
+ this.Controls.Add(this.assignedSnTB6);
+ this.Controls.Add(this.assignedSnTB5);
+ this.Controls.Add(this.assignedSnTB4);
+ this.Controls.Add(this.assignedSnTB3);
+ this.Controls.Add(this.assignedSnTB2);
+ this.Controls.Add(this.assignedSnTB1);
+ this.Controls.Add(this.assignedRadioAddressLabel1);
+ this.Controls.Add(this.assignedSNLabel1);
+ this.Controls.Add(this.radioAddressLabel1);
+ this.Controls.Add(this.radioAddressTB20);
+ this.Controls.Add(this.radioAddressTB19);
+ this.Controls.Add(this.radioAddressTB18);
+ this.Controls.Add(this.radioAddressTB17);
+ this.Controls.Add(this.radioAddressTB16);
+ this.Controls.Add(this.radioAddressTB15);
+ this.Controls.Add(this.radioAddressTB14);
+ this.Controls.Add(this.radioAddressTB13);
+ this.Controls.Add(this.radioAddressTB12);
+ this.Controls.Add(this.radioAddressTB11);
+ this.Controls.Add(this.radioAddressTB10);
+ this.Controls.Add(this.radioAddressTB9);
+ this.Controls.Add(this.radioAddressTB8);
+ this.Controls.Add(this.radioAddressTB7);
+ this.Controls.Add(this.radioAddressTB6);
+ this.Controls.Add(this.radioAddressTB5);
+ this.Controls.Add(this.radioAddressTB4);
+ this.Controls.Add(this.radioAddressTB3);
+ this.Controls.Add(this.radioAddressTB2);
+ this.Controls.Add(this.radioAddressTB1);
+ this.Controls.Add(this.housingSnLabel2);
+ this.Controls.Add(this.housingSnLabel1);
+ this.Controls.Add(this.eRegisterLabel2);
+ this.Controls.Add(this.eRegisterLabel1);
this.Controls.Add(this.textBox40);
this.Controls.Add(this.textBox39);
this.Controls.Add(this.textBox38);
@@ -2567,26 +3538,26 @@ namespace TBF.Rig.TestMethods.S640Communication
this.Controls.Add(this.textBox23);
this.Controls.Add(this.textBox22);
this.Controls.Add(this.textBox21);
- this.Controls.Add(this.textBox20);
- this.Controls.Add(this.textBox19);
- this.Controls.Add(this.textBox18);
- this.Controls.Add(this.textBox17);
- this.Controls.Add(this.textBox16);
- this.Controls.Add(this.textBox15);
- this.Controls.Add(this.textBox14);
- this.Controls.Add(this.textBox13);
- this.Controls.Add(this.textBox12);
- this.Controls.Add(this.textBox11);
- this.Controls.Add(this.textBox10);
- this.Controls.Add(this.textBox9);
- this.Controls.Add(this.textBox8);
- this.Controls.Add(this.textBox7);
- this.Controls.Add(this.textBox6);
- this.Controls.Add(this.textBox5);
- this.Controls.Add(this.textBox4);
- this.Controls.Add(this.textBox3);
- this.Controls.Add(this.textBox2);
- this.Controls.Add(this.textBox1);
+ this.Controls.Add(this.serialNrTB20);
+ this.Controls.Add(this.serialNrTB19);
+ this.Controls.Add(this.serialNrTB18);
+ this.Controls.Add(this.serialNrTB17);
+ this.Controls.Add(this.serialNrTB16);
+ this.Controls.Add(this.serialNrTB15);
+ this.Controls.Add(this.serialNrTB14);
+ this.Controls.Add(this.serialNrTB13);
+ this.Controls.Add(this.serialNrTB12);
+ this.Controls.Add(this.serialNrTB11);
+ this.Controls.Add(this.serialNrTB10);
+ this.Controls.Add(this.serialNrTB9);
+ this.Controls.Add(this.serialNrTB8);
+ this.Controls.Add(this.serialNrTB7);
+ this.Controls.Add(this.serialNrTB6);
+ this.Controls.Add(this.serialNrTB5);
+ this.Controls.Add(this.serialNrTB4);
+ this.Controls.Add(this.serialNrTB3);
+ this.Controls.Add(this.serialNrTB2);
+ this.Controls.Add(this.serialNrTB1);
this.Controls.Add(this.checkBoxImage40);
this.Controls.Add(this.checkBoxImage39);
this.Controls.Add(this.checkBoxImage38);
@@ -3023,26 +3994,26 @@ namespace TBF.Rig.TestMethods.S640Communication
private System.Windows.Forms.Label wmLabel25;
private System.Windows.Forms.TextBox fromOptoTextBox24;
private System.Windows.Forms.Label wmLabel24;
- private System.Windows.Forms.TextBox textBox1;
- private System.Windows.Forms.TextBox textBox2;
- private System.Windows.Forms.TextBox textBox3;
- private System.Windows.Forms.TextBox textBox4;
- private System.Windows.Forms.TextBox textBox5;
- private System.Windows.Forms.TextBox textBox6;
- private System.Windows.Forms.TextBox textBox7;
- private System.Windows.Forms.TextBox textBox8;
- private System.Windows.Forms.TextBox textBox9;
- private System.Windows.Forms.TextBox textBox10;
- private System.Windows.Forms.TextBox textBox11;
- private System.Windows.Forms.TextBox textBox12;
- private System.Windows.Forms.TextBox textBox13;
- private System.Windows.Forms.TextBox textBox14;
- private System.Windows.Forms.TextBox textBox15;
- private System.Windows.Forms.TextBox textBox16;
- private System.Windows.Forms.TextBox textBox17;
- private System.Windows.Forms.TextBox textBox18;
- private System.Windows.Forms.TextBox textBox19;
- private System.Windows.Forms.TextBox textBox20;
+ private System.Windows.Forms.TextBox serialNrTB1;
+ private System.Windows.Forms.TextBox serialNrTB2;
+ private System.Windows.Forms.TextBox serialNrTB3;
+ private System.Windows.Forms.TextBox serialNrTB4;
+ private System.Windows.Forms.TextBox serialNrTB5;
+ private System.Windows.Forms.TextBox serialNrTB6;
+ private System.Windows.Forms.TextBox serialNrTB7;
+ private System.Windows.Forms.TextBox serialNrTB8;
+ private System.Windows.Forms.TextBox serialNrTB9;
+ private System.Windows.Forms.TextBox serialNrTB10;
+ private System.Windows.Forms.TextBox serialNrTB11;
+ private System.Windows.Forms.TextBox serialNrTB12;
+ private System.Windows.Forms.TextBox serialNrTB13;
+ private System.Windows.Forms.TextBox serialNrTB14;
+ private System.Windows.Forms.TextBox serialNrTB15;
+ private System.Windows.Forms.TextBox serialNrTB16;
+ private System.Windows.Forms.TextBox serialNrTB17;
+ private System.Windows.Forms.TextBox serialNrTB18;
+ private System.Windows.Forms.TextBox serialNrTB19;
+ private System.Windows.Forms.TextBox serialNrTB20;
private System.Windows.Forms.TextBox textBox21;
private System.Windows.Forms.TextBox textBox22;
private System.Windows.Forms.TextBox textBox23;
@@ -3063,10 +4034,94 @@ namespace TBF.Rig.TestMethods.S640Communication
private System.Windows.Forms.TextBox textBox38;
private System.Windows.Forms.TextBox textBox39;
private System.Windows.Forms.TextBox textBox40;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label eRegisterLabel1;
+ private System.Windows.Forms.Label eRegisterLabel2;
+ private System.Windows.Forms.Label housingSnLabel1;
+ private System.Windows.Forms.Label housingSnLabel2;
+ private System.Windows.Forms.TextBox radioAddressTB1;
+ private System.Windows.Forms.TextBox radioAddressTB2;
+ private System.Windows.Forms.TextBox radioAddressTB3;
+ private System.Windows.Forms.TextBox radioAddressTB4;
+ private System.Windows.Forms.TextBox radioAddressTB5;
+ private System.Windows.Forms.TextBox radioAddressTB6;
+ private System.Windows.Forms.TextBox radioAddressTB7;
+ private System.Windows.Forms.TextBox radioAddressTB8;
+ private System.Windows.Forms.TextBox radioAddressTB9;
+ private System.Windows.Forms.TextBox radioAddressTB10;
+ private System.Windows.Forms.TextBox radioAddressTB11;
+ private System.Windows.Forms.TextBox radioAddressTB12;
+ private System.Windows.Forms.TextBox radioAddressTB13;
+ private System.Windows.Forms.TextBox radioAddressTB14;
+ private System.Windows.Forms.TextBox radioAddressTB15;
+ private System.Windows.Forms.TextBox radioAddressTB16;
+ private System.Windows.Forms.TextBox radioAddressTB17;
+ private System.Windows.Forms.TextBox radioAddressTB18;
+ private System.Windows.Forms.TextBox radioAddressTB19;
+ private System.Windows.Forms.TextBox radioAddressTB20;
+ private System.Windows.Forms.Label radioAddressLabel1;
+ private System.Windows.Forms.Label assignedSNLabel1;
+ private System.Windows.Forms.Label assignedRadioAddressLabel1;
+ private System.Windows.Forms.TextBox assignedRadAddrTB20;
+ private System.Windows.Forms.TextBox assignedRadAddrTB19;
+ private System.Windows.Forms.TextBox assignedRadAddrTB18;
+ private System.Windows.Forms.TextBox assignedRadAddrTB17;
+ private System.Windows.Forms.TextBox assignedRadAddrTB16;
+ private System.Windows.Forms.TextBox assignedRadAddrTB15;
+ private System.Windows.Forms.TextBox assignedRadAddrTB14;
+ private System.Windows.Forms.TextBox assignedRadAddrTB13;
+ private System.Windows.Forms.TextBox assignedRadAddrTB12;
+ private System.Windows.Forms.TextBox assignedRadAddrTB11;
+ private System.Windows.Forms.TextBox assignedRadAddrTB10;
+ private System.Windows.Forms.TextBox assignedRadAddrTB9;
+ private System.Windows.Forms.TextBox assignedRadAddrTB8;
+ private System.Windows.Forms.TextBox assignedRadAddrTB7;
+ private System.Windows.Forms.TextBox assignedRadAddrTB6;
+ private System.Windows.Forms.TextBox assignedRadAddrTB5;
+ private System.Windows.Forms.TextBox assignedRadAddrTB4;
+ private System.Windows.Forms.TextBox assignedRadAddrTB3;
+ private System.Windows.Forms.TextBox assignedRadAddrTB2;
+ private System.Windows.Forms.TextBox assignedRadAddrTB1;
+ private System.Windows.Forms.TextBox assignedSnTB20;
+ private System.Windows.Forms.TextBox assignedSnTB19;
+ private System.Windows.Forms.TextBox assignedSnTB18;
+ private System.Windows.Forms.TextBox assignedSnTB17;
+ private System.Windows.Forms.TextBox assignedSnTB16;
+ private System.Windows.Forms.TextBox assignedSnTB15;
+ private System.Windows.Forms.TextBox assignedSnTB14;
+ private System.Windows.Forms.TextBox assignedSnTB13;
+ private System.Windows.Forms.TextBox assignedSnTB12;
+ private System.Windows.Forms.TextBox assignedSnTB11;
+ private System.Windows.Forms.TextBox assignedSnTB10;
+ private System.Windows.Forms.TextBox assignedSnTB9;
+ private System.Windows.Forms.TextBox assignedSnTB8;
+ private System.Windows.Forms.TextBox assignedSnTB7;
+ private System.Windows.Forms.TextBox assignedSnTB6;
+ private System.Windows.Forms.TextBox assignedSnTB5;
+ private System.Windows.Forms.TextBox assignedSnTB4;
+ private System.Windows.Forms.TextBox assignedSnTB3;
+ private System.Windows.Forms.TextBox assignedSnTB2;
+ private System.Windows.Forms.TextBox assignedSnTB1;
+ private System.Windows.Forms.Label radioAddressLabel2;
+ private System.Windows.Forms.TextBox radioAddressTB40;
+ private System.Windows.Forms.TextBox radioAddressTB39;
+ private System.Windows.Forms.TextBox radioAddressTB38;
+ private System.Windows.Forms.TextBox radioAddressTB37;
+ private System.Windows.Forms.TextBox radioAddressTB36;
+ private System.Windows.Forms.TextBox radioAddressTB35;
+ private System.Windows.Forms.TextBox radioAddressTB34;
+ private System.Windows.Forms.TextBox radioAddressTB33;
+ private System.Windows.Forms.TextBox radioAddressTB32;
+ private System.Windows.Forms.TextBox radioAddressTB31;
+ private System.Windows.Forms.TextBox radioAddressTB30;
+ private System.Windows.Forms.TextBox radioAddressTB29;
+ private System.Windows.Forms.TextBox radioAddressTB28;
+ private System.Windows.Forms.TextBox radioAddressTB27;
+ private System.Windows.Forms.TextBox radioAddressTB26;
+ private System.Windows.Forms.TextBox radioAddressTB25;
+ private System.Windows.Forms.TextBox radioAddressTB24;
+ private System.Windows.Forms.TextBox radioAddressTB23;
+ private System.Windows.Forms.TextBox radioAddressTB22;
+ private System.Windows.Forms.TextBox radioAddressTB21;
}
}
\ No newline at end of file
diff --git a/TBF/Rig/TestMethods/S640Communication/S640CommSeq.cs b/TBF/Rig/TestMethods/S640Communication/S640CommSeq.cs
index 2e61ab3ef..c1bd1b35e 100644
--- a/TBF/Rig/TestMethods/S640Communication/S640CommSeq.cs
+++ b/TBF/Rig/TestMethods/S640Communication/S640CommSeq.cs
@@ -24,7 +24,7 @@ namespace TBF.Rig.TestMethods.S640Communication
///
void OpenS640CommForm(S640CommSeq myRef, S640Activity activity, I640Cfg config, ProcParams procParams, Test test)
{
- myRef.modelessDlg = new S640CommForm(activity, config, procParams, test);
+ myRef.modelessDlg = new S640CommForm(activity, config, procParams, test, BatchRslts.Batch.WaterMeters);
myRef.modelessDlg.Show();
}
///
diff --git a/TBF/Rig/TestMethods/S640Communication/S640EndCfg.cs b/TBF/Rig/TestMethods/S640Communication/S640EndCfg.cs
index a3e4c3608..b639a858c 100644
--- a/TBF/Rig/TestMethods/S640Communication/S640EndCfg.cs
+++ b/TBF/Rig/TestMethods/S640Communication/S640EndCfg.cs
@@ -19,17 +19,21 @@ namespace TBF.Rig.TestMethods.S640Communication
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(S640EndCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
- public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
+ public IComponentCfgCtrl GetControl(IList cmpntEntities)
+ {
+ return new Configs.ParamsProvider.ComponentCfgCtrl(this, null);
+ }
///
/// Serialized parameters
///
- public int OptoDataTimeout { get; set; }
- public string FileExchangePath { get; set; }
- public int FileExchangeTimeout { get; set; }
- public bool EnterSerialNumbers { get; set; }
- public bool SkipBadMeters { get; set; }
- public bool SimultWithEvacuation { get; set; }
+ public int OptoDataTimeout { get; set; } /// 0
+ public string FileExchangePath { get; set; } /// 1
+ public int FileExchangeTimeout { get; set; } /// 2
+ public SerialNumbers SerialNumbers { get; set; } /// 3
+ public SerialNumbers AssignedNumbers { get; set; } /// 4
+ public bool SkipBadMeters { get; set; } /// 5
+ public bool SimultWithEvacuation { get; set; } /// 6
/// Procedure parameters
[XmlIgnore]
@@ -59,7 +63,8 @@ namespace TBF.Rig.TestMethods.S640Communication
OptoDataTimeout = 120;
FileExchangePath = "1";
FileExchangeTimeout = 420;
- EnterSerialNumbers = false;
+ SerialNumbers = SerialNumbers.None;
+ AssignedNumbers = SerialNumbers.None;
SkipBadMeters = false;
SimultWithEvacuation = true;
}
@@ -69,7 +74,8 @@ namespace TBF.Rig.TestMethods.S640Communication
"Awaiting optical data timeout [s] (0 = off)",
"File exchange path",
"File exchange timeout [s] (0 = off)",
- "Enter serial numbers",
+ "Housing numbers mode",
+ "Assigned S/N-s mode",
"Skip bad meters when entering s/n",
"Simultaneous with evacuation",
};
@@ -82,7 +88,12 @@ namespace TBF.Rig.TestMethods.S640Communication
{
case 3:
case 4:
+ return new List { SerialNumbers.None.ToString(),
+ SerialNumbers.DisplayReadonly.ToString(),
+ SerialNumbers.EnterManually.ToString(),
+ SerialNumbers.FromProductionTracing.ToString() };
case 5:
+ case 6:
return new List { Strings.yes, Strings.no };
default:
return null;
@@ -96,9 +107,10 @@ namespace TBF.Rig.TestMethods.S640Communication
case 0: return OptoDataTimeout.ToString();
case 1: return FileExchangePath;
case 2: return FileExchangeTimeout.ToString();
- case 3: return EnterSerialNumbers ? Strings.yes : Strings.no;
- case 4: return SkipBadMeters ? Strings.yes : Strings.no;
- case 5: return SimultWithEvacuation ? Strings.yes : Strings.no;
+ case 3: return SerialNumbers.ToString();
+ case 4: return AssignedNumbers.ToString();
+ case 5: return SkipBadMeters ? Strings.yes : Strings.no;
+ case 6: return SimultWithEvacuation ? Strings.yes : Strings.no;
default:
return string.Format("{0}: FileExchangePath = '{1}' FileExchangeTimeout = {2}s", Name, FileExchangePath, FileExchangeTimeout);
}
@@ -108,15 +120,42 @@ namespace TBF.Rig.TestMethods.S640Communication
{
switch (i)
{
- case 0: OptoDataTimeout = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
- case 1: FileExchangePath = strValue; return CfgUpdateFlags.RestartRqrd;
- case 2: FileExchangeTimeout = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
- case 3: EnterSerialNumbers = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
- case 4: SkipBadMeters = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
- case 5: SimultWithEvacuation = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
+ case 0:
+ OptoDataTimeout = int.Parse(strValue);
+ return CfgUpdateFlags.RestartRqrd;
+ case 1:
+ FileExchangePath = strValue;
+ return CfgUpdateFlags.RestartRqrd;
+ case 2:
+ FileExchangeTimeout = int.Parse(strValue);
+ return CfgUpdateFlags.RestartRqrd;
+ case 3:
+ for (SerialNumbers sn = 0; sn < SerialNumbers.Count; sn++)
+ if (sn.ToString() == strValue)
+ {
+ SerialNumbers = sn;
+ return CfgUpdateFlags.RestartRqrd;
+ }
+ break;
+ case 4:
+ for (SerialNumbers sn = 0; sn < SerialNumbers.Count; sn++)
+ if (sn.ToString() == strValue)
+ {
+ AssignedNumbers = sn;
+ return CfgUpdateFlags.RestartRqrd;
+ }
+ break;
+ case 5:
+ SkipBadMeters = (strValue == Strings.yes);
+ return CfgUpdateFlags.RestartRqrd;
+ case 6:
+ SimultWithEvacuation = (strValue == Strings.yes);
+ return CfgUpdateFlags.RestartRqrd;
default:
- return CfgUpdateFlags.None;
+ break;
}
+
+ return CfgUpdateFlags.None;
}
public bool ValidateParam(int i, string strValue, out string message)
@@ -135,6 +174,7 @@ namespace TBF.Rig.TestMethods.S640Communication
case 3:
case 4:
case 5:
+ case 6:
if (ParamValues(i).Contains(strValue)) return true;
break;
default:
@@ -151,7 +191,8 @@ namespace TBF.Rig.TestMethods.S640Communication
prms.OptoDataTimeout = this.OptoDataTimeout;
prms.FileExchangePath = this.FileExchangePath;
prms.FileExchangeTimeout = this.FileExchangeTimeout;
- prms.EnterSerialNumbers = this.EnterSerialNumbers;
+ prms.SerialNumbers = this.SerialNumbers;
+ prms.AssignedNumbers = this.AssignedNumbers;
prms.SkipBadMeters = this.SkipBadMeters;
prms.SimultWithEvacuation = this.SimultWithEvacuation;
}
diff --git a/TBF/Rig/TestMethods/S640Communication/S640StartCfg.cs b/TBF/Rig/TestMethods/S640Communication/S640StartCfg.cs
index ae419a046..cdd2868d1 100644
--- a/TBF/Rig/TestMethods/S640Communication/S640StartCfg.cs
+++ b/TBF/Rig/TestMethods/S640Communication/S640StartCfg.cs
@@ -19,17 +19,21 @@ namespace TBF.Rig.TestMethods.S640Communication
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(S640StartCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
- public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
+ public IComponentCfgCtrl GetControl(IList cmpntEntities)
+ {
+ return new Configs.ParamsProvider.ComponentCfgCtrl(this, null);
+ }
///
/// Serialized parameters
///
- public int OptoDataTimeout { get; set; }
- public string FileExchangePath { get; set; }
- public int FileExchangeTimeout { get; set; }
- public bool EnterSerialNumbers { get; set; }
- public bool SkipBadMeters { get; set; }
- public bool SimultWithPurging { get; set; }
+ public int OptoDataTimeout { get; set; } /// 0
+ public string FileExchangePath { get; set; } /// 1
+ public int FileExchangeTimeout { get; set; } /// 2
+ public SerialNumbers SerialNumbers { get; set; } /// 3
+ public SerialNumbers AssignedNumbers { get; set; } /// 4
+ public bool SkipBadMeters { get; set; } /// 5
+ public bool SimultWithPurging { get; set; } /// 6
/// Procedure parameters
[XmlIgnore]
@@ -59,7 +63,8 @@ namespace TBF.Rig.TestMethods.S640Communication
OptoDataTimeout = 180;
FileExchangePath = "1";
FileExchangeTimeout = 420;
- EnterSerialNumbers = true;
+ SerialNumbers = SerialNumbers.None;
+ AssignedNumbers = SerialNumbers.None;
SkipBadMeters = false;
SimultWithPurging = true;
}
@@ -69,7 +74,8 @@ namespace TBF.Rig.TestMethods.S640Communication
"Awaiting optical data timeout [s] (0 = off)",
"File exchange path",
"File exchange timeout [s] (0 = off)",
- "Enter serial numbers",
+ "Housing numbers mode",
+ "Assigned S/N-s mode",
"Skip bad meters when entering s/n",
"Simultaneous with purging",
};
@@ -82,7 +88,12 @@ namespace TBF.Rig.TestMethods.S640Communication
{
case 3:
case 4:
+ return new List { SerialNumbers.None.ToString(),
+ SerialNumbers.DisplayReadonly.ToString(),
+ SerialNumbers.EnterManually.ToString(),
+ SerialNumbers.FromProductionTracing.ToString() };
case 5:
+ case 6:
return new List { Strings.yes, Strings.no };
default:
return null;
@@ -96,9 +107,10 @@ namespace TBF.Rig.TestMethods.S640Communication
case 0: return OptoDataTimeout.ToString();
case 1: return FileExchangePath;
case 2: return FileExchangeTimeout.ToString();
- case 3: return EnterSerialNumbers ? Strings.yes : Strings.no;
- case 4: return SkipBadMeters ? Strings.yes : Strings.no;
- case 5: return SimultWithPurging ? Strings.yes : Strings.no;
+ case 3: return SerialNumbers.ToString();
+ case 4: return AssignedNumbers.ToString();
+ case 5: return SkipBadMeters ? Strings.yes : Strings.no;
+ case 6: return SimultWithPurging ? Strings.yes : Strings.no;
default:
return string.Format("{0}: FileExchangePath = '{1}' FileExchangeTimeout = {2}s", Name, FileExchangePath, FileExchangeTimeout);
}
@@ -108,15 +120,42 @@ namespace TBF.Rig.TestMethods.S640Communication
{
switch (i)
{
- case 0: OptoDataTimeout = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
- case 1: FileExchangePath = strValue; return CfgUpdateFlags.RestartRqrd;
- case 2: FileExchangeTimeout = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
- case 3: EnterSerialNumbers = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
- case 4: SkipBadMeters = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
- case 5: SimultWithPurging = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
+ case 0:
+ OptoDataTimeout = int.Parse(strValue);
+ return CfgUpdateFlags.RestartRqrd;
+ case 1:
+ FileExchangePath = strValue;
+ return CfgUpdateFlags.RestartRqrd;
+ case 2:
+ FileExchangeTimeout = int.Parse(strValue);
+ return CfgUpdateFlags.RestartRqrd;
+ case 3:
+ for (SerialNumbers sn = 0; sn < SerialNumbers.Count; sn++)
+ if (sn.ToString() == strValue)
+ {
+ SerialNumbers = sn;
+ return CfgUpdateFlags.RestartRqrd;
+ }
+ break;
+ case 4:
+ for (SerialNumbers sn = 0; sn < SerialNumbers.Count; sn++)
+ if (sn.ToString() == strValue)
+ {
+ AssignedNumbers = sn;
+ return CfgUpdateFlags.RestartRqrd;
+ }
+ break;
+ case 5:
+ SkipBadMeters = (strValue == Strings.yes);
+ return CfgUpdateFlags.RestartRqrd;
+ case 6:
+ SimultWithPurging = (strValue == Strings.yes);
+ return CfgUpdateFlags.RestartRqrd;
default:
- return CfgUpdateFlags.None;
+ break;
}
+
+ return CfgUpdateFlags.None;
}
public bool ValidateParam(int i, string strValue, out string message)
@@ -135,6 +174,7 @@ namespace TBF.Rig.TestMethods.S640Communication
case 3:
case 4:
case 5:
+ case 6:
if (ParamValues(i).Contains(strValue)) return true;
break;
default:
@@ -151,7 +191,8 @@ namespace TBF.Rig.TestMethods.S640Communication
prms.OptoDataTimeout = this.OptoDataTimeout;
prms.FileExchangePath = this.FileExchangePath;
prms.FileExchangeTimeout = this.FileExchangeTimeout;
- prms.EnterSerialNumbers = this.EnterSerialNumbers;
+ prms.SerialNumbers = this.SerialNumbers;
+ prms.AssignedNumbers = this.AssignedNumbers;
prms.SkipBadMeters = this.SkipBadMeters;
prms.SimultWithPurging = this.SimultWithPurging;
}
diff --git a/TBF/UI/MainWnd.cs b/TBF/UI/MainWnd.cs
index 62da69351..42ac9fe3a 100644
--- a/TBF/UI/MainWnd.cs
+++ b/TBF/UI/MainWnd.cs
@@ -40,7 +40,7 @@ namespace TBF.UI
///
IList localProcedures; /// procedures loaded form the local DB
IList remoteProcedures; /// Procedures loaded from thr remote/shared DB
- IList mySqlOrders; /// Production orders loaded from the production tracing DB
+ IList tracingDBOrders; /// Production orders loaded from the production tracing DB
IList oracleOrders; /// Production orders loaded from the Oracle DB
IList procedureInfos; /// Composed procedure infos
///
@@ -118,7 +118,7 @@ namespace TBF.UI
localProcedures = new List();
remoteProcedures = new List();
- mySqlOrders = new List();
+ tracingDBOrders = new List();
oracleOrders = new List();
procedureInfos = new List();
SelectedProcedure = null;
@@ -796,31 +796,31 @@ namespace TBF.UI
}
else if (src == ProcedureSelection.OrderFromOracleDB)
{
- oracleOrders = Rig.Sequences.ProcessData.OracleDB.ReadOrderNumbers();
+ oracleOrders = Rig.Sequences.ProcessData.OracleDB.ReadOrders();
foreach (var order in oracleOrders)
{
- procedureInfos.Add(new ProcedureInfo(src, 0, order.AuftragsNummer.ToString(), signature, order.VariantenCode, order.AuftragsNummer));
+ procedureInfos.Add(new ProcedureInfo(src, 0, order.POName.ToString(), signature, order.VariantCode, order));
}
}
else if (src == ProcedureSelection.OrderFromTracingDB)
{
try
{
- mySqlOrders = SharedDatabase.TracingDB.CreateSession(TBF.DB.CurrentBench.EventsDBSettings.ConnectionString)
+ tracingDBOrders = SharedDatabase.TracingDB.CreateSession(TBF.DB.CurrentBench.EventsDBSettings.ConnectionString)
.QueryOver()
.Where(x => x.POState != (sbyte)SharedDatabase.Entities.OrderState.Finished)
.List();
}
catch
{
- mySqlOrders = new List();
+ tracingDBOrders = new List();
}
- foreach (var order in mySqlOrders)
+ foreach (var order in tracingDBOrders)
{
- procedureInfos.Add(new ProcedureInfo(src, 0, order.POName, signature, order.VariantCode,
- order.POName, order.Workflow, order.LaserMarking));
+ procedureInfos.Add(new ProcedureInfo(src, 0, order.POName, signature, order.VariantCode, order,
+ order.Workflow, order.LaserMarking));
}
}
}
@@ -869,7 +869,7 @@ namespace TBF.UI
{
/// pi.Name is the order name (the production order number)
/// Production orders in the tracing DB contain test procedure names
- var order = mySqlOrders.FirstOrDefault(x => x.POName == pi.Name);
+ var order = tracingDBOrders.FirstOrDefault(x => x.POName == pi.Name);
var procInfo = (order == null) ? null : procInfos.FirstOrDefault(x => x.IsNative && x.Name == order.TestProcedure);
if (procInfo != null)
{
@@ -882,8 +882,8 @@ namespace TBF.UI
{
/// pi.Name is the order name (the production order number)
/// Production orders in Oracle DB contain varian codes
- var order = oracleOrders.FirstOrDefault(x => x.AuftragsNummer == pi.Name);
- var vaco = (order == null) ? null : order.VariantenCode;
+ var order = oracleOrders.FirstOrDefault(x => x.POName == pi.Name);
+ var vaco = (order == null) ? null : order.VariantCode;
foreach (var pi2 in procInfos)
{
if (pi2.IsNative && IsMatch(pi, pi2))
diff --git a/TBF/UiBridge/Bridge.cs b/TBF/UiBridge/Bridge.cs
index 287aefde8..2eabe2846 100644
--- a/TBF/UiBridge/Bridge.cs
+++ b/TBF/UiBridge/Bridge.cs
@@ -22,11 +22,6 @@ namespace TBF.UiBridge
public static int BatchNr;
- public static ProcedureInfo SelectedProcedure { get { return Program.MainWnd.SelectedProcedure; } }
-
- public static string SelectedTestName { get { return Program.MainWnd.BenchControlPanel.TestName; } }
-
-
static Bridge()
{
Ui2MachineQueue = new Queue();