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

Schematic drawing with live function, bench control by mouse, Dijkstra algo, vacuum, etc.

Browse Source
This commit is contained in:
Milan Hanajik
2020-06-14 13:01:53 +02:00
parent 2945049288
commit 1f67899a5c
223 changed files with 5684 additions and 3772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Various/Drawing/Bypass/Configuration.cs
-91
View File
@@ -1,91 +0,0 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Bypass
{
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, SchematicDrawing.IDrawingItemCfg
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(Configuration) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
///
public Shape Shape { get; set; }
public int X { get; set; }
public int Y { get; set; }
public Sz Sz { get; set; }
public Orient Orient { get; set; }
public bool Flip { get; set; }
public int LblX { get; set; }
public int LblY { get; set; }
public 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 Orient ValOrient { get; set; }
public Configuration() { }
public Configuration(string name, IComponentFactory factory)
: this()
{
Name = name;
ParentName = string.Empty;
Factory = factory;
Shape = SchematicDrawing.Shape.Bypass;
Sz = Sz.K1;
}
public bool IsHidden() { return (X == 0) && (Y == 0); }
public string ComponentName { get { return Name; } }
public void InitializeAll() { }
string[] paramNames = new string[0] { };
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i) { return null; }
public string ToString(int i)
{
return string.Format("name={0} x={1} y={2} sz={3} orient={4}", Name, X, Y, Sz, Orient);
}
public CfgUpdateFlags UpdateParam(int i, string strValue)
{
return CfgUpdateFlags.None;
}
public bool ValidateParam(int i, string strValue, out string message)
{
message = "Invalid index";
return false;
}
void CopyContentTo(Configuration prms) { }
public Config.Entities.IParamsProvider Clone()
{
Configuration pars = new Configuration();
CopyContentTo(pars);
return pars;
}
public bool UpdateEmbeddedDbEntity()
{
return true; /// =OK, do nothing
}
}
}
TBF/BenchControl/Various/Drawing/Bypass/Factory.cs
-27
View File
@@ -1,27 +0,0 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Bypass
{
public class Factory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
public override string ToString() { return ClassName; }
public void ResetStaticProperties() { Component.ResetStaticProperties(); }
public IComponent DummyComponent() { return new Component(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
public IComponentCfg DefaultConfig() { return new Configuration(this.GetType().Namespace.Substring(33), this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
return ComponentCfgBase.CreateFromDbEntity(Configuration.Serializer, component, this);
}
}
}
TBF/BenchControl/Various/Drawing/Edges/Component.cs
-25
View File
@@ -1,25 +0,0 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using log4net;
namespace TBF.BenchControl.Various.Drawing.Edges
{
public class Component : ComponentBase, SchematicDrawing.IDrawingItemCmpnt
{
private static readonly ILog log = LogManager.GetLogger(typeof(Component));
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
readonly Configuration myCfg;
public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return myCfg as SchematicDrawing.IDrawingItemCfg; } }
public Component() { }
public Component(Generic.IComponentCfg cfg)
: base(cfg)
{
myCfg = cfg as Configuration;
log.Debug(this.ToString());
}
}
}
TBF/BenchControl/Various/Drawing/Junction/Component.cs
+2 -2
View File
@@ -5,13 +5,13 @@ using log4net;
namespace TBF.BenchControl.Various.Drawing.Junction
{
public class Component : ComponentBase, SchematicDrawing.IDrawingItemCmpnt
public class Component : ComponentBase, SchematicDrawing.IDrawingItCmpnt
{
private static readonly ILog log = LogManager.GetLogger(typeof(Component));
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
readonly Configuration myCfg;
public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return myCfg as SchematicDrawing.IDrawingItemCfg; } }
public SchematicDrawing.IDrawingItem DrawingItem { get { return myCfg as SchematicDrawing.IDrawingItem; } }
public Component() { }
TBF/BenchControl/Various/Drawing/Junction/Configuration.cs
+12 -10
View File
@@ -10,7 +10,7 @@ using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Junction
{
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, SchematicDrawing.IDrawingItemCfg
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, IDrawingItem
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(Configuration) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
@@ -29,25 +29,27 @@ namespace TBF.BenchControl.Various.Drawing.Junction
public int LblX { get; set; }
public int LblY { get; set; }
public 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 Orient ValOrient { get; set; }
public Configuration() { }
[XmlIgnore]
public IList<GNode> GNodes { get; set; }
public Configuration()
{
GNodes = new List<GNode>();
}
public Configuration(string name, IComponentFactory factory)
: this()
{
Shape = Shape.Junction;
Sz = Sz.None;
Name = name;
ParentName = string.Empty;
Factory = factory;
Shape = Shape.Junction;
Sz = Sz.S;
}
public bool IsHidden() { return (X == 0) && (Y == 0); }
public string ComponentName { get { return Name; } }
TBF/BenchControl/Various/Drawing/Knee/Component.cs
+2 -2
View File
@@ -5,13 +5,13 @@ using log4net;
namespace TBF.BenchControl.Various.Drawing.Knee
{
public class Component : ComponentBase, SchematicDrawing.IDrawingItemCmpnt
public class Component : ComponentBase, SchematicDrawing.IDrawingItCmpnt
{
private static readonly ILog log = LogManager.GetLogger(typeof(Component));
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
readonly Configuration myCfg;
public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return myCfg as SchematicDrawing.IDrawingItemCfg; } }
public SchematicDrawing.IDrawingItem DrawingItem { get { return myCfg as SchematicDrawing.IDrawingItem; } }
public Component() { }
TBF/BenchControl/Various/Drawing/Knee/Configuration.cs
+11 -10
View File
@@ -10,7 +10,7 @@ using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Knee
{
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, SchematicDrawing.IDrawingItemCfg
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, IDrawingItem
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(Configuration) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
@@ -29,26 +29,27 @@ namespace TBF.BenchControl.Various.Drawing.Knee
public int LblX { get; set; }
public int LblY { get; set; }
public 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 Orient ValOrient { get; set; }
[XmlIgnore]
public IList<GNode> GNodes { get; set; }
public Configuration() { }
public Configuration()
{
GNodes = new List<GNode>();
}
public Configuration(string name, IComponentFactory factory)
: this()
{
Shape = Shape.Knee;
Sz = Sz.M;
Name = name;
ParentName = string.Empty;
Factory = factory;
Shape = SchematicDrawing.Shape.Knee;
Sz = Sz.K1;
}
public bool IsHidden() { return (X == 0) && (Y == 0); }
public string ComponentName { get { return Name; } }
TBF/BenchControl/Various/Drawing/Bypass/Component.cs → TBF/BenchControl/Various/Drawing/Pipes/Component.cs
+3 -3
View File
@@ -3,15 +3,15 @@
///
using log4net;
namespace TBF.BenchControl.Various.Drawing.Bypass
namespace TBF.BenchControl.Various.Drawing.Pipes
{
public class Component : ComponentBase, SchematicDrawing.IDrawingItemCmpnt
public class Component : ComponentBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(Component));
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
readonly Configuration myCfg;
public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return myCfg as SchematicDrawing.IDrawingItemCfg; } }
public SchematicDrawing.IDrawingItem DrawingItem { get { return myCfg as SchematicDrawing.IDrawingItem; } }
public Component() { }
TBF/BenchControl/Various/Drawing/Edges/Configuration.cs → TBF/BenchControl/Various/Drawing/Pipes/Configuration.cs
+10 -26
View File
@@ -8,9 +8,9 @@ using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Edges
namespace TBF.BenchControl.Various.Drawing.Pipes
{
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, SchematicDrawing.IDrawingItemCfg
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(Configuration) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
@@ -20,22 +20,9 @@ namespace TBF.BenchControl.Various.Drawing.Edges
///
/// Serialized parameters
///
public Shape Shape { get; set; }
public int X { get; set; }
public int Y { get; set; }
public Sz Sz { get; set; }
public Orient Orient { get; set; }
public bool Flip { get; set; }
public int LblX { get; set; }
public int LblY { get; set; }
public 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 Orient ValOrient { get; set; }
///
public string[] Edges { get; set; }
public string[] Pipes { get; set; }
public Configuration() { }
///
@@ -45,18 +32,16 @@ namespace TBF.BenchControl.Various.Drawing.Edges
Name = name;
ParentName = string.Empty;
Factory = factory;
Shape = Shape.Edges;
Edges = new string[0];
Sz = Sz.S;
Pipes = new string[0];
}
public bool IsHidden() { return (X == 0) && (Y == 0); }
public string ComponentName { get { return Name; } }
public void InitializeAll()
{
Sz = Sz.S;
Edges = new string[0];
Pipes = new string[0];
}
string[] paramNames = new string[] { "Size" };
public string ParamName(int i) { return paramNames[i]; }
@@ -119,12 +104,11 @@ namespace TBF.BenchControl.Various.Drawing.Edges
void CopyContentTo(Configuration prms)
{
prms.Shape = this.Shape;
prms.Sz = this.Sz;
prms.Edges = new string[this.Edges.Length];
for (int i = 0; i < this.Edges.Length; i++)
prms.Pipes = new string[this.Pipes.Length];
for (int i = 0; i < this.Pipes.Length; i++)
{
prms.Edges[i] = this.Edges[i];
prms.Pipes[i] = this.Pipes[i];
}
}
TBF/BenchControl/Various/Drawing/Edges/Factory.cs → TBF/BenchControl/Various/Drawing/Pipes/Factory.cs
+1 -1
View File
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Edges
namespace TBF.BenchControl.Various.Drawing.Pipes
{
public class Factory : IComponentFactory
{
TBF/BenchControl/Various/Drawing/Tee/Component.cs → TBF/BenchControl/Various/Drawing/Tank/Component.cs
+3 -3
View File
@@ -3,15 +3,15 @@
///
using log4net;
namespace TBF.BenchControl.Various.Drawing.Tee
namespace TBF.BenchControl.Various.Drawing.Tank
{
public class Component : ComponentBase, SchematicDrawing.IDrawingItemCmpnt
public class Component : ComponentBase, SchematicDrawing.IDrawingItCmpnt
{
private static readonly ILog log = LogManager.GetLogger(typeof(Component));
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
readonly Configuration myCfg;
public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return myCfg as SchematicDrawing.IDrawingItemCfg; } }
public SchematicDrawing.IDrawingItem DrawingItem { get { return myCfg as SchematicDrawing.IDrawingItem; } }
public Component() { }
TBF/BenchControl/Various/Drawing/Tee/Configuration.cs → TBF/BenchControl/Various/Drawing/Tank/Configuration.cs
+12 -11
View File
@@ -8,9 +8,9 @@ using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Tee
namespace TBF.BenchControl.Various.Drawing.Tank
{
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, SchematicDrawing.IDrawingItemCfg
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, IDrawingItem
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(Configuration) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
@@ -29,26 +29,27 @@ namespace TBF.BenchControl.Various.Drawing.Tee
public int LblX { get; set; }
public int LblY { get; set; }
public 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 Orient ValOrient { get; set; }
[XmlIgnore]
public IList<GNode> GNodes { get; set; }
public Configuration() { }
public Configuration()
{
GNodes = new List<GNode>();
}
public Configuration(string name, IComponentFactory factory)
: this()
{
Shape = Shape.Tank;
Sz = Sz.L;
Name = name;
ParentName = string.Empty;
Factory = factory;
Shape = SchematicDrawing.Shape.Tee;
Sz = Sz.K1;
}
public bool IsHidden() { return (X == 0) && (Y == 0); }
public string ComponentName { get { return Name; } }
TBF/BenchControl/Various/Drawing/Tee/Factory.cs → TBF/BenchControl/Various/Drawing/Tank/Factory.cs
+1 -1
View File
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Tee
namespace TBF.BenchControl.Various.Drawing.Tank
{
public class Factory : IComponentFactory
{
TBF/BenchControl/Various/Drawing/Cross/Component.cs → TBF/BenchControl/Various/Drawing/Vacuum/Component.cs
+3 -3
View File
@@ -3,15 +3,15 @@
///
using log4net;
namespace TBF.BenchControl.Various.Drawing.Cross
namespace TBF.BenchControl.Various.Drawing.Vacuum
{
public class Component : ComponentBase, SchematicDrawing.IDrawingItemCmpnt
public class Component : ComponentBase, SchematicDrawing.IDrawingItCmpnt
{
private static readonly ILog log = LogManager.GetLogger(typeof(Component));
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
readonly Configuration myCfg;
public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return myCfg as SchematicDrawing.IDrawingItemCfg; } }
public SchematicDrawing.IDrawingItem DrawingItem { get { return myCfg as SchematicDrawing.IDrawingItem; } }
public Component() { }
TBF/BenchControl/Various/Drawing/Cross/Configuration.cs → TBF/BenchControl/Various/Drawing/Vacuum/Configuration.cs
+11 -11
View File
@@ -8,9 +8,9 @@ using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Cross
namespace TBF.BenchControl.Various.Drawing.Vacuum
{
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, SchematicDrawing.IDrawingItemCfg
public class Configuration : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider, IDrawingItem
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(Configuration) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
@@ -29,26 +29,26 @@ namespace TBF.BenchControl.Various.Drawing.Cross
public int LblX { get; set; }
public int LblY { get; set; }
public 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 Orient ValOrient { get; set; }
[XmlIgnore]
public IList<GNode> GNodes { get; set; }
public Configuration() { }
public Configuration()
{
GNodes = new List<GNode>();
}
public Configuration(string name, IComponentFactory factory)
: this()
{
Shape = Shape.Vacuum;
Sz = Sz.L;
Name = name;
ParentName = string.Empty;
Factory = factory;
Shape = SchematicDrawing.Shape.Cross;
Sz = Sz.K1;
}
public bool IsHidden() { return (X == 0) && (Y == 0); }
public string ComponentName { get { return Name; } }
TBF/BenchControl/Various/Drawing/Cross/Factory.cs → TBF/BenchControl/Various/Drawing/Vacuum/Factory.cs
+1 -1
View File
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Various.Drawing.Cross
namespace TBF.BenchControl.Various.Drawing.Vacuum
{
public class Factory : IComponentFactory
{
TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfgCtrl.cs
+3 -2
View File
@@ -6,6 +6,7 @@ using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.Resources;
using TBF.UI.Bench.Components;
namespace TBF.BenchControl.Various.TankWithLevelMsrmnt
{
@@ -37,13 +38,13 @@ namespace TBF.BenchControl.Various.TankWithLevelMsrmnt
parent = ParentForm as ComponentParametersDlg;
if (parent == null) return;
if (parent.TbfComponents != null)
if (parent.CmpntEntities != null)
{
drainValveComboBox.Items.Add("---");
drainValve2ComboBox.Items.Add("---");
levelMeasurementComboBox.Items.Add("---");
foreach (var cmpnt in parent.TbfComponents)
foreach (var cmpnt in parent.CmpntEntities)
{
IComponentFactory cmpntFact = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);