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

Q_from and Q_to removed from three Procedure tabs.

Browse Source
This commit is contained in:
Milan Hanajik 2017-06-08 11:28:10 +02:00
parent f803d27882
commit 420d016ee8
1 changed files with 10 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
TestBenchFramework/ProcedureDlg.cs
View File

@ -659,8 +659,6 @@ namespace TBF
{
Name,
Part,
Qfrom,
Qto,
ErrLimLo,
ErrLimHi,
Uncertainty,
@ -676,8 +674,6 @@ namespace TBF
{
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 });
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 });
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_from_m3h, Width = 80 });
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_to_m3h, Width = 80 });
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_neg_pct_chdr, Width = 100 });
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_pos_pct_chdr, Width = 100 });
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Uncertainty_pct_chdr, Width = 100 });
@ -703,8 +699,6 @@ namespace TBF
{
new TextBox(), /// Name
new TextBox(), /// Part
new TextBox(), /// Qfrom
new TextBox(), /// Qto
new TextBox(), /// Err.Lim. -
new TextBox(), /// Err.Lim. +
new TextBox(), /// Uncertainty
@ -723,8 +717,6 @@ namespace TBF
{
Name,
Part,
Qfrom,
Qto,
Feeding,
Bench,
Output,
@ -743,8 +735,6 @@ namespace TBF
{
processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 });
processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 });
processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_from_m3h, Width = 80 });
processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_to_m3h, Width = 80 });
processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Feeding_chdr, Width = 80 });
processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Bench_chdr, Width = 80 });
processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Output_chdr, Width = 80 });
@ -759,8 +749,6 @@ namespace TBF
{
new TextBox(), /// Name
new TextBox(), /// Part
new TextBox(), /// Qfrom
new TextBox(), /// Qto
new ComboBox(), /// Feeding
new ComboBox(), /// Table
new ComboBox(), /// Output
@ -798,8 +786,6 @@ namespace TBF
{
Name,
Part,
Qfrom,
Qto,
PumpPower,
MassRepeats,
#if STABLE_MASS_EXTRAS
@ -819,8 +805,6 @@ namespace TBF
{
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_from_m3h, Width = 80 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_to_m3h, Width = 80 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Pump_power_pct, Width = 90 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Mass_repeats, Width = 90 });
#if STABLE_MASS_EXTRAS
@ -836,8 +820,6 @@ namespace TBF
{
new TextBox(), /// Name
new TextBox(), /// Part
new TextBox(), /// Qfrom
new TextBox(), /// Qto
new ComboBox(), /// PumpPower
new TextBox(), /// MassRepeats
#if STABLE_MASS_EXTRAS
@ -908,20 +890,12 @@ namespace TBF
lviProcess.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); ///
lviParameters.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString()); ///
lviMetrlg1.SubItems.Add(test.Qfrom.ToString()); ///
lviMetrlg2.SubItems.Add(test.Qfrom.ToString()); /// Q_from
lviProcess.SubItems.Add(test.Qfrom.ToString()); ///
lviParameters.SubItems.Add(test.Qfrom.ToString()); ///
lviMetrlg1.SubItems.Add(test.Qto.ToString()); ///
lviMetrlg2.SubItems.Add(test.Qto.ToString()); /// Q_to
lviProcess.SubItems.Add(test.Qto.ToString()); ///
lviParameters.SubItems.Add(test.Qto.ToString()); ///
///
/// Metrology 1 subitems Volume, ...
/// Metrology 1 subitems
///
lviMetrlg1.SubItems.Add(test.Volume.ToString());
lviMetrlg1.SubItems.Add(test.Qfrom.ToString()); /// Q_from
lviMetrlg1.SubItems.Add(test.Qto.ToString()); /// Q_to
lviMetrlg1.SubItems.Add(test.Volume.ToString()); /// VOlume
lviMetrlg1.SubItems.Add(test.TstTime.ToString());
lviMetrlg1.SubItems.Add(test.Repeats.ToString());
lviMetrlg1.SubItems.Add(test.Draining ? Strings.yes : Strings.no);
@ -1275,10 +1249,7 @@ namespace TBF
private void metrology2ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)Mtrlgy2Clmn.Qfrom ||
e.SubItem == (int)Mtrlgy2Clmn.Qto ||
e.SubItem >= (int)Mtrlgy2Clmn.Mtrlgy2ClmnCount)
if (!unlocked || e.SubItem >= (int)Mtrlgy2Clmn.Mtrlgy2ClmnCount)
{
return;
}
@ -1288,10 +1259,7 @@ namespace TBF
void metrology2ListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)Mtrlgy2Clmn.Qfrom ||
e.SubItem == (int)Mtrlgy2Clmn.Qto ||
e.SubItem >= (int)Mtrlgy2Clmn.Mtrlgy2ClmnCount)
if (!unlocked || e.SubItem >= (int)Mtrlgy2Clmn.Mtrlgy2ClmnCount)
{
return;
}
@ -1345,10 +1313,7 @@ namespace TBF
private void processListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)ProcessClmn.Qfrom ||
e.SubItem == (int)ProcessClmn.Qto ||
e.SubItem >= (int)ProcessClmn.ProcessClmnCount)
if (!unlocked || e.SubItem >= (int)ProcessClmn.ProcessClmnCount)
{
return;
}
@ -1358,10 +1323,7 @@ namespace TBF
void processListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)ProcessClmn.Qfrom ||
e.SubItem == (int)ProcessClmn.Qto ||
e.SubItem >= (int)ProcessClmn.ProcessClmnCount)
if (!unlocked || e.SubItem >= (int)ProcessClmn.ProcessClmnCount)
{
return;
}
@ -1416,10 +1378,7 @@ namespace TBF
private void parametersListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)ParametersClmn.Qfrom ||
e.SubItem == (int)ParametersClmn.Qto ||
e.SubItem >= (int)ParametersClmn.ParametersClmnCount)
if (!unlocked || e.SubItem >= (int)ParametersClmn.ParametersClmnCount)
{
return;
}
@ -1429,10 +1388,7 @@ namespace TBF
void parametersListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e)
{
if (!unlocked ||
e.SubItem == (int)ParametersClmn.Qfrom ||
e.SubItem == (int)ParametersClmn.Qto ||
e.SubItem >= (int)ParametersClmn.ParametersClmnCount)
if (!unlocked || e.SubItem >= (int)ParametersClmn.ParametersClmnCount)
{
return;
}