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

ValveCategory.All removed, RegValve-s are never in ValveCategory.Bench.

Browse Source
This commit is contained in:
Milan Hanajik
2021-02-24 14:36:34 +01:00
parent 4cf4192ebb
commit 878e7be9fa
12 changed files with 22 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/BuiltIn/Valve/ValveCfgCtrl.cs
+1 -3
View File
@@ -37,7 +37,6 @@ namespace TBF.BenchControl.BuiltIn.Valve
parent = ParentForm as ComponentParametersDlg; parent = ParentForm as ComponentParametersDlg;
if (parent == null) return; if (parent == null) return;
categoryComboBox.Items.Add(ValveCategory.All.ToString());
categoryComboBox.Items.Add(ValveCategory.Feeding.ToString()); categoryComboBox.Items.Add(ValveCategory.Feeding.ToString());
categoryComboBox.Items.Add(ValveCategory.Bench.ToString()); categoryComboBox.Items.Add(ValveCategory.Bench.ToString());
categoryComboBox.Items.Add(ValveCategory.Output.ToString()); categoryComboBox.Items.Add(ValveCategory.Output.ToString());
@@ -113,8 +112,7 @@ namespace TBF.BenchControl.BuiltIn.Valve
int newOpenCloseTime = int.Parse(openCloseTimeTextBox.Text); int newOpenCloseTime = int.Parse(openCloseTimeTextBox.Text);
ValveCategory newCategory; ValveCategory newCategory;
if (categoryComboBox.Text.Equals(ValveCategory.All.ToString())) newCategory = ValveCategory.All; if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Bench.ToString())) newCategory = ValveCategory.Bench; else if (categoryComboBox.Text.Equals(ValveCategory.Bench.ToString())) newCategory = ValveCategory.Bench;
else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output; else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output;
else newCategory = ValveCategory.None; else newCategory = ValveCategory.None;
TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs
+2 -6
View File
@@ -33,7 +33,6 @@ namespace TBF.BenchControl.Dummy.RegulValve
private void RegulationValveCfgCtrl_Load(object sender, EventArgs e) private void RegulationValveCfgCtrl_Load(object sender, EventArgs e)
{ {
categoryComboBox.Items.Add(ValveCategory.All.ToString());
categoryComboBox.Items.Add(ValveCategory.Feeding.ToString()); categoryComboBox.Items.Add(ValveCategory.Feeding.ToString());
categoryComboBox.Items.Add(ValveCategory.Output.ToString()); categoryComboBox.Items.Add(ValveCategory.Output.ToString());
@@ -63,8 +62,7 @@ namespace TBF.BenchControl.Dummy.RegulValve
{ {
CfgUpdateFlags flags = CfgUpdateFlags.None; CfgUpdateFlags flags = CfgUpdateFlags.None;
if (!categoryComboBox.Text.Equals(ValveCategory.All.ToString()) && if (!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) !categoryComboBox.Text.Equals(ValveCategory.Output.ToString()))
{ {
flags |= CfgUpdateFlags.Error; flags |= CfgUpdateFlags.Error;
@@ -87,9 +85,7 @@ namespace TBF.BenchControl.Dummy.RegulValve
} }
ValveCategory newCategory; ValveCategory newCategory;
if (categoryComboBox.Text.Equals(ValveCategory.All.ToString())) newCategory = ValveCategory.All; if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Bench.ToString())) newCategory = ValveCategory.Bench;
else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output; else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output;
else newCategory = ValveCategory.None; else newCategory = ValveCategory.None;
if (newCategory != config.Category) if (newCategory != config.Category)
TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs
+2 -6
View File
@@ -50,7 +50,6 @@ namespace TBF.BenchControl.Elde.RegulValve
} }
} }
categoryComboBox.Items.Add(ValveCategory.All.ToString());
categoryComboBox.Items.Add(ValveCategory.Feeding.ToString()); categoryComboBox.Items.Add(ValveCategory.Feeding.ToString());
categoryComboBox.Items.Add(ValveCategory.Output.ToString()); categoryComboBox.Items.Add(ValveCategory.Output.ToString());
@@ -130,8 +129,7 @@ namespace TBF.BenchControl.Elde.RegulValve
message += Environment.NewLine + "Invalid 'Parent Name'"; message += Environment.NewLine + "Invalid 'Parent Name'";
} }
if (!categoryComboBox.Text.Equals(ValveCategory.All.ToString()) && if (!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) !categoryComboBox.Text.Equals(ValveCategory.Output.ToString()))
{ {
flags |= CfgUpdateFlags.Error; flags |= CfgUpdateFlags.Error;
@@ -197,9 +195,7 @@ namespace TBF.BenchControl.Elde.RegulValve
} }
ValveCategory newCategory; ValveCategory newCategory;
if (categoryComboBox.Text.Equals(ValveCategory.All.ToString())) newCategory = ValveCategory.All; if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Bench.ToString())) newCategory = ValveCategory.Bench;
else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output; else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output;
else newCategory = ValveCategory.None; else newCategory = ValveCategory.None;
if (newCategory != config.Category) if (newCategory != config.Category)
TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs
+2 -6
View File
@@ -47,7 +47,6 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
} }
} }
categoryComboBox.Items.Add(ValveCategory.All.ToString());
categoryComboBox.Items.Add(ValveCategory.Feeding.ToString()); categoryComboBox.Items.Add(ValveCategory.Feeding.ToString());
categoryComboBox.Items.Add(ValveCategory.Output.ToString()); categoryComboBox.Items.Add(ValveCategory.Output.ToString());
@@ -107,8 +106,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
flags |= CfgUpdateFlags.Error; flags |= CfgUpdateFlags.Error;
message += Environment.NewLine + "Invalid 'Parent Name'"; message += Environment.NewLine + "Invalid 'Parent Name'";
} }
if (!categoryComboBox.Text.Equals(ValveCategory.All.ToString()) && if (!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) !categoryComboBox.Text.Equals(ValveCategory.Output.ToString()))
{ {
flags |= CfgUpdateFlags.Error; flags |= CfgUpdateFlags.Error;
@@ -158,9 +156,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
} }
ValveCategory newCategory; ValveCategory newCategory;
if (categoryComboBox.Text.Equals(ValveCategory.All.ToString())) newCategory = ValveCategory.All; if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Bench.ToString())) newCategory = ValveCategory.Bench;
else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output; else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output;
else newCategory = ValveCategory.None; else newCategory = ValveCategory.None;
if (newCategory != config.Category) if (newCategory != config.Category)
TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs
+2 -6
View File
@@ -48,7 +48,6 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
} }
} }
categoryComboBox.Items.Add(ValveCategory.All.ToString());
categoryComboBox.Items.Add(ValveCategory.Feeding.ToString()); categoryComboBox.Items.Add(ValveCategory.Feeding.ToString());
categoryComboBox.Items.Add(ValveCategory.Output.ToString()); categoryComboBox.Items.Add(ValveCategory.Output.ToString());
@@ -88,8 +87,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
{ {
CfgUpdateFlags flags = CfgUpdateFlags.None; CfgUpdateFlags flags = CfgUpdateFlags.None;
if (!categoryComboBox.Text.Equals(ValveCategory.All.ToString()) && if (!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) !categoryComboBox.Text.Equals(ValveCategory.Output.ToString()))
{ {
flags |= CfgUpdateFlags.Error; flags |= CfgUpdateFlags.Error;
@@ -137,9 +135,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
} }
ValveCategory newCategory; ValveCategory newCategory;
if (categoryComboBox.Text.Equals(ValveCategory.All.ToString())) newCategory = ValveCategory.All; if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Bench.ToString())) newCategory = ValveCategory.Bench;
else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output; else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output;
else newCategory = ValveCategory.None; else newCategory = ValveCategory.None;
if (newCategory != config.Category) if (newCategory != config.Category)
TBF/BenchControl/Events.cs
-1
View File
@@ -35,7 +35,6 @@ namespace TBF.BenchControl
public enum ValveCategory public enum ValveCategory
{ {
All = 0, /// Valve will be shown in all paths
Feeding, /// Valve will be shown in Feeding paths Feeding, /// Valve will be shown in Feeding paths
Bench, /// Valve will be shown in Bench paths Bench, /// Valve will be shown in Bench paths
Output, /// Valve will be shown in Output paths Output, /// Valve will be shown in Output paths
TBF/BenchControl/FeedingPath.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace TBF.BenchControl
foreach (var cmpnt in components) foreach (var cmpnt in components)
{ {
IRegulValve regValve = cmpnt as IRegulValve; IRegulValve regValve = cmpnt as IRegulValve;
if (regValve != null && (regValve.Category == TBF.BenchControl.ValveCategory.Feeding || regValve.Category == TBF.BenchControl.ValveCategory.All)) if (regValve != null && regValve.Category == TBF.BenchControl.ValveCategory.Feeding)
{ {
RegulValves.Add(regValve); RegulValves.Add(regValve);
} }
TBF/BenchControl/Uni/RegValve/RegValveCfgCtrl.cs
+2 -6
View File
@@ -50,7 +50,6 @@ namespace TBF.BenchControl.Uni.RegValve
} }
} }
categoryComboBox.Items.Add(ValveCategory.All.ToString());
categoryComboBox.Items.Add(ValveCategory.Feeding.ToString()); categoryComboBox.Items.Add(ValveCategory.Feeding.ToString());
categoryComboBox.Items.Add(ValveCategory.Output.ToString()); categoryComboBox.Items.Add(ValveCategory.Output.ToString());
@@ -130,8 +129,7 @@ namespace TBF.BenchControl.Uni.RegValve
message += Environment.NewLine + "Invalid 'Parent Name'"; message += Environment.NewLine + "Invalid 'Parent Name'";
} }
if (!categoryComboBox.Text.Equals(ValveCategory.All.ToString()) && if (!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString()) &&
!categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) !categoryComboBox.Text.Equals(ValveCategory.Output.ToString()))
{ {
flags |= CfgUpdateFlags.Error; flags |= CfgUpdateFlags.Error;
@@ -197,9 +195,7 @@ namespace TBF.BenchControl.Uni.RegValve
} }
ValveCategory newCategory; ValveCategory newCategory;
if (categoryComboBox.Text.Equals(ValveCategory.All.ToString())) newCategory = ValveCategory.All; if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Feeding.ToString())) newCategory = ValveCategory.Feeding;
else if (categoryComboBox.Text.Equals(ValveCategory.Bench.ToString())) newCategory = ValveCategory.Bench;
else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output; else if (categoryComboBox.Text.Equals(ValveCategory.Output.ToString())) newCategory = ValveCategory.Output;
else newCategory = ValveCategory.None; else newCategory = ValveCategory.None;
if (newCategory != config.Category) if (newCategory != config.Category)
TBF/UI/Bench/Paths/PathsBenchCtrl.cs
+3 -3
View File
@@ -78,7 +78,7 @@ namespace TBF.UI.Bench.Paths
int clmn = (int)Column.FixedColumnsCount; int clmn = (int)Column.FixedColumnsCount;
foreach (var vlv in parent.Valves) foreach (var vlv in parent.Valves)
{ {
if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Bench) if (vlv.Category == ValveCategory.Bench)
{ {
Columns.Add(vlv.Cfg.Name, (ls.BenchColumnCount > clmn) ? ls.BenchColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct); Columns.Add(vlv.Cfg.Name, (ls.BenchColumnCount > clmn) ? ls.BenchColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct);
clmn++; clmn++;
@@ -207,7 +207,7 @@ namespace TBF.UI.Bench.Paths
foreach (var valve in parent.Valves) foreach (var valve in parent.Valves)
{ {
if (valve.Category == ValveCategory.All || valve.Category == ValveCategory.Bench) if (valve.Category == ValveCategory.Bench)
{ {
if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve)) if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve))
{ {
@@ -258,7 +258,7 @@ namespace TBF.UI.Bench.Paths
int k = 0; int k = 0;
for (int j = 0; j < parent.Valves.Count; j++) for (int j = 0; j < parent.Valves.Count; j++)
{ {
if (parent.Valves[j].Category == ValveCategory.All || parent.Valves[j].Category == ValveCategory.Bench) if (parent.Valves[j].Category == ValveCategory.Bench)
{ {
string text = lvi.SubItems[fixedColumnsCount + k].Text; string text = lvi.SubItems[fixedColumnsCount + k].Text;
if (text.Equals(Strings.open)) if (text.Equals(Strings.open))
TBF/UI/Bench/Paths/PathsDlg.cs
+1 -1
View File
@@ -75,7 +75,7 @@ namespace TBF.UI.Bench.Paths
foreach (var cmpnt in TbfComponents) foreach (var cmpnt in TbfComponents)
{ {
IRegulValve regValve = cmpnt as IRegulValve; IRegulValve regValve = cmpnt as IRegulValve;
if (regValve != null && (regValve.Category == TBF.BenchControl.ValveCategory.Feeding || regValve.Category == TBF.BenchControl.ValveCategory.All)) if (regValve != null && regValve.Category == TBF.BenchControl.ValveCategory.Feeding)
{ {
FeedingRegulValves.Add(regValve); FeedingRegulValves.Add(regValve);
} }
TBF/UI/Bench/Paths/PathsFeedingCtrl.cs
+3 -3
View File
@@ -77,7 +77,7 @@ namespace TBF.UI.Bench.Paths
foreach (var vlv in parent.Valves) foreach (var vlv in parent.Valves)
{ {
if (vlv.Category == TBF.BenchControl.ValveCategory.All || vlv.Category == TBF.BenchControl.ValveCategory.Feeding) if (vlv.Category == TBF.BenchControl.ValveCategory.Feeding)
{ {
Columns.Add(vlv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct); Columns.Add(vlv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct);
clmn++; clmn++;
@@ -197,7 +197,7 @@ namespace TBF.UI.Bench.Paths
foreach (var valve in parent.Valves) foreach (var valve in parent.Valves)
{ {
if (valve.Category == TBF.BenchControl.ValveCategory.All || valve.Category == TBF.BenchControl.ValveCategory.Feeding) if (valve.Category == TBF.BenchControl.ValveCategory.Feeding)
{ {
if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve)) if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve))
{ {
@@ -266,7 +266,7 @@ namespace TBF.UI.Bench.Paths
int k = 0; int k = 0;
for (int j = 0; j < parent.Valves.Count; j++) for (int j = 0; j < parent.Valves.Count; j++)
{ {
if (parent.Valves[j].Category == TBF.BenchControl.ValveCategory.All || parent.Valves[j].Category == TBF.BenchControl.ValveCategory.Feeding) if (parent.Valves[j].Category == TBF.BenchControl.ValveCategory.Feeding)
{ {
string text = lvi.SubItems[fixedColumnsCount + regvCount + k].Text; string text = lvi.SubItems[fixedColumnsCount + regvCount + k].Text;
if (text.Equals(Strings.open)) if (text.Equals(Strings.open))
TBF/UI/Bench/Paths/PathsOutputCtrl.cs
+3 -3
View File
@@ -93,7 +93,7 @@ namespace TBF.UI.Bench.Paths
int clmn = (int)Column.FixedColumnsCount; int clmn = (int)Column.FixedColumnsCount;
foreach (var vlv in parent.Valves) foreach (var vlv in parent.Valves)
{ {
if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Output) if (vlv.Category == ValveCategory.Output)
{ {
Columns.Add(vlv.Cfg.Name, (ls.OutputColumnCount > clmn) ? ls.OutputColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct); Columns.Add(vlv.Cfg.Name, (ls.OutputColumnCount > clmn) ? ls.OutputColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct);
clmn++; clmn++;
@@ -256,7 +256,7 @@ namespace TBF.UI.Bench.Paths
foreach (var valve in parent.Valves) foreach (var valve in parent.Valves)
{ {
if (valve.Category == ValveCategory.All || valve.Category == ValveCategory.Output) if (valve.Category == ValveCategory.Output)
{ {
if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve)) if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve))
{ {
@@ -324,7 +324,7 @@ namespace TBF.UI.Bench.Paths
int k = 0; int k = 0;
for (int j = 0; j < parent.Valves.Count; j++) for (int j = 0; j < parent.Valves.Count; j++)
{ {
if (parent.Valves[j].Category == ValveCategory.All || parent.Valves[j].Category == ValveCategory.Output) if (parent.Valves[j].Category == ValveCategory.Output)
{ {
string text = lvi.SubItems[fixedColumnsCount + k].Text; string text = lvi.SubItems[fixedColumnsCount + k].Text;
if (text.Equals(Strings.open)) if (text.Equals(Strings.open))