Compare commits

..
11 changed files with 242 additions and 1096 deletions
+2 -2
View File
@@ -17,7 +17,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DefineConstants>TRACE;DEBUG;LANG_PL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -25,7 +25,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;LANG_PL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+12
View File
@@ -181,6 +181,18 @@ namespace Results.Entities
return WaterMeters.Count - PassedMetersCount();
}
public virtual int PassedMetersCountE15()
{
int count = 0;
foreach (var mtr in WaterMeters) if (mtr.PassedFromTestsE15()) count++;
return count;
}
public virtual int FailedMetersCountE15()
{
return WaterMeters.Count - PassedMetersCountE15();
}
public virtual long ErrorFlags()
{
long result = 0;
+24
View File
@@ -189,6 +189,12 @@ namespace Results.Entities
{
return ErrorFlagsFromTests() | ErrorFlags;
}
public virtual long ErrorFlagsFromTestsAndWMByFlag(ErrorFlagMask errorFlagsQuestion)
{
long errorFlagsMask = (long)errorFlagsQuestion;
return ErrorFlagsFromTests() & errorFlagsMask;
}
/// <summary>
/// Convert combined errorFlags of all tests to string
@@ -270,6 +276,24 @@ namespace Results.Entities
return passed;
}
public virtual bool PassedFromTestsE15()
{
//TODO BUMI this will just let us is E15
bool passed = (ErrorFlagsFromTestsAndWMByFlag(ErrorFlagMask.E15) == 0);
//TODO BUMI Check This may be not needed ?
foreach (var mtr in MeterTestRslts)
{
if (mtr.Evaluate() && (!mtr.TestDone))
{
passed = false;
break;
}
}
return passed;
}
/// <summary>
/// Three state test results and/or water meter result (Algeria PT25 requirement).
+2
View File
@@ -349,6 +349,8 @@ namespace Results
Pulses_main, /// 295 Compound main meter pulses (recalculated so that the gated ref. pulses for this meter are equal to the total ref. pulses)
Pulses_aux, /// 296 Compound aux meter pulses (recalculated so that the gated ref. pulses for this meter are equal to the total ref. pulses)
Failed_meters_countE15, /// 297
Count,
}
}
+68 -1
View File
@@ -224,15 +224,18 @@ namespace Results.Output
/// Calculate Y-coordinate taking into account cell merging
float mergedRowPos = rowPos[rowIx];
mergedCellsCount = 1;
List<string> texts = new List<string>();
texts.Add(Cells[rowIx][colIx].Text);
for (int rowIx2 = rowIx - 1; rowIx2 >= 0 && Cells[rowIx2][colIx].BottomMerge; rowIx2--)
{
mergedRowPos += rowPos[rowIx2];
mergedCellsCount++;
texts.Add(Cells[rowIx2][colIx].Text);
}
mergedRowPos /= mergedCellsCount;
/// Print the text at the calculated position
Common.Printers.PrintersCommon.PrintAt(e, Cells[rowIx][colIx].Text,
Common.Printers.PrintersCommon.PrintAt(e, mergedCellsCount == 1 ? Cells[rowIx][colIx].Text : GetMergedCellStringAsNegativeOrPositive(texts),
Cells[rowIx][colIx].Font,
left + mergedColPos,
top + mergedRowPos,
@@ -309,6 +312,70 @@ namespace Results.Output
return table;
}
public string GetMergedCellStringAsNegativeOrPositive(List<string> texts)
{
if (texts.Count < 1)
{
return "";
}
bool firstIsHead = false;
bool hasNegativeAll = true;
bool hasPositiveAll = true;
bool hasMixed = false;
string lastRowText = null;
//check if is a header
foreach (string text in texts)
{
if (text != "-")
{
hasNegativeAll = false;
}
if (text != "+")
{
hasPositiveAll = false;
}
if (!hasMixed)
{
if (lastRowText == null)
{
lastRowText = text;
}
else
{
if (lastRowText != text)
{
hasMixed = true;
}
lastRowText = text;
}
}
}
if (hasMixed)
{
//merge as negative
return "-";
}
else if (hasPositiveAll)
{
//merge as positive
return "+";
}
else if (hasNegativeAll)
{
//merge as negative
return "-";
}
return texts[0];
}
/// <summary>
/// Create a table where tests are in columns.
/// Left column contains item (or row) captions.
+2 -2
View File
@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DefineConstants>TRACE;DEBUG;LANG_PL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -29,7 +29,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;LANG_PL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
+1
View File
@@ -408,6 +408,7 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read", Quantity.PulsePerLtr, ItemCategory.Other, (w,t,u,f,p) => FormatDbl(u, f, p, "V4", (w.WaterMeterData.PulsesPerLtr != 0) ? 1/w.WaterMeterData.PulsesPerLtr : 0)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_meters_count, Strings.Passed_meters_count, Quantity.Number, ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.PassedMetersCount())));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Failed_meters_count, Strings.Failed_meters_count, Quantity.Number, ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.FailedMetersCount())));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Failed_meters_countE15, Strings.Failed_meters_count + "E15", Quantity.Number, ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.FailedMetersCountE15())));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_seals_count, "Seals count of passed meters", Quantity.Number, ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.PassedMetersCount() * int.Parse(w.WaterMeterData.Text5))));
/// Extra water meter data
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.9.2142.20")]
[assembly: AssemblyFileVersion("3.9.2142.20")]
[assembly: AssemblyVersion("3.9.2143.1")]
[assembly: AssemblyFileVersion("3.9.2143.1")]
File diff suppressed because it is too large Load Diff
@@ -297,9 +297,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox1, "comboBox1");
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Name = "comboBox1";
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
this.comboBox1.TextChanged += new System.EventHandler(this.comboBox1_TextChanged);
this.comboBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox1_KeyPress);
//
// checkBox1
//
@@ -318,9 +315,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox2, "comboBox2");
this.comboBox2.FormattingEnabled = true;
this.comboBox2.Name = "comboBox2";
this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
this.comboBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox2_KeyPress);
//
// label2
//
@@ -338,9 +332,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox3, "comboBox3");
this.comboBox3.FormattingEnabled = true;
this.comboBox3.Name = "comboBox3";
this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged);
this.comboBox3.TextChanged += new System.EventHandler(this.comboBox3_TextChanged);
this.comboBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox3_KeyPress);
//
// label3
//
@@ -358,9 +349,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox4, "comboBox4");
this.comboBox4.FormattingEnabled = true;
this.comboBox4.Name = "comboBox4";
this.comboBox4.SelectedIndexChanged += new System.EventHandler(this.comboBox4_SelectedIndexChanged);
this.comboBox4.TextChanged += new System.EventHandler(this.comboBox4_TextChanged);
this.comboBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox4_KeyPress);
//
// label4
//
@@ -378,9 +366,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox5, "comboBox5");
this.comboBox5.FormattingEnabled = true;
this.comboBox5.Name = "comboBox5";
this.comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox5_SelectedIndexChanged);
this.comboBox5.TextChanged += new System.EventHandler(this.comboBox5_TextChanged);
this.comboBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox5_KeyPress);
//
// label5
//
@@ -398,9 +383,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox6, "comboBox6");
this.comboBox6.FormattingEnabled = true;
this.comboBox6.Name = "comboBox6";
this.comboBox6.SelectedIndexChanged += new System.EventHandler(this.comboBox6_SelectedIndexChanged);
this.comboBox6.TextChanged += new System.EventHandler(this.comboBox6_TextChanged);
this.comboBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox6_KeyPress);
//
// label6
//
@@ -418,9 +400,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox7, "comboBox7");
this.comboBox7.FormattingEnabled = true;
this.comboBox7.Name = "comboBox7";
this.comboBox7.SelectedIndexChanged += new System.EventHandler(this.comboBox7_SelectedIndexChanged);
this.comboBox7.TextChanged += new System.EventHandler(this.comboBox7_TextChanged);
this.comboBox7.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox7_KeyPress);
//
// label7
//
@@ -438,9 +417,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox8, "comboBox8");
this.comboBox8.FormattingEnabled = true;
this.comboBox8.Name = "comboBox8";
this.comboBox8.SelectedIndexChanged += new System.EventHandler(this.comboBox8_SelectedIndexChanged);
this.comboBox8.TextChanged += new System.EventHandler(this.comboBox8_TextChanged);
this.comboBox8.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox8_KeyPress);
//
// label8
//
@@ -458,9 +434,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox9, "comboBox9");
this.comboBox9.FormattingEnabled = true;
this.comboBox9.Name = "comboBox9";
this.comboBox9.SelectedIndexChanged += new System.EventHandler(this.comboBox9_SelectedIndexChanged);
this.comboBox9.TextChanged += new System.EventHandler(this.comboBox9_TextChanged);
this.comboBox9.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox9_KeyPress);
//
// label9
//
@@ -478,9 +451,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox10, "comboBox10");
this.comboBox10.FormattingEnabled = true;
this.comboBox10.Name = "comboBox10";
this.comboBox10.SelectedIndexChanged += new System.EventHandler(this.comboBox10_SelectedIndexChanged);
this.comboBox10.TextChanged += new System.EventHandler(this.comboBox10_TextChanged);
this.comboBox10.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox10_KeyPress);
//
// label10
//
@@ -498,9 +468,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox11, "comboBox11");
this.comboBox11.FormattingEnabled = true;
this.comboBox11.Name = "comboBox11";
this.comboBox11.SelectedIndexChanged += new System.EventHandler(this.comboBox11_SelectedIndexChanged);
this.comboBox11.TextChanged += new System.EventHandler(this.comboBox11_TextChanged);
this.comboBox11.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox11_KeyPress);
//
// label11
//
@@ -518,9 +485,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox12, "comboBox12");
this.comboBox12.FormattingEnabled = true;
this.comboBox12.Name = "comboBox12";
this.comboBox12.SelectedIndexChanged += new System.EventHandler(this.comboBox12_SelectedIndexChanged);
this.comboBox12.TextChanged += new System.EventHandler(this.comboBox12_TextChanged);
this.comboBox12.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox12_KeyPress);
//
// label12
//
@@ -538,9 +502,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox13, "comboBox13");
this.comboBox13.FormattingEnabled = true;
this.comboBox13.Name = "comboBox13";
this.comboBox13.SelectedIndexChanged += new System.EventHandler(this.comboBox13_SelectedIndexChanged);
this.comboBox13.TextChanged += new System.EventHandler(this.comboBox13_TextChanged);
this.comboBox13.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox13_KeyPress);
//
// label13
//
@@ -558,9 +519,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox14, "comboBox14");
this.comboBox14.FormattingEnabled = true;
this.comboBox14.Name = "comboBox14";
this.comboBox14.SelectedIndexChanged += new System.EventHandler(this.comboBox14_SelectedIndexChanged);
this.comboBox14.TextChanged += new System.EventHandler(this.comboBox14_TextChanged);
this.comboBox14.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox14_KeyPress);
//
// label14
//
@@ -578,9 +536,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox15, "comboBox15");
this.comboBox15.FormattingEnabled = true;
this.comboBox15.Name = "comboBox15";
this.comboBox15.SelectedIndexChanged += new System.EventHandler(this.comboBox15_SelectedIndexChanged);
this.comboBox15.TextChanged += new System.EventHandler(this.comboBox15_TextChanged);
this.comboBox15.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox15_KeyPress);
//
// label15
//
@@ -598,9 +553,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox16, "comboBox16");
this.comboBox16.FormattingEnabled = true;
this.comboBox16.Name = "comboBox16";
this.comboBox16.SelectedIndexChanged += new System.EventHandler(this.comboBox16_SelectedIndexChanged);
this.comboBox16.TextChanged += new System.EventHandler(this.comboBox16_TextChanged);
this.comboBox16.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox16_KeyPress);
//
// label16
//
@@ -618,9 +570,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox17, "comboBox17");
this.comboBox17.FormattingEnabled = true;
this.comboBox17.Name = "comboBox17";
this.comboBox17.SelectedIndexChanged += new System.EventHandler(this.comboBox17_SelectedIndexChanged);
this.comboBox17.TextChanged += new System.EventHandler(this.comboBox17_TextChanged);
this.comboBox17.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox17_KeyPress);
//
// label17
//
@@ -638,9 +587,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox18, "comboBox18");
this.comboBox18.FormattingEnabled = true;
this.comboBox18.Name = "comboBox18";
this.comboBox18.SelectedIndexChanged += new System.EventHandler(this.comboBox18_SelectedIndexChanged);
this.comboBox18.TextChanged += new System.EventHandler(this.comboBox18_TextChanged);
this.comboBox18.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox18_KeyPress);
//
// label18
//
@@ -658,9 +604,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox19, "comboBox19");
this.comboBox19.FormattingEnabled = true;
this.comboBox19.Name = "comboBox19";
this.comboBox19.SelectedIndexChanged += new System.EventHandler(this.comboBox19_SelectedIndexChanged);
this.comboBox19.TextChanged += new System.EventHandler(this.comboBox19_TextChanged);
this.comboBox19.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox19_KeyPress);
//
// label19
//
@@ -678,9 +621,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox20, "comboBox20");
this.comboBox20.FormattingEnabled = true;
this.comboBox20.Name = "comboBox20";
this.comboBox20.SelectedIndexChanged += new System.EventHandler(this.comboBox20_SelectedIndexChanged);
this.comboBox20.TextChanged += new System.EventHandler(this.comboBox20_TextChanged);
this.comboBox20.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox20_KeyPress);
//
// label20
//
@@ -698,9 +638,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox21, "comboBox21");
this.comboBox21.FormattingEnabled = true;
this.comboBox21.Name = "comboBox21";
this.comboBox21.SelectedIndexChanged += new System.EventHandler(this.comboBox21_SelectedIndexChanged);
this.comboBox21.TextChanged += new System.EventHandler(this.comboBox21_TextChanged);
this.comboBox21.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox21_KeyPress);
//
// label21
//
@@ -718,9 +655,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox22, "comboBox22");
this.comboBox22.FormattingEnabled = true;
this.comboBox22.Name = "comboBox22";
this.comboBox22.SelectedIndexChanged += new System.EventHandler(this.comboBox22_SelectedIndexChanged);
this.comboBox22.TextChanged += new System.EventHandler(this.comboBox22_TextChanged);
this.comboBox22.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox22_KeyPress);
//
// label22
//
@@ -738,9 +672,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox23, "comboBox23");
this.comboBox23.FormattingEnabled = true;
this.comboBox23.Name = "comboBox23";
this.comboBox23.SelectedIndexChanged += new System.EventHandler(this.comboBox23_SelectedIndexChanged);
this.comboBox23.TextChanged += new System.EventHandler(this.comboBox23_TextChanged);
this.comboBox23.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox23_KeyPress);
//
// label23
//
@@ -758,9 +689,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox24, "comboBox24");
this.comboBox24.FormattingEnabled = true;
this.comboBox24.Name = "comboBox24";
this.comboBox24.SelectedIndexChanged += new System.EventHandler(this.comboBox24_SelectedIndexChanged);
this.comboBox24.TextChanged += new System.EventHandler(this.comboBox24_TextChanged);
this.comboBox24.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox24_KeyPress);
//
// label24
//
@@ -778,9 +706,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox48, "comboBox48");
this.comboBox48.FormattingEnabled = true;
this.comboBox48.Name = "comboBox48";
this.comboBox48.SelectedIndexChanged += new System.EventHandler(this.comboBox48_SelectedIndexChanged);
this.comboBox48.TextChanged += new System.EventHandler(this.comboBox48_TextChanged);
this.comboBox48.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox48_KeyPress);
//
// label48
//
@@ -798,9 +723,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox47, "comboBox47");
this.comboBox47.FormattingEnabled = true;
this.comboBox47.Name = "comboBox47";
this.comboBox47.SelectedIndexChanged += new System.EventHandler(this.comboBox47_SelectedIndexChanged);
this.comboBox47.TextChanged += new System.EventHandler(this.comboBox47_TextChanged);
this.comboBox47.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox47_KeyPress);
//
// label47
//
@@ -818,9 +740,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox46, "comboBox46");
this.comboBox46.FormattingEnabled = true;
this.comboBox46.Name = "comboBox46";
this.comboBox46.SelectedIndexChanged += new System.EventHandler(this.comboBox46_SelectedIndexChanged);
this.comboBox46.TextChanged += new System.EventHandler(this.comboBox46_TextChanged);
this.comboBox46.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox46_KeyPress);
//
// label46
//
@@ -838,9 +757,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox45, "comboBox45");
this.comboBox45.FormattingEnabled = true;
this.comboBox45.Name = "comboBox45";
this.comboBox45.SelectedIndexChanged += new System.EventHandler(this.comboBox45_SelectedIndexChanged);
this.comboBox45.TextChanged += new System.EventHandler(this.comboBox45_TextChanged);
this.comboBox45.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox45_KeyPress);
//
// label45
//
@@ -858,9 +774,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox44, "comboBox44");
this.comboBox44.FormattingEnabled = true;
this.comboBox44.Name = "comboBox44";
this.comboBox44.SelectedIndexChanged += new System.EventHandler(this.comboBox44_SelectedIndexChanged);
this.comboBox44.TextChanged += new System.EventHandler(this.comboBox44_TextChanged);
this.comboBox44.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox44_KeyPress);
//
// label44
//
@@ -878,9 +791,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox43, "comboBox43");
this.comboBox43.FormattingEnabled = true;
this.comboBox43.Name = "comboBox43";
this.comboBox43.SelectedIndexChanged += new System.EventHandler(this.comboBox43_SelectedIndexChanged);
this.comboBox43.TextChanged += new System.EventHandler(this.comboBox43_TextChanged);
this.comboBox43.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox43_KeyPress);
//
// label43
//
@@ -898,9 +808,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox42, "comboBox42");
this.comboBox42.FormattingEnabled = true;
this.comboBox42.Name = "comboBox42";
this.comboBox42.SelectedIndexChanged += new System.EventHandler(this.comboBox42_SelectedIndexChanged);
this.comboBox42.TextChanged += new System.EventHandler(this.comboBox42_TextChanged);
this.comboBox42.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox42_KeyPress);
//
// label42
//
@@ -918,9 +825,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox41, "comboBox41");
this.comboBox41.FormattingEnabled = true;
this.comboBox41.Name = "comboBox41";
this.comboBox41.SelectedIndexChanged += new System.EventHandler(this.comboBox41_SelectedIndexChanged);
this.comboBox41.TextChanged += new System.EventHandler(this.comboBox41_TextChanged);
this.comboBox41.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox41_KeyPress);
//
// label41
//
@@ -938,9 +842,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox40, "comboBox40");
this.comboBox40.FormattingEnabled = true;
this.comboBox40.Name = "comboBox40";
this.comboBox40.SelectedIndexChanged += new System.EventHandler(this.comboBox40_SelectedIndexChanged);
this.comboBox40.TextChanged += new System.EventHandler(this.comboBox40_TextChanged);
this.comboBox40.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox40_KeyPress);
//
// label40
//
@@ -958,9 +859,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox39, "comboBox39");
this.comboBox39.FormattingEnabled = true;
this.comboBox39.Name = "comboBox39";
this.comboBox39.SelectedIndexChanged += new System.EventHandler(this.comboBox39_SelectedIndexChanged);
this.comboBox39.TextChanged += new System.EventHandler(this.comboBox39_TextChanged);
this.comboBox39.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox39_KeyPress);
//
// label39
//
@@ -978,9 +876,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox38, "comboBox38");
this.comboBox38.FormattingEnabled = true;
this.comboBox38.Name = "comboBox38";
this.comboBox38.SelectedIndexChanged += new System.EventHandler(this.comboBox38_SelectedIndexChanged);
this.comboBox38.TextChanged += new System.EventHandler(this.comboBox38_TextChanged);
this.comboBox38.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox38_KeyPress);
//
// label38
//
@@ -998,9 +893,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox37, "comboBox37");
this.comboBox37.FormattingEnabled = true;
this.comboBox37.Name = "comboBox37";
this.comboBox37.SelectedIndexChanged += new System.EventHandler(this.comboBox37_SelectedIndexChanged);
this.comboBox37.TextChanged += new System.EventHandler(this.comboBox37_TextChanged);
this.comboBox37.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox37_KeyPress);
//
// label37
//
@@ -1018,9 +910,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox36, "comboBox36");
this.comboBox36.FormattingEnabled = true;
this.comboBox36.Name = "comboBox36";
this.comboBox36.SelectedIndexChanged += new System.EventHandler(this.comboBox36_SelectedIndexChanged);
this.comboBox36.TextChanged += new System.EventHandler(this.comboBox36_TextChanged);
this.comboBox36.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox36_KeyPress);
//
// label36
//
@@ -1038,9 +927,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox35, "comboBox35");
this.comboBox35.FormattingEnabled = true;
this.comboBox35.Name = "comboBox35";
this.comboBox35.SelectedIndexChanged += new System.EventHandler(this.comboBox35_SelectedIndexChanged);
this.comboBox35.TextChanged += new System.EventHandler(this.comboBox35_TextChanged);
this.comboBox35.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox35_KeyPress);
//
// label35
//
@@ -1058,9 +944,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox34, "comboBox34");
this.comboBox34.FormattingEnabled = true;
this.comboBox34.Name = "comboBox34";
this.comboBox34.SelectedIndexChanged += new System.EventHandler(this.comboBox34_SelectedIndexChanged);
this.comboBox34.TextChanged += new System.EventHandler(this.comboBox34_TextChanged);
this.comboBox34.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox34_KeyPress);
//
// label34
//
@@ -1078,8 +961,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox33, "comboBox33");
this.comboBox33.FormattingEnabled = true;
this.comboBox33.Name = "comboBox33";
this.comboBox33.TextChanged += new System.EventHandler(this.comboBox33_TextChanged);
this.comboBox33.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox33_KeyPress);
//
// label33
//
@@ -1097,9 +978,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox32, "comboBox32");
this.comboBox32.FormattingEnabled = true;
this.comboBox32.Name = "comboBox32";
this.comboBox32.SelectedIndexChanged += new System.EventHandler(this.comboBox32_SelectedIndexChanged);
this.comboBox32.TextChanged += new System.EventHandler(this.comboBox32_TextChanged);
this.comboBox32.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox32_KeyPress);
//
// label32
//
@@ -1117,9 +995,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox31, "comboBox31");
this.comboBox31.FormattingEnabled = true;
this.comboBox31.Name = "comboBox31";
this.comboBox31.SelectedIndexChanged += new System.EventHandler(this.comboBox31_SelectedIndexChanged);
this.comboBox31.TextChanged += new System.EventHandler(this.comboBox31_TextChanged);
this.comboBox31.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox31_KeyPress);
//
// label31
//
@@ -1137,9 +1012,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox30, "comboBox30");
this.comboBox30.FormattingEnabled = true;
this.comboBox30.Name = "comboBox30";
this.comboBox30.SelectedIndexChanged += new System.EventHandler(this.comboBox30_SelectedIndexChanged);
this.comboBox30.TextChanged += new System.EventHandler(this.comboBox30_TextChanged);
this.comboBox30.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox30_KeyPress);
//
// label30
//
@@ -1157,9 +1029,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox29, "comboBox29");
this.comboBox29.FormattingEnabled = true;
this.comboBox29.Name = "comboBox29";
this.comboBox29.SelectedIndexChanged += new System.EventHandler(this.comboBox29_SelectedIndexChanged);
this.comboBox29.TextChanged += new System.EventHandler(this.comboBox29_TextChanged);
this.comboBox29.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox29_KeyPress);
//
// label29
//
@@ -1177,9 +1046,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox28, "comboBox28");
this.comboBox28.FormattingEnabled = true;
this.comboBox28.Name = "comboBox28";
this.comboBox28.SelectedIndexChanged += new System.EventHandler(this.comboBox28_SelectedIndexChanged);
this.comboBox28.TextChanged += new System.EventHandler(this.comboBox28_TextChanged);
this.comboBox28.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox28_KeyPress);
//
// label28
//
@@ -1197,9 +1063,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox27, "comboBox27");
this.comboBox27.FormattingEnabled = true;
this.comboBox27.Name = "comboBox27";
this.comboBox27.SelectedIndexChanged += new System.EventHandler(this.comboBox27_SelectedIndexChanged);
this.comboBox27.TextChanged += new System.EventHandler(this.comboBox27_TextChanged);
this.comboBox27.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox27_KeyPress);
//
// label27
//
@@ -1217,9 +1080,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox26, "comboBox26");
this.comboBox26.FormattingEnabled = true;
this.comboBox26.Name = "comboBox26";
this.comboBox26.SelectedIndexChanged += new System.EventHandler(this.comboBox26_SelectedIndexChanged);
this.comboBox26.TextChanged += new System.EventHandler(this.comboBox26_TextChanged);
this.comboBox26.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox26_KeyPress);
//
// label26
//
@@ -1237,9 +1097,6 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
resources.ApplyResources(this.comboBox25, "comboBox25");
this.comboBox25.FormattingEnabled = true;
this.comboBox25.Name = "comboBox25";
this.comboBox25.SelectedIndexChanged += new System.EventHandler(this.comboBox25_SelectedIndexChanged);
this.comboBox25.TextChanged += new System.EventHandler(this.comboBox25_TextChanged);
this.comboBox25.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox25_KeyPress);
//
// label25
//
+6 -1
View File
@@ -2,6 +2,7 @@
/// Copyright (c) 2017 Sensus Metering Systems
///
using System.Net;
using Common;
using log4net;
namespace TBF.Rig.Network.Adapter
@@ -37,7 +38,11 @@ namespace TBF.Rig.Network.Adapter
AdapterInfo netadapter = AdapterInfo.GetNetAdapter(netadapterCfg.Description);
ipAddress = netadapter.IPAddress;
netMask = netadapter.NetMask;
broadcastAddress = netadapter.GetBroadcastAddress();
if (this.Cfg.DebugLevel != DebugMode.Simulate)
{
broadcastAddress = netadapter.GetBroadcastAddress();
}
}
}
}