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

Refactorization : RegulValve --> RegValve on many places.

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-29 22:34:15 +02:00
parent 1a8ef4f1be
commit 71c4f8f32f
30 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/Uni/RegValve/ChangeValvePositionOp.cs → TBF/Rig/Uni/RegValve/ChangeRegValvePositionOp.cs
+4 -4
View File
@@ -8,12 +8,12 @@ using TBF.Rig.GenericDevices;
namespace TBF.Rig.Uni.RegValve
{
public class ChangeRegulValvePositionOp : IOperation
public class ChangeRegValvePositionOp : IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(ChangeRegulValvePositionOp));
private static readonly ILog log = LogManager.GetLogger(typeof(ChangeRegValvePositionOp));
public override string ToString()
{
return string.Format("ChangeRegulValvePositionOp({0},{1}s)", regulValve.Name, timePulseSec.ToString("F2"));
return string.Format("ChangeRegValvePositionOp({0},{1}s)", regulValve.Name, timePulseSec.ToString("F2"));
}
/// Set by the constructor
@@ -32,7 +32,7 @@ namespace TBF.Rig.Uni.RegValve
/// <param name="posHiPct">Upper limit of the position to be achieved</param>
/// <param name="timeout">Timeout in sec. for setting the flow</param>
/// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
public ChangeRegulValvePositionOp(TBF.Rig.ControlBoard.IControlBoard cb, RegValve rv, double timePulseSec)
public ChangeRegValvePositionOp(TBF.Rig.ControlBoard.IControlBoard cb, RegValve rv, double timePulseSec)
{
controlBoard = cb as TBF.Rig.ControlBoard.Legacy.CBoard;
if (controlBoard == null) throw new ArgumentNullException("ctrlBoard");
TBF/Rig/Uni/RegValve/Factory.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace TBF.Rig.Uni.RegValve
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new RegValve(cfg, components); }
public IComponentCfg DefaultConfig() { return new RegValveCfg("RV", this); }
public IComponentCfg DefaultConfig() { return new RegValveCfg("VR", this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
TBF/Rig/Uni/RegValve/RegValve.cs
+3 -3
View File
@@ -201,14 +201,14 @@ namespace TBF.Rig.Uni.RegValve
/// <param name="flowLo">Lower limit of the required valve position in [%]</param>
/// <param name="flowLo">Higher limit of the required valve position in [%]</param>
/// <returns>SetPositionOp instance</returns>
public IOperation SetRegulValvePositionOp(double pctLo, double pctHi, int timeoutMs)
public IOperation SetRegValvePositionOp(double pctLo, double pctHi, int timeoutMs)
{
return new SetRegValvePositionOp(UniCB, this, pctLo, pctHi, timeoutMs);
}
public IOperation ChangeRegulValvePositionOp(double timePulseSec)
public IOperation ChangeRegValvePositionOp(double timePulseSec)
{
return new ChangeRegulValvePositionOp(UniCB, this, timePulseSec);
return new ChangeRegValvePositionOp(UniCB, this, timePulseSec);
}
}
}
TBF/Rig/Uni/RegValve/SetRegValvePositionOp.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace TBF.Rig.Uni.RegValve
private static readonly ILog log = LogManager.GetLogger(typeof(SetRegValvePositionOp));
public override string ToString()
{
return string.Format("SetRegulValvePositionOp({0},{1},{2})", regV.Name, posLoPct, posHiPct);
return string.Format("SetRegValvePositionOp({0},{1},{2})", regV.Name, posLoPct, posHiPct);
}
const int CoaxValveNr = 7; /// Coax. valve has number 7
TBF/Rig/Uni/RegValveAnalog/ChangeValvePositionOp.cs → TBF/Rig/Uni/RegValveAnalog/ChangeRegValvePositionOp.cs
+4 -4
View File
@@ -9,12 +9,12 @@ using TBF.Rig.GenericDevices;
namespace TBF.Rig.Uni.RegValveAnalog
{
public class ChangeRegulValvePositionOp : IOperation
public class ChangeRegValvePositionOp : IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(ChangeRegulValvePositionOp));
private static readonly ILog log = LogManager.GetLogger(typeof(ChangeRegValvePositionOp));
public override string ToString()
{
return string.Format("ChangeRegulValvePositionOp({0},{1}s)", regValve.Name, timePulseSec.ToString("F2"));
return string.Format("ChangeRegValvePositionOp({0},{1}s)", regValve.Name, timePulseSec.ToString("F2"));
}
/// Set by the constructor
@@ -32,7 +32,7 @@ namespace TBF.Rig.Uni.RegValveAnalog
/// <param name="posHiPct">Upper limit of the position to be achieved</param>
/// <param name="timeout">Timeout in sec. for setting the flow</param>
/// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
public ChangeRegulValvePositionOp(UniCB uniCB, RegValve regValve, double timePulseSec)
public ChangeRegValvePositionOp(UniCB uniCB, RegValve regValve, double timePulseSec)
{
if (uniCB == null) throw new ArgumentNullException("ctrlBoard");
this.uniCB = uniCB;
TBF/Rig/Uni/RegValveAnalog/Factory.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace TBF.Rig.Uni.RegValveAnalog
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new RegValve(cfg, components); }
public IComponentCfg DefaultConfig() { return new RegValveCfg("RV", this); }
public IComponentCfg DefaultConfig() { return new RegValveCfg("VR", this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
TBF/Rig/Uni/RegValveAnalog/RegValve.cs
+4 -4
View File
@@ -114,14 +114,14 @@ namespace TBF.Rig.Uni.RegValveAnalog
/// <param name="flowLo">Lower limit of the required valve position in [%]</param>
/// <param name="flowLo">Higher limit of the required valve position in [%]</param>
/// <returns>SetPositionOp instance</returns>
public IOperation SetRegulValvePositionOp(double pctLo, double pctHi, int timeoutMs)
public IOperation SetRegValvePositionOp(double pctLo, double pctHi, int timeoutMs)
{
return new SetRegulValvePositionOp(uniCB, this, pctLo, pctHi, timeoutMs);
return new SetRegValvePositionOp(uniCB, this, pctLo, pctHi, timeoutMs);
}
public IOperation ChangeRegulValvePositionOp(double timePulseSec)
public IOperation ChangeRegValvePositionOp(double timePulseSec)
{
return new ChangeRegulValvePositionOp(uniCB, this, timePulseSec);
return new ChangeRegValvePositionOp(uniCB, this, timePulseSec);
}
}
}
TBF/Rig/Uni/RegValveAnalog/SetRegulValvePositionOp.cs → TBF/Rig/Uni/RegValveAnalog/SetRegValvePositionOp.cs
+5 -5
View File
@@ -9,12 +9,12 @@ using TBF.Rig.GenericDevices;
namespace TBF.Rig.Uni.RegValveAnalog
{
public class SetRegulValvePositionOp : IOperation
public class SetRegValvePositionOp : IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(SetRegulValvePositionOp));
private static readonly ILog log = LogManager.GetLogger(typeof(SetRegValvePositionOp));
public override string ToString()
{
return string.Format("SetRegulValvePositionOp({0},{1},{2})", regValve.Name, posLoPct, posHiPct);
return string.Format("SetRegValvePositionOp({0},{1},{2})", regValve.Name, posLoPct, posHiPct);
}
///
@@ -51,7 +51,7 @@ namespace TBF.Rig.Uni.RegValveAnalog
/// <param name="posHiPct">Upper limit of the position to be achieved</param>
/// <param name="timeout">Timeout in sec. for setting the flow</param>
/// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
public SetRegulValvePositionOp(UniCB uniCB, RegValve regV, double posLoPct, double posHiPct, int timeout)
public SetRegValvePositionOp(UniCB uniCB, RegValve regV, double posLoPct, double posHiPct, int timeout)
{
if (uniCB == null) throw new ArgumentNullException("ctrlBoard");
this.uniCB = uniCB;
@@ -70,7 +70,7 @@ namespace TBF.Rig.Uni.RegValveAnalog
/// Set required water flow - no timeout.
/// Events: FlowSet
/// </summary>
public SetRegulValvePositionOp(UniCB uniCB, RegValve regValve, double posLoPct, double posHiPct)
public SetRegValvePositionOp(UniCB uniCB, RegValve regValve, double posLoPct, double posHiPct)
: this(uniCB, regValve, posLoPct, posHiPct, int.MaxValue)
{
}
TBF/Rig/Uni/RegValveTandem/ChangeValvePositionOp.cs → TBF/Rig/Uni/RegValveTandem/ChangeRegValvePositionOp.cs
+4 -4
View File
@@ -9,12 +9,12 @@ using TBF.Rig.GenericDevices;
namespace TBF.Rig.Uni.RegValveTandem
{
public class ChangeRegulValvePositionOp : IOperation
public class ChangeRegValvePositionOp : IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(ChangeRegulValvePositionOp));
private static readonly ILog log = LogManager.GetLogger(typeof(ChangeRegValvePositionOp));
public override string ToString()
{
return string.Format("ChangeRegulValvePositionOp({0},{1}s)", regulValve.Name, timePulseSec.ToString("F2"));
return string.Format("ChangeRegValvePositionOp({0},{1}s)", regulValve.Name, timePulseSec.ToString("F2"));
}
/// Set by the constructor
@@ -33,7 +33,7 @@ namespace TBF.Rig.Uni.RegValveTandem
/// <param name="posHiPct">Upper limit of the position to be achieved</param>
/// <param name="timeout">Timeout in sec. for setting the flow</param>
/// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
public ChangeRegulValvePositionOp(CBoard controlBoard, IRegValve _regulValve, float timePulseSec)
public ChangeRegValvePositionOp(CBoard controlBoard, IRegValve _regulValve, float timePulseSec)
{
if (controlBoard == null) throw new ArgumentNullException("ctrlBoard");
this.controlBoard = controlBoard;
TBF/Rig/Uni/RegValveTandem/Factory.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace TBF.Rig.Uni.RegValveTandem
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new RegValveTandem(cfg, components); }
public IComponentCfg DefaultConfig() { return new RegValveTandemCfg("RV", this); }
public IComponentCfg DefaultConfig() { return new RegValveTandemCfg("VR", this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
TBF/Rig/Uni/RegValveTandem/RegValveTandem.cs
+2 -2
View File
@@ -103,12 +103,12 @@ namespace TBF.Rig.Uni.RegValveTandem
/// <param name="flowLo">Lower limit of the required valve position in [%]</param>
/// <param name="flowLo">Higher limit of the required valve position in [%]</param>
/// <returns>SetPositionOp instance</returns>
public IOperation SetRegulValvePositionOp(double pctLo, double pctHi, int timeoutMs)
public IOperation SetRegValvePositionOp(double pctLo, double pctHi, int timeoutMs)
{
return null;
}
public IOperation ChangeRegulValvePositionOp(double timePulseSec)
public IOperation ChangeRegValvePositionOp(double timePulseSec)
{
return null;
}
TBF/Rig/Uni/RegValveTandem/SetRegulValvePositionOp.cs → TBF/Rig/Uni/RegValveTandem/SetRegValvePositionOp.cs
+5 -5
View File
@@ -9,12 +9,12 @@ using TBF.Rig.Uni;
namespace TBF.Rig.Uni.RegValveTandem
{
public class SetRegulValvePositionOp : IOperation
public class SetRegValvePositionOp : IOperation
{
private static readonly ILog log = LogManager.GetLogger(typeof(SetRegulValvePositionOp));
private static readonly ILog log = LogManager.GetLogger(typeof(SetRegValvePositionOp));
public override string ToString()
{
return string.Format("SetRegulValvePositionOp({0},{1},{2})", regValve.Name, posLoPct, posHiPct);
return string.Format("SetRegValvePositionOp({0},{1},{2})", regValve.Name, posLoPct, posHiPct);
}
/// Set by the constructor
@@ -39,7 +39,7 @@ namespace TBF.Rig.Uni.RegValveTandem
/// <param name="posHiPct">Upper limit of the position to be achieved</param>
/// <param name="timeout">Timeout in sec. for setting the flow</param>
/// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
public SetRegulValvePositionOp(TBF.Rig.ControlBoard.IControlBoard cb, IRegValve regV, double posLoPct, double posHiPct, int timeout)
public SetRegValvePositionOp(TBF.Rig.ControlBoard.IControlBoard cb, IRegValve regV, double posLoPct, double posHiPct, int timeout)
{
uniCB = cb as TBF.Rig.ControlBoard.Uni.UniCB;
if (uniCB == null) throw new ArgumentNullException("ctrlBoard");
@@ -58,7 +58,7 @@ namespace TBF.Rig.Uni.RegValveTandem
/// Set required water flow - no timeout.
/// Events: FlowSet
/// </summary>
public SetRegulValvePositionOp(TBF.Rig.ControlBoard.IControlBoard controlBoard, RegValveTandem regValve, float posLoPct, float posHiPct)
public SetRegValvePositionOp(TBF.Rig.ControlBoard.IControlBoard controlBoard, RegValveTandem regValve, float posLoPct, float posHiPct)
: this(controlBoard, regValve, posLoPct, posHiPct, int.MaxValue)
{
}