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

Database cleanup, columns correctly renamed, DataContainer namespace, etc.

Browse Source
This commit is contained in:
Milan Hanajik
2021-02-24 17:42:50 +01:00
parent a9d6fa631c
commit b5f8d06e5b
91 changed files with 390 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Procedures/ProcedureDlg.cs
+13 -13
View File
@@ -827,7 +827,7 @@ namespace TBF.UI.Procedures
lvi.SubItems.Add(test.Qfrom.ToString()); /// Q_from
lvi.SubItems.Add(test.Qto.ToString()); /// Q_to
lvi.SubItems.Add(test.Volume.ToString()); /// VOlume
lvi.SubItems.Add(test.TstTime.ToString());
lvi.SubItems.Add(test.TestTime.ToString());
lvi.SubItems.Add(test.ErrLimLo.ToString());
lvi.SubItems.Add(test.ErrLimHi.ToString());
lvi.SubItems.Add(test.TempLimLo.ToString());
@@ -864,7 +864,7 @@ namespace TBF.UI.Procedures
if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Qfrom].Text, out tmp)) entity.Qfrom = tmp;
if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Qto].Text, out tmp)) entity.Qto = tmp;
if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Volume].Text, out tmp)) entity.Volume = tmp;
if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.TestTime].Text,out tmp)) entity.TstTime = tmp;
if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.TestTime].Text,out tmp)) entity.TestTime = tmp;
if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimLo].Text, out tmp)) entity.ErrLimLo = tmp;
if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimHi].Text, out tmp)) entity.ErrLimHi = tmp;
@@ -1104,7 +1104,7 @@ namespace TBF.UI.Procedures
lvi.SubItems.Add(test.Uncertainty.ToString());
lvi.SubItems.Add(test.Repeats.ToString());
lvi.SubItems.Add(test.DoControlWaterTemp ? Strings.yes : Strings.no);
lvi.SubItems.Add(test.TolerRed.ToString());
lvi.SubItems.Add(test.ShortPulses.ToString());
lvi.SubItems.Add(((Config.Entities.Publish)test.Publish).ToDescription());
lvi.SubItems.Add(test.DoEvaluate ? Strings.yes : Strings.no);
@@ -1125,7 +1125,7 @@ namespace TBF.UI.Procedures
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.TolerRed = (double)Utils.ParseUFloat(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);
for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++)
@@ -1218,8 +1218,8 @@ namespace TBF.UI.Procedures
return;
}
float fdummy;
if ((e.SubItem == (int)Mtrlgy2Clmn.ShortPulses) && !Utils.TryParseUFloat(e.DisplayText, out fdummy))
int idummy;
if ((e.SubItem == (int)Mtrlgy2Clmn.ShortPulses) && (!int.TryParse(e.DisplayText, out idummy) || idummy < 0 || idummy > 1))
{
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
e.Cancel = true;
@@ -1381,9 +1381,9 @@ namespace TBF.UI.Procedures
lvi.SubItems.Add(test.HeatMetersPath);
#endif
lvi.SubItems.Add(test.MetersPath);
lvi.SubItems.Add(string.IsNullOrEmpty(test.RelTransBefore) ? "---" : test.RelTransBefore);
lvi.SubItems.Add(string.IsNullOrEmpty(test.RelTransBetween) ? "---" : test.RelTransBetween);
lvi.SubItems.Add(string.IsNullOrEmpty(test.TransitionAfter) ? "---" : test.TransitionAfter);
lvi.SubItems.Add(string.IsNullOrEmpty(test.TransBefore) ? "---" : test.TransBefore);
lvi.SubItems.Add(string.IsNullOrEmpty(test.TransBetween) ? "---" : test.TransBetween);
lvi.SubItems.Add(string.IsNullOrEmpty(test.TransAfter) ? "---" : test.TransAfter);
}
processListViewEx.Items.Add(lvi);
@@ -1445,21 +1445,21 @@ namespace TBF.UI.Procedures
subItemText = lvi.SubItems[column].Text;
if (string.IsNullOrEmpty(subItemText) || (processEditors[column] as ComboBox).Items.Contains(subItemText))
{
test.RelTransBefore = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
test.TransBefore = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
}
column = (int)ProcessClmn.TrnBetween;
subItemText = lvi.SubItems[column].Text;
if (string.IsNullOrEmpty(subItemText) || (processEditors[column] as ComboBox).Items.Contains(subItemText))
{
test.RelTransBetween = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
test.TransBetween = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
}
column = (int)ProcessClmn.TrnStop;
subItemText = lvi.SubItems[column].Text;
if (string.IsNullOrEmpty(subItemText) || (processEditors[column] as ComboBox).Items.Contains(subItemText))
{
test.TransitionAfter = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
test.TransAfter = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
}
}
@@ -2779,7 +2779,7 @@ namespace TBF.UI.Procedures
test.Qfrom = (float)qfrom;
test.Qto = (float)qto;
test.TstTime = (float)ti.TestTime;
test.TestTime = (float)ti.TestTime;
test.Volume = (float)volume;
test.ErrLimLo = (float)(ti.ErrLimLoFromDB - ti.Uncertainty);
test.ErrLimHi = (float)(ti.ErrLimHiFromDB + ti.Uncertainty);