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

SchematicDrawing: Editing completed, TODO: Display

Browse Source
This commit is contained in:
Milan Hanajik
2020-06-02 12:00:45 +02:00
parent 2c100c7150
commit 070a76aade
337 changed files with 6267 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Dummy/Balance/Factory.cs
+1
View File
@@ -10,6 +10,7 @@ namespace TBF.BenchControl.Dummy.Balance
public class Factory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
public override string ToString() { return ClassName; }
public void ResetStaticProperties() { }
TBF/BenchControl/Dummy/Diverter/Factory.cs
+1
View File
@@ -10,6 +10,7 @@ namespace TBF.BenchControl.Dummy.Diverter
public class Factory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
public override string ToString() { return ClassName; }
public void ResetStaticProperties() { }
TBF/BenchControl/Dummy/FlowMeter/Factory.cs
+1
View File
@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Dummy.FlowMeter
public class Factory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
public override string ToString() { return ClassName; }
public void ResetStaticProperties() { FlowMeter.ResetStaticProperties(); }
TBF/BenchControl/Dummy/FlowMeter/FlowMeter.cs
+2 -1
View File
@@ -8,12 +8,13 @@ using TBF.Boxes;
namespace TBF.BenchControl.Dummy.FlowMeter
{
public class FlowMeter : ComponentBase, GenericDevices.IFlowMeter
public class FlowMeter : ComponentBase, GenericDevices.IFlowMeter, SchematicDrawing.IDrawingItemCmpnt
{
private static readonly ILog log = LogManager.GetLogger(typeof(FlowMeter));
public override string ToString() { return string.Format("FlowMeter({0})", Cfg.ToString(1)); }
readonly FlowMeterCfg flowMeterCfg;
public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return flowMeterCfg as SchematicDrawing.IDrawingItemCfg; } }
public double NominalFlow { get { return flowMeterCfg.NominalFlow; } }
TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs
+20 -2
View File
@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Dummy.FlowMeter
{
public class FlowMeterCfg : ComponentCfgBase, IComponentCfg
public class FlowMeterCfg : ComponentCfgBase, IComponentCfg, SchematicDrawing.IDrawingItemCfg
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlowMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
@@ -21,6 +21,21 @@ namespace TBF.BenchControl.Dummy.FlowMeter
///
public float NominalFlow; /// Nominal flow in m3/h at output frequency 2000 Hz
public SchematicDrawing.Shape Shape { get; set; }
public int X { get; set; }
public int Y { get; set; }
public SchematicDrawing.Sz Sz { get; set; }
public SchematicDrawing.Orient Orient { get; set; }
public bool Flip { get; set; }
public int LblX { get; set; }
public int LblY { get; set; }
public SchematicDrawing.Orient LblOrient { get; set; }
public int ValX { get; set; }
public int ValY { get; set; }
public double ValFact { get; set; }
public string ValFmt { get; set; }
public SchematicDrawing.Orient ValOrient { get; set; }
/// Private parameterless constructor invoked by all other (public) constructors
FlowMeterCfg()
@@ -33,9 +48,12 @@ namespace TBF.BenchControl.Dummy.FlowMeter
Name = name;
Factory = factory;
NominalFlow = 1.0f;
Shape = SchematicDrawing.Shape.FlowM;
}
public string ToString(int i)
public bool IsHidden() { return (X == 0) && (Y == 0); }
public string ToString(int i)
{
return string.Format("Name={0}, NominalFlow={1}", Name, NominalFlow);
}
TBF/BenchControl/Dummy/RegulValve/Factory.cs
+1
View File
@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Dummy.RegulValve
public class Factory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
public override string ToString() { return ClassName; }
public void ResetStaticProperties() { RegulValve.ResetStaticProperties(); }
TBF/BenchControl/Dummy/RegulValve/RegulValve.cs
+3 -3
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2017-2019 Sensus Slovensko a.s.
/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using log4net;
@@ -8,13 +8,13 @@ using TBF.Boxes;
namespace TBF.BenchControl.Dummy.RegulValve
{
public class RegulValve : ComponentBase, IDevice, GenericDevices.IRegulValve
public class RegulValve : ComponentBase, IDevice, GenericDevices.IRegulValve, SchematicDrawing.IDrawingItemCmpnt
{
private static readonly ILog log = LogManager.GetLogger(typeof(RegulValve));
public override string ToString() { return string.Format("RegulValve({0})", Cfg.ToString(1)); }
public readonly RegulValveCfg RegulValveCfg;
public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return RegulValveCfg as SchematicDrawing.IDrawingItemCfg; } }
public ValveCategory Category { get { return RegulValveCfg.Category; } }
///
TBF/BenchControl/Dummy/RegulValve/RegulValveCfg.cs
+22 -3
View File
@@ -1,12 +1,12 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
///
using TBF.BenchControl.Generic;
using System.Xml.Serialization;
namespace TBF.BenchControl.Dummy.RegulValve
{
public class RegulValveCfg : ComponentCfgBase, IComponentCfg
public class RegulValveCfg : ComponentCfgBase, IComponentCfg, SchematicDrawing.IDrawingItemCfg
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegulValveCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
@@ -18,6 +18,22 @@ namespace TBF.BenchControl.Dummy.RegulValve
///
public ValveCategory Category; /// Feeding, Output or All
public SchematicDrawing.Shape Shape { get; set; }
public int X { get; set; }
public int Y { get; set; }
public SchematicDrawing.Sz Sz { get; set; }
public SchematicDrawing.Orient Orient { get; set; }
public bool Flip { get; set; }
public int LblX { get; set; }
public int LblY { get; set; }
public SchematicDrawing.Orient LblOrient { get; set; }
public int ValX { get; set; }
public int ValY { get; set; }
public double ValFact { get; set; }
public string ValFmt { get; set; }
public SchematicDrawing.Orient ValOrient { get; set; }
/// Private parameterless constructor invoked by all other (public) constructors
RegulValveCfg()
{
@@ -29,9 +45,12 @@ namespace TBF.BenchControl.Dummy.RegulValve
Name = name;
Factory = factory;
Category = ValveCategory.Output;
Shape = SchematicDrawing.Shape.RegV;
}
public string ToString(int i)
public bool IsHidden() { return (X == 0) && (Y == 0); }
public string ToString(int i)
{
return string.Format("Name={0}", Name);
}
TBF/BenchControl/Dummy/Valve/Factory.cs
+1
View File
@@ -10,6 +10,7 @@ namespace TBF.BenchControl.Dummy.Valve
public class Factory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
public override string ToString() { return ClassName; }
public void ResetStaticProperties() { }