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

ValveCategory.All removed, cleanup, SequenceBase improvement.

Browse Source
This commit is contained in:
Milan Hanajik
2020-12-03 13:51:43 +01:00
parent 6da5bd92ec
commit df1b4527ba
18 changed files with 60 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Paths/PathsBenchCtrl.cs
+3 -3
View File
@@ -78,7 +78,7 @@ namespace TBF.UI.Bench.Paths
int clmn = (int)Column.FixedColumnsCount;
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);
clmn++;
@@ -207,7 +207,7 @@ namespace TBF.UI.Bench.Paths
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))
{
@@ -258,7 +258,7 @@ namespace TBF.UI.Bench.Paths
int k = 0;
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;
if (text.Equals(Strings.open))
TBF/UI/Bench/Paths/PathsDlg.cs
+4 -6
View File
@@ -9,6 +9,7 @@ using NHibernate;
using log4net;
using Config.Entities;
using Results.Forms;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Resources;
using TBF.UI.Shared;
@@ -83,17 +84,14 @@ namespace TBF.UI.Bench.Paths
foreach (var cmpnt in TbfComponents)
{
IRegulValve regValve = cmpnt as IRegulValve;
if (regValve != null)
if (regValve != null && !(cmpnt is TBF.BenchControl.Elde.RegulValveTandem.RegulValveTandem))
{
switch (regValve.Category)
{
case TBF.BenchControl.ValveCategory.Feeding:
case ValveCategory.Feeding:
FeedingRegulValves.Add(regValve);
break;
case TBF.BenchControl.ValveCategory.Output:
OutputRegulValves.Add(regValve);
break;
case TBF.BenchControl.ValveCategory.All:
case ValveCategory.Output:
OutputRegulValves.Add(regValve);
break;
}
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)
{
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);
clmn++;
@@ -197,7 +197,7 @@ namespace TBF.UI.Bench.Paths
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))
{
@@ -266,7 +266,7 @@ namespace TBF.UI.Bench.Paths
int k = 0;
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;
if (text.Equals(Strings.open))
TBF/UI/Bench/Paths/PathsOutputCtrl.cs
+3 -3
View File
@@ -101,7 +101,7 @@ namespace TBF.UI.Bench.Paths
///
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);
clmn++;
@@ -288,7 +288,7 @@ namespace TBF.UI.Bench.Paths
foreach (var valve in parent.Valves)
{
int subItemNr = lvi.SubItems.Count;
if (valve.Category == ValveCategory.All || valve.Category == ValveCategory.Output)
if (valve.Category == ValveCategory.Output)
{
if (path.ValvesOpen != null && path.ValvesOpen.Contains(valve))
{
@@ -372,7 +372,7 @@ namespace TBF.UI.Bench.Paths
int k = 0;
foreach (var valve in parent.Valves)
{
if (valve.Category == ValveCategory.All || valve.Category == ValveCategory.Output)
if (valve.Category == ValveCategory.Output)
{
string text = lvi.SubItems[fixedColumnsCount + k].Text;
if (text.Equals(Strings.open))