UI : ProcedureDlg : TempLo, TempHi, TempUnit, Uncertainty and Repeats in Metrology I and II swapped.
This commit is contained in:
+114
-103
@@ -1,5 +1,5 @@
|
|||||||
///
|
///
|
||||||
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
|
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
|
||||||
///
|
///
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -791,9 +791,8 @@ namespace TBF.UI.Procedures
|
|||||||
TestTime,
|
TestTime,
|
||||||
ErrLimLo,
|
ErrLimLo,
|
||||||
ErrLimHi,
|
ErrLimHi,
|
||||||
TempLimLo,
|
Uncertainty,
|
||||||
TempLimHi,
|
Repeats,
|
||||||
TempUnit,
|
|
||||||
Method,
|
Method,
|
||||||
ColumnsCount
|
ColumnsCount
|
||||||
}
|
}
|
||||||
@@ -814,9 +813,8 @@ namespace TBF.UI.Procedures
|
|||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Test_time_s_chdr, Width = 70 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Test_time_s_chdr, Width = 70 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_neg_pct_chdr, Width = 80 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_neg_pct_chdr, Width = 80 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_pos_pct_chdr, Width = 80 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_pos_pct_chdr, Width = 80 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Temp_lim_lo_chdr, Width = 100 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Uncertainty_pct_chdr, Width = 90 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Temp_lim_hi_chdr, Width = 100 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Repeats_nr_chdr, Width = 90 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = "Unit", Width = 50 });
|
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Method_chdr, Width = 200 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Method_chdr, Width = 200 });
|
||||||
|
|
||||||
methodCBox = new ComboBox();
|
methodCBox = new ComboBox();
|
||||||
@@ -824,7 +822,11 @@ namespace TBF.UI.Procedures
|
|||||||
|
|
||||||
var flowUnitBox = new ComboBox();
|
var flowUnitBox = new ComboBox();
|
||||||
var volUnitBox = new ComboBox();
|
var volUnitBox = new ComboBox();
|
||||||
var tempUnitBox = new ComboBox();
|
for (Common.Unit u = 0; u < Common.Unit.Count; u++)
|
||||||
|
{
|
||||||
|
if (Units.IsFlow(u)) flowUnitBox.Items.Add(u.ToDescription());
|
||||||
|
if (Units.IsVolume(u)) volUnitBox.Items.Add(u.ToDescription());
|
||||||
|
}
|
||||||
|
|
||||||
metrology1Editors = new Control[]
|
metrology1Editors = new Control[]
|
||||||
{
|
{
|
||||||
@@ -841,19 +843,11 @@ namespace TBF.UI.Procedures
|
|||||||
new TextBox(), /// Test time
|
new TextBox(), /// Test time
|
||||||
new TextBox(), /// Err.Lim. -
|
new TextBox(), /// Err.Lim. -
|
||||||
new TextBox(), /// Err.Lim. +
|
new TextBox(), /// Err.Lim. +
|
||||||
new TextBox(), /// Temp.Lim. -
|
new TextBox(), /// Uncertainty
|
||||||
new TextBox(), /// Temp.Lim. +
|
new TextBox(), /// Repeats count
|
||||||
tempUnitBox,
|
|
||||||
methodCBox, /// Method
|
methodCBox, /// Method
|
||||||
};
|
};
|
||||||
|
|
||||||
for (Unit u = 0; u < Unit.Count; u++)
|
|
||||||
{
|
|
||||||
if (Units.IsFlow(u)) flowUnitBox.Items.Add(u.ToDescription());
|
|
||||||
if (Units.IsVolume(u)) volUnitBox.Items.Add(u.ToDescription());
|
|
||||||
if (Units.IsTemperature(u)) tempUnitBox.Items.Add(u.ToDescription());
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var ctrl in metrology1Editors)
|
foreach (var ctrl in metrology1Editors)
|
||||||
{
|
{
|
||||||
metrology1TabPage.Controls.Add(ctrl);
|
metrology1TabPage.Controls.Add(ctrl);
|
||||||
@@ -894,9 +888,8 @@ namespace TBF.UI.Procedures
|
|||||||
lvi.SubItems.Add(test.TestTime.ToString());
|
lvi.SubItems.Add(test.TestTime.ToString());
|
||||||
lvi.SubItems.Add(test.ErrLimLo.ToString());
|
lvi.SubItems.Add(test.ErrLimLo.ToString());
|
||||||
lvi.SubItems.Add(test.ErrLimHi.ToString());
|
lvi.SubItems.Add(test.ErrLimHi.ToString());
|
||||||
lvi.SubItems.Add(Units.ConvertTo(test.TempUnit, test.TempLimLo).ToString());
|
lvi.SubItems.Add(test.Uncertainty.ToString());
|
||||||
lvi.SubItems.Add(Units.ConvertTo(test.TempUnit, test.TempLimHi).ToString());
|
lvi.SubItems.Add(test.Repeats.ToString());
|
||||||
lvi.SubItems.Add(test.TempUnit.ToDescription());
|
|
||||||
lvi.SubItems.Add((test.Method != null) ? test.Method.ToString() : string.Empty);
|
lvi.SubItems.Add((test.Method != null) ? test.Method.ToString() : string.Empty);
|
||||||
|
|
||||||
test.ResetChngdFlags();
|
test.ResetChngdFlags();
|
||||||
@@ -924,6 +917,7 @@ namespace TBF.UI.Procedures
|
|||||||
test.Part = part;
|
test.Part = part;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int itmp;
|
||||||
float tmp;
|
float tmp;
|
||||||
double dtmp;
|
double dtmp;
|
||||||
#if TEST_PROFILES
|
#if TEST_PROFILES
|
||||||
@@ -940,14 +934,12 @@ namespace TBF.UI.Procedures
|
|||||||
test.Volume = (float)Units.ConvertFrom(test.VolumeUnit, dtmp);
|
test.Volume = (float)Units.ConvertFrom(test.VolumeUnit, dtmp);
|
||||||
|
|
||||||
if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.TestTime].Text, out tmp)) test.TestTime = tmp;
|
if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.TestTime].Text, out tmp)) test.TestTime = tmp;
|
||||||
if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimLo].Text, out tmp)) test.ErrLimLo = tmp;
|
|
||||||
|
if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimLo].Text, out tmp)) test.ErrLimLo = tmp;
|
||||||
if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimHi].Text, out tmp)) test.ErrLimHi = tmp;
|
if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimHi].Text, out tmp)) test.ErrLimHi = tmp;
|
||||||
|
if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Uncertainty].Text, out tmp)) test.Uncertainty = tmp;
|
||||||
|
|
||||||
if (test.TempLimLoTextChngd && Utils.TryParseUDouble(lvi.SubItems[(int)MtrlgyClmn.TempLimLo].Text, out dtmp))
|
if (int.TryParse(lvi.SubItems[(int)MtrlgyClmn.Repeats].Text, out itmp)) test.Repeats = itmp;
|
||||||
test.TempLimLo = (float)Units.ConvertFrom(test.TempUnit, dtmp);
|
|
||||||
|
|
||||||
if (test.TempLimHiTextChngd && Utils.TryParseUDouble(lvi.SubItems[(int)MtrlgyClmn.TempLimHi].Text, out dtmp))
|
|
||||||
test.TempLimHi = (float)Units.ConvertFrom(test.TempUnit, dtmp);
|
|
||||||
|
|
||||||
if (methodCBox.Items.Contains(lvi.SubItems[(int)MtrlgyClmn.Method].Text))
|
if (methodCBox.Items.Contains(lvi.SubItems[(int)MtrlgyClmn.Method].Text))
|
||||||
{
|
{
|
||||||
@@ -964,7 +956,7 @@ namespace TBF.UI.Procedures
|
|||||||
if (e.SubItem == (int)MtrlgyClmn.Qtg) return;
|
if (e.SubItem == (int)MtrlgyClmn.Qtg) return;
|
||||||
#endif
|
#endif
|
||||||
/// Unit change is allowed when locked
|
/// Unit change is allowed when locked
|
||||||
if ((column != MtrlgyClmn.FlowUnit && column != MtrlgyClmn.VolumeUnit && column != MtrlgyClmn.TempUnit) &&
|
if ((column != MtrlgyClmn.FlowUnit && column != MtrlgyClmn.VolumeUnit) &&
|
||||||
(!unlocked || column >= MtrlgyClmn.ColumnsCount))
|
(!unlocked || column >= MtrlgyClmn.ColumnsCount))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@@ -975,7 +967,6 @@ namespace TBF.UI.Procedures
|
|||||||
MtrlgyClmn.Name,
|
MtrlgyClmn.Name,
|
||||||
MtrlgyClmn.Qfrom, MtrlgyClmn.Qto,
|
MtrlgyClmn.Qfrom, MtrlgyClmn.Qto,
|
||||||
MtrlgyClmn.ErrLimLo, MtrlgyClmn.ErrLimHi,
|
MtrlgyClmn.ErrLimLo, MtrlgyClmn.ErrLimHi,
|
||||||
MtrlgyClmn.TempLimLo, MtrlgyClmn.TempLimHi
|
|
||||||
};
|
};
|
||||||
if (((e.Item.Tag as Test).Profile >= TestProfile.Protected) && protectedColumns.Contains<MtrlgyClmn>(column)) return;
|
if (((e.Item.Tag as Test).Profile >= TestProfile.Protected) && protectedColumns.Contains<MtrlgyClmn>(column)) return;
|
||||||
|
|
||||||
@@ -1007,7 +998,6 @@ namespace TBF.UI.Procedures
|
|||||||
{
|
{
|
||||||
case MtrlgyClmn.FlowUnit: UpdateFlow(item, Units.FromDescription(value)); break;
|
case MtrlgyClmn.FlowUnit: UpdateFlow(item, Units.FromDescription(value)); break;
|
||||||
case MtrlgyClmn.VolumeUnit: UpdateVolume(item, Units.FromDescription(value)); break;
|
case MtrlgyClmn.VolumeUnit: UpdateVolume(item, Units.FromDescription(value)); break;
|
||||||
case MtrlgyClmn.TempUnit: UpdateTemperature(item, Units.FromDescription(value)); break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (item == e.Item)
|
else if (item == e.Item)
|
||||||
@@ -1053,20 +1043,12 @@ namespace TBF.UI.Procedures
|
|||||||
if (Utils.TryParseSFloat(e.DisplayText, out fdummy)) return;
|
if (Utils.TryParseSFloat(e.DisplayText, out fdummy)) return;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MtrlgyClmn.TempLimLo:
|
case MtrlgyClmn.Uncertainty:
|
||||||
if (Utils.TryParseUFloat(e.DisplayText, out fdummy))
|
if (Utils.TryParseUFloat(e.DisplayText, out fdummy)) return;
|
||||||
{
|
|
||||||
if (e.DisplayText != e.Item.SubItems[e.SubItem].Text) test.TempLimLoTextChngd = true;
|
|
||||||
return; /// OK
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MtrlgyClmn.TempLimHi:
|
case MtrlgyClmn.Repeats:
|
||||||
if (Utils.TryParseUFloat(e.DisplayText, out fdummy))
|
if (int.TryParse(e.DisplayText, out dummy)) return; /// OK
|
||||||
{
|
|
||||||
if (e.DisplayText != e.Item.SubItems[e.SubItem].Text) test.TempLimHiTextChngd = true;
|
|
||||||
return; /// OK
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MtrlgyClmn.FlowUnit:
|
case MtrlgyClmn.FlowUnit:
|
||||||
@@ -1081,12 +1063,6 @@ namespace TBF.UI.Procedures
|
|||||||
UpdateVolume(e.Item, newUnit);
|
UpdateVolume(e.Item, newUnit);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case MtrlgyClmn.TempUnit:
|
|
||||||
newUnit = Units.FromDescription(e.DisplayText);
|
|
||||||
if (!Units.IsTemperature(newUnit)) break;
|
|
||||||
UpdateTemperature(e.Item, newUnit);
|
|
||||||
return;
|
|
||||||
|
|
||||||
case MtrlgyClmn.Method:
|
case MtrlgyClmn.Method:
|
||||||
if (methodCBox.Items.Contains(e.DisplayText)) return;
|
if (methodCBox.Items.Contains(e.DisplayText)) return;
|
||||||
break;
|
break;
|
||||||
@@ -1215,11 +1191,11 @@ namespace TBF.UI.Procedures
|
|||||||
Unit oriUnit = test.TempUnit;
|
Unit oriUnit = test.TempUnit;
|
||||||
test.TempUnit = newUnit;
|
test.TempUnit = newUnit;
|
||||||
|
|
||||||
int ix = (int)MtrlgyClmn.TempLimLo;
|
int ix = (int)Mtrlgy2Clmn.TempLimLo;
|
||||||
double tempC = Units.ConvertFrom(oriUnit, Utils.ParseUDouble(item.SubItems[ix].Text));
|
double tempC = Units.ConvertFrom(oriUnit, Utils.ParseUDouble(item.SubItems[ix].Text));
|
||||||
item.SubItems[ix].Text = Units.ConvertTo(newUnit, test.TempLimLoTextChngd ? tempC : test.TempLimLo).ToString();
|
item.SubItems[ix].Text = Units.ConvertTo(newUnit, test.TempLimLoTextChngd ? tempC : test.TempLimLo).ToString();
|
||||||
|
|
||||||
ix = (int)MtrlgyClmn.TempLimHi;
|
ix = (int)Mtrlgy2Clmn.TempLimHi;
|
||||||
tempC = Units.ConvertFrom(oriUnit, Utils.ParseUDouble(item.SubItems[ix].Text));
|
tempC = Units.ConvertFrom(oriUnit, Utils.ParseUDouble(item.SubItems[ix].Text));
|
||||||
item.SubItems[ix].Text = Units.ConvertTo(newUnit, test.TempLimHiTextChngd ? tempC : test.TempLimHi).ToString();
|
item.SubItems[ix].Text = Units.ConvertTo(newUnit, test.TempLimHiTextChngd ? tempC : test.TempLimHi).ToString();
|
||||||
}
|
}
|
||||||
@@ -1232,8 +1208,9 @@ namespace TBF.UI.Procedures
|
|||||||
{
|
{
|
||||||
Name,
|
Name,
|
||||||
Part,
|
Part,
|
||||||
Uncertainty,
|
TempLimLo,
|
||||||
Repeats,
|
TempLimHi,
|
||||||
|
TempUnit,
|
||||||
ControlWaterTemp,
|
ControlWaterTemp,
|
||||||
ShortPulses,
|
ShortPulses,
|
||||||
Publish,
|
Publish,
|
||||||
@@ -1248,24 +1225,31 @@ namespace TBF.UI.Procedures
|
|||||||
ListViewEx lv = metrology2ListViewEx;
|
ListViewEx lv = metrology2ListViewEx;
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Uncertainty_pct_chdr, Width = 90 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Temp_lim_lo_chdr, Width = 100 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Repeats_nr_chdr, Width = 90 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Temp_lim_hi_chdr, Width = 100 });
|
||||||
|
lv.Columns.Add(new ColumnHeader { Text = "Unit", Width = 50 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Control_water_temp_chdr, Width = 110 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Control_water_temp_chdr, Width = 110 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Short_pulses, Width = 100 }); /// Strings.Tol_red_pct_chdr
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Short_pulses, Width = 100 }); /// Strings.Tol_red_pct_chdr
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Publish, Width = 100 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Publish, Width = 100 });
|
||||||
lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 100 });
|
lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 100 });
|
||||||
|
|
||||||
ComboBox publishCBox = new ComboBox(); /// control for Publish
|
ComboBox publishCBox = new ComboBox(); /// control for Publish
|
||||||
for (Publish pb = 0; pb < Publish.Count; pb++)
|
for (Publish pb = 0; pb < Publish.Count; pb++)
|
||||||
{
|
{
|
||||||
publishCBox.Items.Add(pb.ToDescription());
|
publishCBox.Items.Add(pb.ToDescription());
|
||||||
}
|
}
|
||||||
|
|
||||||
ComboBox yesNo2CBox = new ComboBox(); /// control for Control water temp.
|
ComboBox tempUnitBox = new ComboBox();
|
||||||
|
for (Common.Unit u = 0; u < Common.Unit.Count; u++)
|
||||||
|
{
|
||||||
|
if (Units.IsTemperature(u)) tempUnitBox.Items.Add(u.ToDescription());
|
||||||
|
}
|
||||||
|
|
||||||
|
ComboBox yesNo2CBox = new ComboBox(); /// control for Control water temp.
|
||||||
yesNo2CBox.Items.Add(Strings.yes);
|
yesNo2CBox.Items.Add(Strings.yes);
|
||||||
yesNo2CBox.Items.Add(Strings.no);
|
yesNo2CBox.Items.Add(Strings.no);
|
||||||
|
|
||||||
ComboBox yesNo3CBox = new ComboBox(); /// control for Evaluate
|
ComboBox yesNo3CBox = new ComboBox(); /// control for Evaluate
|
||||||
yesNo3CBox.Items.Add(Strings.yes);
|
yesNo3CBox.Items.Add(Strings.yes);
|
||||||
yesNo3CBox.Items.Add(Strings.no);
|
yesNo3CBox.Items.Add(Strings.no);
|
||||||
|
|
||||||
@@ -1273,8 +1257,9 @@ namespace TBF.UI.Procedures
|
|||||||
{
|
{
|
||||||
new TextBox(), /// Name
|
new TextBox(), /// Name
|
||||||
new TextBox(), /// Part
|
new TextBox(), /// Part
|
||||||
new TextBox(), /// Uncertainty
|
new TextBox(), /// Temp.Lim. -
|
||||||
new TextBox(), /// Repeats count
|
new TextBox(), /// Temp.Lim. +
|
||||||
|
tempUnitBox,
|
||||||
yesNo2CBox, /// Control water temp.
|
yesNo2CBox, /// Control water temp.
|
||||||
new TextBox(), /// Short pulses
|
new TextBox(), /// Short pulses
|
||||||
publishCBox, /// Publish
|
publishCBox, /// Publish
|
||||||
@@ -1306,8 +1291,9 @@ namespace TBF.UI.Procedures
|
|||||||
ListViewItem lvi = new ListViewItem(test.Name); /// Name
|
ListViewItem lvi = new ListViewItem(test.Name); /// Name
|
||||||
lvi.Tag = test;
|
lvi.Tag = test;
|
||||||
lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// Part
|
lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); /// Part
|
||||||
lvi.SubItems.Add(test.Uncertainty.ToString());
|
lvi.SubItems.Add(Units.ConvertTo(test.TempUnit, test.TempLimLo).ToString());
|
||||||
lvi.SubItems.Add(test.Repeats.ToString());
|
lvi.SubItems.Add(Units.ConvertTo(test.TempUnit, test.TempLimHi).ToString());
|
||||||
|
lvi.SubItems.Add(test.TempUnit.ToDescription());
|
||||||
lvi.SubItems.Add(test.DoControlWaterTemp ? Strings.yes : Strings.no);
|
lvi.SubItems.Add(test.DoControlWaterTemp ? Strings.yes : Strings.no);
|
||||||
lvi.SubItems.Add(test.ShortPulses.ToString());
|
lvi.SubItems.Add(test.ShortPulses.ToString());
|
||||||
lvi.SubItems.Add(((Publish)test.Publish).ToDescription());
|
lvi.SubItems.Add(((Publish)test.Publish).ToDescription());
|
||||||
@@ -1318,6 +1304,8 @@ namespace TBF.UI.Procedures
|
|||||||
|
|
||||||
void UpdateFromMetrology2Tab()
|
void UpdateFromMetrology2Tab()
|
||||||
{
|
{
|
||||||
|
double dtmp;
|
||||||
|
|
||||||
for (int i = 0; i < metrology2ListViewEx.Items.Count; i++)
|
for (int i = 0; i < metrology2ListViewEx.Items.Count; i++)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -1327,12 +1315,16 @@ namespace TBF.UI.Procedures
|
|||||||
entity.ItemNr = i;
|
entity.ItemNr = i;
|
||||||
entity.Name = lvi.SubItems[(int)Mtrlgy2Clmn.Name].Text;
|
entity.Name = lvi.SubItems[(int)Mtrlgy2Clmn.Name].Text;
|
||||||
entity.Part = lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text.Equals("-") ? 0 : int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text);
|
entity.Part = lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text.Equals("-") ? 0 : int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text);
|
||||||
entity.Uncertainty = Utils.ParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.Uncertainty].Text);
|
|
||||||
entity.Repeats = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.Repeats].Text);
|
|
||||||
entity.DoControlWaterTemp = lvi.SubItems[(int)Mtrlgy2Clmn.ControlWaterTemp].Text.Equals(Strings.yes);
|
entity.DoControlWaterTemp = lvi.SubItems[(int)Mtrlgy2Clmn.ControlWaterTemp].Text.Equals(Strings.yes);
|
||||||
entity.ShortPulses = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.ShortPulses].Text);
|
entity.ShortPulses = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.ShortPulses].Text);
|
||||||
entity.DoEvaluate = lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.yes);
|
entity.DoEvaluate = lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.yes);
|
||||||
|
|
||||||
|
if (entity.TempLimLoTextChngd && Utils.TryParseUDouble(lvi.SubItems[(int)Mtrlgy2Clmn.TempLimLo].Text, out dtmp))
|
||||||
|
entity.TempLimLo = (float)Units.ConvertFrom(entity.TempUnit, dtmp);
|
||||||
|
|
||||||
|
if (entity.TempLimHiTextChngd && Utils.TryParseUDouble(lvi.SubItems[(int)Mtrlgy2Clmn.TempLimHi].Text, out dtmp))
|
||||||
|
entity.TempLimHi = (float)Units.ConvertFrom(entity.TempUnit, dtmp);
|
||||||
|
|
||||||
for (Publish pb = 0; pb < Publish.Count; pb++)
|
for (Publish pb = 0; pb < Publish.Count; pb++)
|
||||||
{
|
{
|
||||||
if (lvi.SubItems[(int)Mtrlgy2Clmn.Publish].Text.Equals(pb.ToDescription()))
|
if (lvi.SubItems[(int)Mtrlgy2Clmn.Publish].Text.Equals(pb.ToDescription()))
|
||||||
@@ -1351,11 +1343,18 @@ namespace TBF.UI.Procedures
|
|||||||
|
|
||||||
private void metrology2ListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
|
private void metrology2ListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
|
||||||
{
|
{
|
||||||
if (!unlocked || e.SubItem >= (int)Mtrlgy2Clmn.ColumnsCount) return;
|
Mtrlgy2Clmn column = (Mtrlgy2Clmn)e.SubItem;
|
||||||
|
|
||||||
|
/// Unit change is allowed when locked
|
||||||
|
if (column != Mtrlgy2Clmn.TempUnit && (!unlocked || column >= Mtrlgy2Clmn.ColumnsCount))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Mtrlgy2Clmn[] protectedColumns = new Mtrlgy2Clmn[]
|
Mtrlgy2Clmn[] protectedColumns = new Mtrlgy2Clmn[]
|
||||||
{
|
{
|
||||||
Mtrlgy2Clmn.Name,
|
Mtrlgy2Clmn.Name,
|
||||||
|
Mtrlgy2Clmn.TempLimLo, Mtrlgy2Clmn.TempLimHi,
|
||||||
Mtrlgy2Clmn.Publish, Mtrlgy2Clmn.Evaluate
|
Mtrlgy2Clmn.Publish, Mtrlgy2Clmn.Evaluate
|
||||||
};
|
};
|
||||||
if (((e.Item.Tag as Test).Profile >= TestProfile.Protected) && protectedColumns.Contains<Mtrlgy2Clmn>((Mtrlgy2Clmn)e.SubItem)) return;
|
if (((e.Item.Tag as Test).Profile >= TestProfile.Protected) && protectedColumns.Contains<Mtrlgy2Clmn>((Mtrlgy2Clmn)e.SubItem)) return;
|
||||||
@@ -1382,6 +1381,8 @@ namespace TBF.UI.Procedures
|
|||||||
{
|
{
|
||||||
item.SubItems[columnNr].Text = value;
|
item.SubItems[columnNr].Text = value;
|
||||||
item.SubItems[columnNr].BackColor = backColor;
|
item.SubItems[columnNr].BackColor = backColor;
|
||||||
|
|
||||||
|
if (columnNr == (int)Mtrlgy2Clmn.TempUnit) UpdateTemperature(item, Units.FromDescription(value));
|
||||||
}
|
}
|
||||||
else if (item == e.Item)
|
else if (item == e.Item)
|
||||||
{
|
{
|
||||||
@@ -1394,54 +1395,64 @@ namespace TBF.UI.Procedures
|
|||||||
|
|
||||||
private void metrology2ListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
|
private void metrology2ListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
|
||||||
{
|
{
|
||||||
if (e.SubItem == (int)Mtrlgy2Clmn.Name)
|
Test test = e.Item.Tag as Test;
|
||||||
{
|
Mtrlgy2Clmn column = (Mtrlgy2Clmn)e.SubItem;
|
||||||
if (!Utils.IsGoodFName(e.DisplayText))
|
Unit newUnit;
|
||||||
{
|
|
||||||
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
|
|
||||||
e.Cancel = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int dummy;
|
int dummy;
|
||||||
if (e.SubItem == (int)Mtrlgy2Clmn.Part)
|
uint udummy;
|
||||||
|
float fdummy;
|
||||||
|
|
||||||
|
switch (column)
|
||||||
{
|
{
|
||||||
if (e.DisplayText.Equals("-")) return; /// OK
|
case Mtrlgy2Clmn.Name:
|
||||||
if (!int.TryParse(e.DisplayText, out dummy) || !Data.IsGoodPartNr(dummy))
|
if (Utils.IsGoodFName(e.DisplayText)) return; /// OK
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Mtrlgy2Clmn.Part:
|
||||||
{
|
{
|
||||||
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
|
if (e.DisplayText.Equals("-")) return; /// OK
|
||||||
e.Cancel = true;
|
if (int.TryParse(e.DisplayText, out dummy) && Data.IsGoodPartNr(dummy)) return; /// OK
|
||||||
return; /// NOK
|
break;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if ((e.SubItem == (int)Mtrlgy2Clmn.Repeats) && !int.TryParse(e.DisplayText, out dummy))
|
case Mtrlgy2Clmn.TempLimLo:
|
||||||
{
|
if (Utils.TryParseUFloat(e.DisplayText, out fdummy))
|
||||||
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
|
{
|
||||||
e.Cancel = true;
|
if (e.DisplayText != e.Item.SubItems[e.SubItem].Text) test.TempLimLoTextChngd = true;
|
||||||
return;
|
return; /// OK
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
int idummy;
|
case Mtrlgy2Clmn.TempLimHi:
|
||||||
if ((e.SubItem == (int)Mtrlgy2Clmn.ShortPulses) && (!int.TryParse(e.DisplayText, out idummy) || idummy < 0 || idummy > 1))
|
if (Utils.TryParseUFloat(e.DisplayText, out fdummy))
|
||||||
{
|
{
|
||||||
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
|
if (e.DisplayText != e.Item.SubItems[e.SubItem].Text) test.TempLimHiTextChngd = true;
|
||||||
e.Cancel = true;
|
return; /// OK
|
||||||
return;
|
}
|
||||||
}
|
break;
|
||||||
|
|
||||||
|
case Mtrlgy2Clmn.TempUnit:
|
||||||
/// Combo boxes
|
newUnit = Units.FromDescription(e.DisplayText);
|
||||||
if ((e.SubItem == (int)Mtrlgy2Clmn.ControlWaterTemp) || (e.SubItem == (int)Mtrlgy2Clmn.Publish) || (e.SubItem == (int)Mtrlgy2Clmn.Evaluate))
|
if (!Units.IsTemperature(newUnit)) break;
|
||||||
{
|
UpdateTemperature(e.Item, newUnit);
|
||||||
if (!(metrology2Editors[e.SubItem] as ComboBox).Items.Contains(e.DisplayText))
|
|
||||||
{
|
|
||||||
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
|
|
||||||
e.Cancel = true;
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
case Mtrlgy2Clmn.ShortPulses:
|
||||||
|
if (uint.TryParse(e.DisplayText, out udummy)) return;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Mtrlgy2Clmn.ControlWaterTemp:
|
||||||
|
case Mtrlgy2Clmn.Publish:
|
||||||
|
case Mtrlgy2Clmn.Evaluate:
|
||||||
|
/// Combo boxes
|
||||||
|
if ((metrology2Editors[e.SubItem] as ComboBox).Items.Contains(e.DisplayText)) return; /// OK
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Display text was not OK, revert to the original one
|
||||||
|
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
|
||||||
|
e.Cancel = true;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
Reference in New Issue
Block a user