SchematicDrawing: Editing completed, TODO: Display

TBF/BenchControl/Ambient/Comet/Ambient.cs

@@ -15,12 +15,13 @@ namespace TBF.BenchControl.Ambient.Comet
     /// Ambient temperature / humidity / pressure meter 'Greco' connected via serial interface (RS232)
 	/// Connection settings: 9600 Bd 8-bits No-parity 2-stop-bits Flow control: none.
 	/// </summary>
-	public class Ambient : ComponentBase, IDevice, IOperation, GenericDevices.IAmbient
+    public class Ambient : ComponentBase, IDevice, IOperation, GenericDevices.IAmbient, SchematicDrawing.IDrawingItemCmpnt
     {
 		private static readonly ILog log = LogManager.GetLogger(typeof(Ambient));
 		public override string ToString() { return string.Format("Ambient({0})", Cfg.ToString(1)); }
 
 		private readonly AmbientCfg ambientCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return ambientCfg as SchematicDrawing.IDrawingItemCfg; } }
 
 		/// Private fields
 		SerialPort serialPort;

TBF/BenchControl/Ambient/Comet/AmbientCfg.cs

@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Ambient.Comet
 {
-    public class AmbientCfg : ComponentCfgBase, Generic.IComponentCfg
+    public class AmbientCfg : ComponentCfgBase, Generic.IComponentCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(AmbientCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -27,6 +27,22 @@ namespace TBF.BenchControl.Ambient.Comet
         public Handshake Handshake;
         public bool SetDtrToOne;
 
+        /// Schematic drawing info
+        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
 		AmbientCfg()
 		{
@@ -39,6 +55,7 @@ namespace TBF.BenchControl.Ambient.Comet
             StopBits = System.IO.Ports.StopBits.Two;
             Handshake = System.IO.Ports.Handshake.None;
             SetDtrToOne = false;
+            Shape = SchematicDrawing.Shape.Ambient;
         }
 
         public AmbientCfg(IComponentFactory factory)
@@ -47,7 +64,9 @@ namespace TBF.BenchControl.Ambient.Comet
             this.Factory = factory;
         }
 
-		public string ToString(int i)
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
+        public string ToString(int i)
 		{
             return string.Format("Name={0}, Com{1}, {2}Bd, {3}-bits, parity={4}, stopBits={5}, {6}",
                                  Name, ComPortNr, BaudRate, DataBits, Parity, StopBits, Handshake);

TBF/BenchControl/Ambient/Comet/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Ambient.Comet
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "Comet-Ambient"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Ambient.ResetStaticProperties(); }
 

TBF/BenchControl/Ambient/Greco/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Ambient.Greco
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "Greco Ambient"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Ambient.ResetStaticProperties(); }
 

TBF/BenchControl/BuiltIn/Pump/Pump.cs

@@ -9,12 +9,13 @@ using TBF.BenchControl.ControlBoard;
 
 namespace TBF.BenchControl.BuiltIn.Pump
 {
-	public class Pump : ComponentBase, GenericDevices.IPump, GenericDevices.IValve
+	public class Pump : ComponentBase, GenericDevices.IPump, GenericDevices.IValve, SchematicDrawing.IDrawingItemCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Pump));
         public override string ToString() { return string.Format("Pump({0})", Cfg.ToString(1)); }
 
 		readonly PumpCfg pumpCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return pumpCfg as SchematicDrawing.IDrawingItemCfg; } }
 		
         public int Delay { get { return pumpCfg.Delay; } }
 

TBF/BenchControl/BuiltIn/Pump/PumpCfg.cs

@@ -8,7 +8,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.BuiltIn.Pump
 {
-    public class PumpCfg : ComponentCfgBase, IChildComponentCfg
+    public class PumpCfg : ComponentCfgBase, IChildComponentCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PumpCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -21,10 +21,27 @@ namespace TBF.BenchControl.BuiltIn.Pump
 		public int BitPosition;
         public int Delay;
 
+        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
 		PumpCfg()
 		{
             Name = "P";
+            Shape = SchematicDrawing.Shape.Pump;
             ParentName = "CB";
             BitPosition = 0;
             Delay = 1;
@@ -36,6 +53,8 @@ namespace TBF.BenchControl.BuiltIn.Pump
             this.Factory = factory;
         }
 
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
         public string ToString(int i)
         {
             return string.Format("Name={0}, Parent={1}, Bit={2}, Delay={3}",

TBF/BenchControl/BuiltIn/Pump/PumpFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.BuiltIn.Pump
 	public class PumpFactory : IComponentFactory
 	{
 		public string ClassName { get { return "Pump"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Pump.ResetStaticProperties(); }
 

TBF/BenchControl/BuiltIn/PumpTandem/PumpFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.BuiltIn.PumpTandem
 	public class PumpFactory : IComponentFactory
 	{
 		public string ClassName { get { return "PumpTandem"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Pump.ResetStaticProperties(); }
 

TBF/BenchControl/BuiltIn/Valve/Valve.cs

@@ -9,12 +9,13 @@ using TBF.BenchControl.GenericDevices;
 
 namespace TBF.BenchControl.BuiltIn.Valve
 {
-	public class Valve : ValveBase, IValve
+	public class Valve : ValveBase, IValve, SchematicDrawing.IDrawingItemCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Valve));
 		public override string ToString() { return string.Format("Valve({0})", Cfg.ToString(1)); }
 
 		readonly ValveCfg valveCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return valveCfg as SchematicDrawing.IDrawingItemCfg; } }
 
         readonly TBF.BenchControl.ControlBoard.IControlBoard controlBoard;
 

TBF/BenchControl/BuiltIn/Valve/ValveCfg.cs

@@ -8,7 +8,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.BuiltIn.Valve
 {
-    public class ValveCfg : ComponentCfgBase, IChildComponentCfg
+    public class ValveCfg : ComponentCfgBase, IChildComponentCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ValveCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -29,10 +29,27 @@ namespace TBF.BenchControl.BuiltIn.Valve
 		public int LagClosing;			/// Delay (referred to the master valve) when closing this valve in [s]
 										/// Negative values of delays mean an earlier function of the coupled valve.
 
+        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
 		ValveCfg()
 		{
             Name = "V";
+            Shape = SchematicDrawing.Shape.Valve;
             ParentName = "CB";
             BitPosition = 0;
             Category = ValveCategory.None;
@@ -49,8 +66,10 @@ namespace TBF.BenchControl.BuiltIn.Valve
         {
             this.Factory = factory;
         }
-        
-		public string ToString(int i)
+
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
+        public string ToString(int i)
 		{
 			return string.Format("Name={0} ({1}), Bit={2}, Cat.={5}, Inv.={3}, Delay={4}s, CoupledTo={6}, Inv.Couple={7}, LagOpen={8}s, LagClose={9}s",
                                  Name,

TBF/BenchControl/BuiltIn/Valve/ValveFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.BuiltIn.Valve
 	public class ValveFactory : IComponentFactory
 	{
 		public string ClassName { get { return "Valve"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Valve.ResetStaticProperties(); }
 

TBF/BenchControl/BuiltIn/ValveEx/ValveFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.BuiltIn.ValveEx
 	public class ValveFactory : IComponentFactory
 	{
 		public string ClassName { get { return "ValveEx"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Valve.ResetStaticProperties(); }
 

TBF/BenchControl/ComponentCfgBase.cs

@@ -28,6 +28,12 @@ namespace TBF.BenchControl
 		}
 		Generic.IComponentFactory factory;
 
+        [XmlIgnore]
+        public string ClassName
+        {
+            get { return Factory.ToString(); }
+        }
+
 		[XmlIgnore]
         public string ParentName
         {

TBF/BenchControl/ControlBoard/Legacy/ControlBoardFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.ControlBoard.Legacy
 	public class ControlBoardFactory : IComponentFactory
 	{
         public string ClassName { get { return "ControlBoard"; } }
+        public override string ToString() { return ClassName; }
 
 		/// <summary>Max. number of components of this class in the system</summary>
 		public int MaxCount { get { return 1; } }

TBF/BenchControl/ControlBoard/New/CBoardFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.ControlBoard.New
 	public class CBoardFactory : IComponentFactory
 	{
 		public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+        public override string ToString() { return ClassName; }
 
 		/// <summary>Max. number of components of this class in the system</summary>
 		public int MaxCount { get { return 1; } }

TBF/BenchControl/ControlBoard/Papouch/CBoardFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.ControlBoard.Papouch
 	public class CBoardFactory : IComponentFactory
 	{
 		public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+        public override string ToString() { return ClassName; }
 
         public void ResetStaticProperties() { CBoard.ResetStaticProperties(); }
 

TBF/BenchControl/Danfoss/VLT2800/Pump.cs

@@ -67,12 +67,13 @@ namespace TBF.BenchControl.Danfoss.VLT2800
 	}
 
 
-	public class Pump : ComponentBase, IDevice, IOperation, GenericDevices.IPumpFM, GenericDevices.IValve
+    public class Pump : ComponentBase, IDevice, IOperation, GenericDevices.IPumpFM, GenericDevices.IValve, SchematicDrawing.IDrawingItemCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Pump));
 		public override string ToString() { return string.Format("Pump-Danfoss-VLT2800({0})", Cfg.ToString(1)); }
 
 		private readonly PumpCfg pumpCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return pumpCfg as SchematicDrawing.IDrawingItemCfg; } }
 
 		public int Delay { get { return pumpCfg.Delay; } }
 		public ValveCategory Category { get { return ValveCategory.Feeding; } }     /// Pump category is Feeding

TBF/BenchControl/Danfoss/VLT2800/PumpCfg.cs

@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Danfoss.VLT2800
 {
-    public class PumpCfg : ComponentCfgBase, Generic.IComponentCfg
+    public class PumpCfg : ComponentCfgBase, Generic.IComponentCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PumpCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -28,6 +28,22 @@ namespace TBF.BenchControl.Danfoss.VLT2800
         public Parity Parity;
         public int DataBits;
         public StopBits StopBits;
+
+        /// Schematic drawing info
+        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
 		PumpCfg()
@@ -44,6 +60,7 @@ namespace TBF.BenchControl.Danfoss.VLT2800
 			DataBits = 8;
 			Parity = System.IO.Ports.Parity.Even;	 /// 'Parity.None' is the default value for Protocol = PumpProtocol.Modbus
             StopBits = System.IO.Ports.StopBits.One;
+            Shape = SchematicDrawing.Shape.PumpFM;
         }
 
         public PumpCfg(IComponentFactory factory)
@@ -52,7 +69,9 @@ namespace TBF.BenchControl.Danfoss.VLT2800
             this.Factory = factory;
         }
 
-		public string ToString(int i)
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
+        public string ToString(int i)
 		{
 			return string.Format("Name={0}, Delay={1}s, Protocol={2}, BusAddress={3}, Com{4}, {5}Bd, {6}-bits, parity={7}, stopBits={8}",
 								 Name, Delay, Protocol, BusAddress, ComPortNr, BaudRate, DataBits, Parity, StopBits);

TBF/BenchControl/Danfoss/VLT2800/PumpFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Danfoss.VLT2800
 	public class PumpFactory : IComponentFactory
 	{
 		public string ClassName { get { return "Pump-Danfoss-VLT2800"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Pump.ResetStaticProperties(); }
 

TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataContainers.BackupAndSecurityOptions
 	public class ComponentFactory : IComponentFactory
 	{
         public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Component.ResetStaticProperties(); }
 

TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataContainers.BenchInfo.Extended
 	public class ComponentFactory : IComponentFactory
 	{
 		public string ClassName { get { return "BenchInfoEx"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Component.ResetStaticProperties(); }
 

TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataContainers.BenchInfo.iPerl
 	public class ComponentFactory : IComponentFactory
 	{
 		public string ClassName { get { return "BenchInfo.iPerl"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Component.ResetStaticProperties(); }
 

TBF/BenchControl/DataContainers/Buoyancy/ComponentFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataContainers.Buoyancy
 	public class ComponentFactory : IComponentFactory
 	{
         public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Component.ResetStaticProperties(); }
 

TBF/BenchControl/DataContainers/Density/ComponentFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataContainers.Density
 	public class ComponentFactory : IComponentFactory
 	{
         public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Component.ResetStaticProperties(); }
 

TBF/BenchControl/DataContainers/Evaporation/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataContainers.Evaporation
     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/DataEntry/Combined/EntryFormFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 	public class EntryFormFactory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Combined"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Fewa/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry.Fewa"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Fewa/FactoryNoStartEnd.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
 	public class FactoryNoStartEnd : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry.Fewa.NoStartEnd"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/HeatMeters12/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return this.GetType().Namespace.Substring("TBF.BenchControl.".Length); } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/HeatMeters6/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return this.GetType().Namespace.Substring("TBF.BenchControl.".Length); } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Munich/EntryFormFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Munich
 	public class EntryFormFactory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntryForm-Munich"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Munich3/EntryFormFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
 	public class EntryFormFactory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntryForm-3"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Single/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Single
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry.Single"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Single/FactoryNoStartEnd.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Single
 	public class FactoryNoStartEnd : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry.NoStartEnd.Single"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Standard12/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Standard-12"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Standard12/FactoryNoStartEnd.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
 	public class FactoryNoStartEnd : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Standard-12-NoStartEnd"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Standard24/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Standard-24"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Standard24/FactoryNoStartEnd.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 	public class FactoryNoStartEnd : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Standard-24-NoStartEnd"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Standard48/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Standard-48"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Standard48/FactoryNoStartEnd.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
 	public class FactoryNoStartEnd : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Standard-48-NoStartEnd"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Standard6/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Standard"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/Standard6/FactoryNoStartEnd.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
 	public class FactoryNoStartEnd : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Standard-6-NoStartEnd"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryFormNoStartEnd.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/StandardCamera/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-Camera"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }
 

TBF/BenchControl/DataEntry/iPerl/EntryFormFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
 	public class EntryFormFactory : IComponentFactory
 	{
 		public string ClassName { get { return "DataEntry-iPerl"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }
 

TBF/BenchControl/Dummy/Balance/Factory.cs

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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() { }
 

TBF/BenchControl/Elde/CoverTest/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.CoverTest
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "Elde.CoverTest"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { CoverTest.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/Diverter/Diverter.cs

@@ -12,7 +12,7 @@ using TBF.Resources;
 
 namespace TBF.BenchControl.Elde.Diverter
 {
-    public class Diverter : ComponentBase, IDevice, GenericDevices.IDiverter, GenericDevices.ISequenceCondition, GenericDevices.IHasCalendarEvents
+    public class Diverter : ComponentBase, IDevice, GenericDevices.IDiverter, GenericDevices.ISequenceCondition, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItemCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Diverter));
         public override string ToString() { return string.Format("Diverter({0})", Cfg.ToString(1)); }
@@ -33,6 +33,8 @@ namespace TBF.BenchControl.Elde.Diverter
         public int DiverterNr { get { return diverterNr0 + 1; } }   /// 1-based public diverter number
 
 		readonly DiverterCfg diverterCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return diverterCfg as SchematicDrawing.IDrawingItemCfg; } }
+
 		readonly ControlBoardDev controlBoard;
         readonly UInt128 mask;		    	    /// derived from bitPosition in the constructor
         public int AdcNr { get { return diverterCfg.AdcNr; } }

TBF/BenchControl/Elde/Diverter/DiverterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2016 Sensus Metering Systems
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;
@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.Diverter
 {
-    public class DiverterCfg : ComponentCfgBase, IChildComponentCfg, GenericDevices.ICalibInfoCfg
+    public class DiverterCfg : ComponentCfgBase, IChildComponentCfg, GenericDevices.ICalibInfoCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(DiverterCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -30,30 +30,32 @@ namespace TBF.BenchControl.Elde.Diverter
         public int DfltSwithTimeEndMs;      /// Default diverter transition time 'end' or 'to sink' in ms
 
         /// Calibration info serialized parameters displayed in Metrology tab page
-        string calibCertificateNr;
-        DateTime calibDate;
-        DateTime calibValidDate;
-        public string CalibCertificateNr
-        {
-            get { return calibCertificateNr; }
-            set { calibCertificateNr = value; }
-        }
-        public DateTime CalibDate
-        {
-            get { return calibDate; }
-            set { calibDate = value; }
-        }
-        public DateTime CalibValidDate
-        {
-            get { return calibValidDate; }
-            set { calibValidDate = value; }
-        }
+        public string CalibCertificateNr { get; set; }
+        public DateTime CalibDate { get; set; }
+        public DateTime CalibValidDate { get; set; }
+
+        /// Schematic drawing info
+        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
 		DiverterCfg()
 		{
             Name = "Div";
+            Shape = SchematicDrawing.Shape.Div;
             ParentName = "CB";
             BitPosition = 0;
 			AdcNr = 5;				/// Div1: AdcNr=5 , Div2: AdcNr=6
@@ -62,7 +64,7 @@ namespace TBF.BenchControl.Elde.Diverter
 			StartingLevel = 50;
             ThresholdLo = 10;
             ThresholdHi = 90;
-            calibCertificateNr = string.Empty;
+            CalibCertificateNr = string.Empty;
         }
 
         public DiverterCfg(IComponentFactory factory)
@@ -71,7 +73,9 @@ namespace TBF.BenchControl.Elde.Diverter
             this.Factory = factory;
         }
 
-		public string ToString(int i)
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
+        public string ToString(int i)
 		{
             return string.Format("Name={0}, Parent={1}, Bit={2}, ADC#={3}, ADC2Sink={4}, ADC2Tank={5}, Gate={6}%, Lo={7}%, Lo={8}%",
                                  Name,

TBF/BenchControl/Elde/Diverter/DiverterFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.Diverter
 	public class DiverterFactory : IComponentFactory
 	{
 		public string ClassName { get { return "Diverter"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Diverter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs

@@ -10,12 +10,14 @@ using TBF.Resources;
 
 namespace TBF.BenchControl.Elde.FlowMeter
 {
-    public class FlowMeter : ComponentBase, Generic.IDevice, GenericDevices.IFlowMeter, GenericDevices.IHasCalendarEvents
+    public class FlowMeter : ComponentBase, Generic.IDevice, GenericDevices.IFlowMeter, GenericDevices.IHasCalendarEvents, 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; } }
+
         readonly ControlBoardDev controlBoard;
 
         public int Idx1 { get { return flowMeterCfg.Idx1; } }

TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs

@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.FlowMeter
 {
-    public class FlowMeterCfg : ComponentCfgBase, GenericDevices.ICalibRangesCfg, IChildComponentCfg
+    public class FlowMeterCfg : ComponentCfgBase, GenericDevices.ICalibRangesCfg, IChildComponentCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlowMeterCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -67,6 +67,22 @@ namespace TBF.BenchControl.Elde.FlowMeter
         public DateTime CalibValidDate4;
         public DateTime CalibValidDate5;
 
+        /// Schematic drawing info
+        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; }
+
 
         public bool RangeEnabled(int rangeIx1)
         {
@@ -227,6 +243,7 @@ namespace TBF.BenchControl.Elde.FlowMeter
 		FlowMeterCfg()
 		{
             Name = "FlowMeter";
+            Shape = SchematicDrawing.Shape.FlowM;
             ParentName = "CB";
             Idx1 = 1;
             NominalFlow = 1;
@@ -238,7 +255,9 @@ namespace TBF.BenchControl.Elde.FlowMeter
             this.Factory = factory;
         }
 
-		public string ToString(int i)
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
+        public string ToString(int i)
 		{
             return string.Format("Name={0}, Parent={1}, Idx1={2}, NominalFlow={3}",
                                  Name,

TBF/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.FlowMeter
 	public class FlowMeterFactory : IComponentFactory
 	{
 		public string ClassName { get { return "FlowMeter"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { FlowMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/FlowMeterDewa/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.FlowMeterDewa
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "FlowMeterDewa"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { FlowMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.FlowMeterTriplet
 	public class FlowMeterFactory : IComponentFactory
 	{
 		public string ClassName { get { return "FlowMeterTriplet"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { FlowMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins
 	public class FlowMeterFactory : IComponentFactory
 	{
 		public string ClassName { get { return "FlowMeterTwins"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { FlowMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs

@@ -11,12 +11,13 @@ using TBF.Resources;
 
 namespace TBF.BenchControl.Elde.PressureMeter
 {
-    public class PressureMeter : ComponentBase, GenericDevices.IPressureMeter, GenericDevices.IHasCalendarEvents
+    public class PressureMeter : ComponentBase, GenericDevices.IPressureMeter, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItemCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(PressureMeter));
         public override string ToString() { return string.Format("PressureMeter({0})", Cfg.ToString(1)); }
 
 		readonly PressureMeterCfg pressureMeterCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return pressureMeterCfg as SchematicDrawing.IDrawingItemCfg; } }
 
 		public readonly ControlBoardDev ControlBoard;
 

TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs

@@ -10,7 +10,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.PressureMeter
 {
-    public class PressureMeterCfg : ComponentCfgBase, IChildComponentCfg, TBF.BenchControl.GenericDevices.ICalibInfoCfg
+    public class PressureMeterCfg : ComponentCfgBase, IChildComponentCfg, TBF.BenchControl.GenericDevices.ICalibInfoCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PressureMeterCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -25,29 +25,31 @@ namespace TBF.BenchControl.Elde.PressureMeter
 		public byte RS485Address;           /// 0..255
 
         /// Calibration info serialized parameters displayed in Metrology tab page
-        string calibCertificateNr;
-        DateTime calibDate;
-        DateTime calibValidDate;
-        public string CalibCertificateNr
-        {
-            get { return calibCertificateNr; }
-            set { calibCertificateNr = value; }
-        }
-        public DateTime CalibDate
-        {
-            get { return calibDate; }
-            set { calibDate = value; }
-        }
-        public DateTime CalibValidDate
-        {
-            get { return calibValidDate; }
-            set { calibValidDate = value; }
-        }
+        public string CalibCertificateNr { get; set; }
+        public DateTime CalibDate { get; set; }
+        public DateTime CalibValidDate { get; set; }
+
+        /// Schematic drawing info
+        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
 		PressureMeterCfg()
 		{
             Name = "Pr";
+            Shape = SchematicDrawing.Shape.PressM;
             ParentName = "CB";
             Idx0 = 0;
             Protocol = MeretProtocol.Modbus;
@@ -60,7 +62,9 @@ namespace TBF.BenchControl.Elde.PressureMeter
             this.Factory = factory;
         }
 
-		public string ToString(int i)
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
+        public string ToString(int i)
 		{
             return string.Format("Name={0}, Parent={1}, Idx0={2}, Protocol={3}, Address={4}",
                                  Name,

TBF/BenchControl/Elde/PressureMeter/PressureMeterFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
 	public class PressureMeterFactory : IComponentFactory
 	{
 		public string ClassName { get { return "PressureMeter"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { PressureMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/PressureMeterInternal/PressureMeter.cs

@@ -10,12 +10,13 @@ using TBF.Resources;
 
 namespace TBF.BenchControl.Elde.PressureMeterInternal
 {
-    public class PressureMeter : ComponentBase, GenericDevices.IPressureMeter, GenericDevices.IHasCalendarEvents
+    public class PressureMeter : ComponentBase, GenericDevices.IPressureMeter, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItemCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(PressureMeter));
         public override string ToString() { return string.Format("PressureMeter({0})", Cfg.ToString(1)); }
 
 		readonly PressureMeterCfg pressureMeterCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return pressureMeterCfg as SchematicDrawing.IDrawingItemCfg; } }
 
 		public readonly ControlBoardDev ControlBoard;
 

TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs

@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.PressureMeterInternal
 {
-    public class PressureMeterCfg : ComponentCfgBase, IChildComponentCfg, TBF.BenchControl.GenericDevices.ICalibInfoCfg
+    public class PressureMeterCfg : ComponentCfgBase, IChildComponentCfg, TBF.BenchControl.GenericDevices.ICalibInfoCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PressureMeterCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -28,29 +28,31 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal
 		public float A5;
 
         /// Calibration info serialized parameters displayed in Metrology tab page
-        string calibCertificateNr;
-        DateTime calibDate;
-        DateTime calibValidDate;
-        public string CalibCertificateNr
-        {
-            get { return calibCertificateNr; }
-            set { calibCertificateNr = value; }
-        }
-        public DateTime CalibDate
-        {
-            get { return calibDate; }
-            set { calibDate = value; }
-        }
-        public DateTime CalibValidDate
-        {
-            get { return calibValidDate; }
-            set { calibValidDate = value; }
-        }
+        public string CalibCertificateNr { get; set; }
+        public DateTime CalibDate { get; set; }
+        public DateTime CalibValidDate { get; set; }
+
+        /// Schematic drawing info
+        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
 		PressureMeterCfg()
 		{
             Name = "Pr";
+            Shape = SchematicDrawing.Shape.PressM;
             ParentName = "CB";
             Idx0 = 0;
 			CoefsIdx0 = 0;
@@ -67,6 +69,8 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal
             this.Factory = factory;
         }
 
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
         public string ToString(int i)
         {
 			return string.Format("Name={0}, Parent={1}, Idx0={2}, CoefsIdx0={3}, A1={4}, A2={5}, A3={6}, A4={7}, A5={8}",

TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal
 	public class PressureMeterFactory : IComponentFactory
 	{
 		public string ClassName { get { return "PressureMeterInternal"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { PressureMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/PumpWithFM/Pump.cs

@@ -9,12 +9,13 @@ using TBF.BenchControl.ControlBoard.Legacy;
 
 namespace TBF.BenchControl.Elde.PumpWithFM
 {
-	public class Pump : ComponentBase, GenericDevices.IPumpFM, GenericDevices.IValve, IOperation
+    public class Pump : ComponentBase, GenericDevices.IPumpFM, GenericDevices.IValve, IOperation, SchematicDrawing.IDrawingItemCmpnt
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(Pump));
         public override string ToString() { return string.Format("PumpWithFM({0})", Cfg.ToString(1)); }
 
         readonly PumpCfg pumpCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return pumpCfg as SchematicDrawing.IDrawingItemCfg; } }
 
 		public int Delay { get { return pumpCfg.Delay; } }
         public ValveCategory Category { get { return ValveCategory.Feeding; } }     /// Pump category is Feeding

TBF/BenchControl/Elde/PumpWithFM/PumpCfg.cs

@@ -8,7 +8,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.PumpWithFM
 {
-    public class PumpCfg : ComponentCfgBase, IChildComponentCfg
+    public class PumpCfg : ComponentCfgBase, IChildComponentCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PumpCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -22,10 +22,27 @@ namespace TBF.BenchControl.Elde.PumpWithFM
         public int FMIndex;
         public int Delay;
 
+        /// Schematic drawing info
+        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
 		PumpCfg()
 		{
             Name = "P";
+            Shape = SchematicDrawing.Shape.PumpFM;
             ParentName = "CB";
             BitPosition = 0;
             FMIndex = 0;
@@ -38,6 +55,8 @@ namespace TBF.BenchControl.Elde.PumpWithFM
             this.Factory = factory;
         }
 
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
         public string ToString(int i)
         {
             return string.Format("Name={0}, Parent={1}, Bit={2}, FMIndex={3}, Delay={4}",

TBF/BenchControl/Elde/PumpWithFM/PumpFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.PumpWithFM
 	public class PumpFactory : IComponentFactory
 	{
 		public string ClassName { get { return "PumpWithFM"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Pump.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/RegisterReader/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.RegisterReader
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "RegisterReader"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { RegisterReader.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/RegulValve/RegulValve.cs

@@ -10,13 +10,14 @@ using TBF.Boxes;
 
 namespace TBF.BenchControl.Elde.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; } }
 
         IDictionary<double, float> dict;
         public IDictionary<double, float> Dict { get { return dict; } }

TBF/BenchControl/Elde/RegulValve/RegulValveCfg.cs

@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.RegulValve
 {
-    public class RegulValveCfg : ComponentCfgBase, IChildComponentCfg
+    public class RegulValveCfg : ComponentCfgBase, IChildComponentCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegulValveCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -26,7 +26,23 @@ namespace TBF.BenchControl.Elde.RegulValve
         public int StableTimeMs;            /// 200..1500 ms, step is 50 ms
         public int FlowStableSec;           /// 0..60 sec
         public bool StoredPositionReuse;    /// true = store and re-use previous regulation valve positions
-        public bool ReTryCommands;                                            
+        public bool ReTryCommands;
+
+        /// Schematic drawing info
+        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; }
          
         /// <summary>
         /// Stabilization time when setting the flow: 0=200ms, step 50ms, max. 1.5 sec.
@@ -42,6 +58,7 @@ namespace TBF.BenchControl.Elde.RegulValve
             : this()
         {
             Name = name;
+            Shape = SchematicDrawing.Shape.RegV;
             Factory = factory;
             ParentName = "CB";
             Category = ValveCategory.Output;
@@ -54,7 +71,9 @@ namespace TBF.BenchControl.Elde.RegulValve
             ReTryCommands = false;
         }
 
-		public string ToString(int i)
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
+        public string ToString(int i)
 		{
             return string.Format("Name={0} ({1}), Idx1={2}, Cat.={3}, ADC-Closed={4}, ADC-Open={5}, StabTm={6}ms, FlowStable={7}s, PosReuse={8}, ReTryCmds={9}",
                                  Name,

TBF/BenchControl/Elde/RegulValve/RegulValveFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.RegulValve
 	public class RegulValveFactory : IComponentFactory
 	{
 		public string ClassName { get { return "RegulationValve"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { RegulValve.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/RegulValveCoax/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "RegulationValve-Coax"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { RegulValve.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/RegulValveCoax/RegulValve.cs

@@ -9,13 +9,14 @@ using TBF.Boxes;
 
 namespace TBF.BenchControl.Elde.RegulValveCoax
 {
-	public class RegulValve : ComponentBase, GenericDevices.IRegulValve
+    public class RegulValve : ComponentBase, 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; } }
 
         IDictionary<double, float> dict;
         public IDictionary<double, float> Dict { get { return dict; } }

TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs

@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.RegulValveCoax
 {
-    public class RegulValveCfg : ComponentCfgBase, IChildComponentCfg
+    public class RegulValveCfg : ComponentCfgBase, IChildComponentCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegulValveCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -24,8 +24,24 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
         public int StableTimeMs;            /// 200..1500 ms
         public int FlowStableSec;           /// 0..60 sec
         public bool StoredPositionReuse;    /// true = store and re-use previous regulation valve positions
-        public bool ReTryCommands;                                            
-         
+        public bool ReTryCommands;
+
+        /// Schematic drawing info
+        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; }
+       
         /// <summary>
         /// Stabilization time when setting the flow: 0=200ms, step 50ms, max. 1.5 sec.
         /// </summary>
@@ -40,6 +56,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
             : this()
         {
             Name = name;
+            Shape = SchematicDrawing.Shape.RegV;
             Factory = factory;
             ParentName = "CB";
             Category = ValveCategory.Output;
@@ -50,7 +67,9 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
             ReTryCommands = false;
         }
 
-		public string ToString(int i)
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
+        public string ToString(int i)
 		{
             return string.Format("Name={0} ({1}), Idx1={2}, Cat.={3}, StabTm={4}ms, FlowStable={5}s, PosReuse={6}, ReTryCmds={7}",
                                  Name,

TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
 	public class RegulValveTandemFactory : IComponentFactory
 	{
 		public string ClassName { get { return "RegulationValveTandem"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { RegulValveTandem.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/TempMeter/TempMeter.cs

@@ -11,12 +11,13 @@ using TBF.Resources;
 
 namespace TBF.BenchControl.Elde.TempMeter
 {
-    public class TempMeter : ComponentBase, GenericDevices.ITempMeter, GenericDevices.IHasCalendarEvents
+    public class TempMeter : ComponentBase, GenericDevices.ITempMeter, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItemCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(TempMeter));
 		public override string ToString() { return string.Format("TempMeter({0})", Cfg.ToString(1)); }
 
 		readonly TempMeterCfg tempMtrCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return tempMtrCfg as SchematicDrawing.IDrawingItemCfg; } }
 		
 		public readonly ControlBoardDev ControlBoard;
 

TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs

@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.TempMeter
 {
-    public class TempMeterCfg : ComponentCfgBase, IChildComponentCfg, TBF.BenchControl.GenericDevices.ICalibInfoCfg
+    public class TempMeterCfg : ComponentCfgBase, IChildComponentCfg, TBF.BenchControl.GenericDevices.ICalibInfoCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -28,24 +28,25 @@ namespace TBF.BenchControl.Elde.TempMeter
 		public double DefaultTemperature;
 
         /// Calibration info serialized parameters displayed in Metrology tab page
-        string calibCertificateNr;
-        DateTime calibDate;
-        DateTime calibValidDate;
-        public string CalibCertificateNr
-        {
-            get { return calibCertificateNr; }
-            set { calibCertificateNr = value; }
-        }
-        public DateTime CalibDate
-        {
-            get { return calibDate; }
-            set { calibDate = value; }
-        }
-        public DateTime CalibValidDate
-        {
-            get { return calibValidDate; }
-            set { calibValidDate = value; }
-        }
+        public string CalibCertificateNr { get; set; }
+        public DateTime CalibDate { get; set; }
+        public DateTime CalibValidDate { get; set; }
+
+        /// Schematic drawing info
+        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
 		TempMeterCfg()
@@ -59,6 +60,7 @@ namespace TBF.BenchControl.Elde.TempMeter
             A4 = 0;
             A5 = 0;
 			DefaultTemperature = 20.0;
+            Shape = SchematicDrawing.Shape.TempM;
         }
 
         public TempMeterCfg(IComponentFactory factory)
@@ -67,6 +69,8 @@ namespace TBF.BenchControl.Elde.TempMeter
             this.Factory = factory;
         }
 
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
         public string ToString(int i)
         {
             return string.Format("Name={0}, Parent={1}, Idx0={2}, A1={3}, A2={4}, A3={5}, A4={6}, A5={7}, Default={8}",

TBF/BenchControl/Elde/TempMeter/TempMeterFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.TempMeter
 	public class TempMeterFactory : IComponentFactory
 	{
 		public string ClassName { get { return "TempMeter"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { TempMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/TempMeterInternal/TempMeter.cs

@@ -11,12 +11,13 @@ using TBF.Resources;
 
 namespace TBF.BenchControl.Elde.TempMeterInternal
 {
-    public class TempMeter : ComponentBase, GenericDevices.ITempMeter, GenericDevices.IHasCalendarEvents
+    public class TempMeter : ComponentBase, GenericDevices.ITempMeter, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItemCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(TempMeter));
 		public override string ToString() { return string.Format("TempMeter({0})", Cfg.ToString(1)); }
 
 		readonly TempMeterCfg tempMtrCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return tempMtrCfg as SchematicDrawing.IDrawingItemCfg; } }
 		
 		public readonly ControlBoardDev ControlBoard;
 

TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs

@@ -29,30 +29,30 @@ namespace TBF.BenchControl.Elde.TempMeterInternal
 		public float A5;
 
         /// Calibration info serialized parameters displayed in Metrology tab page
-        string calibCertificateNr;
-        DateTime calibDate;
-        DateTime calibValidDate;
-        public string CalibCertificateNr
-        {
-            get { return calibCertificateNr; }
-            set { calibCertificateNr = value; }
-        }
-        public DateTime CalibDate
-        {
-            get { return calibDate; }
-            set { calibDate = value; }
-        }
-        public DateTime CalibValidDate
-        {
-            get { return calibValidDate; }
-            set { calibValidDate = value; }
-        }
+        public string CalibCertificateNr { get; set; }
+        public DateTime CalibDate { get; set; }
+        public DateTime CalibValidDate { get; set; }
 
+        /// Schematic drawing info
+        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 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
 		TempMeterCfg()
 		{
             Name = "T";
+            Shape = SchematicDrawing.Shape.TempM;
             ParentName = "CB";
             Idx0 = 0;
 			CoefsIdx0 = 2;

TBF/BenchControl/Elde/TempMeterInternal/TempMeterFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.TempMeterInternal
 	public class TempMeterFactory : IComponentFactory
 	{
 		public string ClassName { get { return "TempMeterInternal"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { TempMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/TempMeterMeret/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Elde.TempMeterMeret
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return "TempMeterMeret"; } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { TempMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Elde/TempMeterMeret/TempMeter.cs

@@ -10,12 +10,14 @@ using TBF.Resources;
 
 namespace TBF.BenchControl.Elde.TempMeterMeret
 {
-    public class TempMeter : ComponentBase, GenericDevices.ITempMeter, GenericDevices.IHasCalendarEvents
+    public class TempMeter : ComponentBase, GenericDevices.ITempMeter, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItemCmpnt
+
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(TempMeter));
 		public override string ToString() { return string.Format("TempMeter({0})", Cfg.ToString(1)); }
 
 		readonly TempMeterCfg tempMtrCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return tempMtrCfg as SchematicDrawing.IDrawingItemCfg; } }
 		
 		public readonly ControlBoardDev ControlBoard;
 

TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs

@@ -42,31 +42,31 @@ namespace TBF.BenchControl.Elde.TempMeterMeret
         public int MeretIdx0;	    /// Meter pressure meters count .. (Meter pressure meters count + Meter temperature meters count - 1)
 
         /// Calibration info serialized parameters displayed in Metrology tab page
-        string calibCertificateNr;
-        DateTime calibDate;
-        DateTime calibValidDate;
-        public string CalibCertificateNr
-        {
-            get { return calibCertificateNr; }
-            set { calibCertificateNr = value; }
-        }
-        public DateTime CalibDate
-        {
-            get { return calibDate; }
-            set { calibDate = value; }
-        }
-        public DateTime CalibValidDate
-        {
-            get { return calibValidDate; }
-            set { calibValidDate = value; }
-        }
+        public string CalibCertificateNr { get; set; }
+        public DateTime CalibDate { get; set; }
+        public DateTime CalibValidDate { get; set; }
 
+        /// Schematic drawing info
+        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 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
 		TempMeterCfg()
 		{
             Name = "T";
             ParentName = "CB";
+            Shape = SchematicDrawing.Shape.TempM;
         }
 
         public TempMeterCfg(IComponentFactory factory)

TBF/BenchControl/Hart/Common/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Hart.Common
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Hart.ResetStaticProperties(); }
 

TBF/BenchControl/Hart/Nivotrack/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Hart.Nivotrack
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Nivotrack.ResetStaticProperties(); }
 

TBF/BenchControl/Keithley/Multimeter_2010_RS232/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Keithley.Multimeter_2010_RS232
 	public class Factory : IComponentFactory
 	{
 		public string ClassName { get { return GetType().Namespace.Substring(17); } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { Multimeter.ResetStaticProperties(); }
 

TBF/BenchControl/Keithley/TempMeter/Factory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.Keithley.TempMeter
 	public class Factory : IComponentFactory
 	{
         public string ClassName { get { return GetType().Namespace.Substring(17); } }
+        public override string ToString() { return ClassName; }
 
 		public void ResetStaticProperties() { TempMeter.ResetStaticProperties(); }
 

TBF/BenchControl/Keithley/TempMeter/TempMeter.cs

@@ -11,12 +11,13 @@ using TBF.Resources;
 
 namespace TBF.BenchControl.Keithley.TempMeter
 {
-    public class TempMeter : ComponentBase, GenericDevices.ITempMeter, GenericDevices.IHasCalendarEvents
+    public class TempMeter : ComponentBase, GenericDevices.ITempMeter, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItemCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(TempMeter));
 		public override string ToString() { return string.Format("Keithley.TempMeter({0})", Cfg.ToString(1)); }
 
 		readonly TempMeterCfg tempMtrCfg;       /// configuration
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return tempMtrCfg as SchematicDrawing.IDrawingItemCfg; } }
 
         public readonly Multimeter Multimeter;         /// parent component
 

TBF/BenchControl/Keithley/TempMeter/TempMeterCfg.cs

@@ -9,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Keithley.TempMeter
 {
-    public class TempMeterCfg : ComponentCfgBase, IChildComponentCfg
+    public class TempMeterCfg : ComponentCfgBase, IChildComponentCfg, TBF.BenchControl.GenericDevices.ICalibInfoCfg, SchematicDrawing.IDrawingItemCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -36,9 +36,25 @@ namespace TBF.BenchControl.Keithley.TempMeter
         public double B;
 
         /// Calibration info serialized parameters displayed in Metrology tab page
-        public string CalibCertificateNr;
-        public DateTime CalibDate;
-        public DateTime CalibValidDate;
+        public string CalibCertificateNr { get; set; }
+        public DateTime CalibDate { get; set; }
+        public DateTime CalibValidDate { get; set; }
+
+        /// Schematic drawing info
+        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
 		TempMeterCfg()
@@ -56,8 +72,11 @@ namespace TBF.BenchControl.Keithley.TempMeter
             R0 = 100.0;
             A = 3.9083E-3;
             B = -5.775E-7;
+            Shape = SchematicDrawing.Shape.TempM;
         }
 
+        public bool IsHidden() { return (X == 0) && (Y == 0); }
+
         public string ToString(int i)
         {
 			return string.Format("Name={0}, Parent={1}, Channel={2}, ITS-90={3}",

TBF/BenchControl/MettlerToledo/Multi/BalanceFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.MettlerToledo.Multi
 	public class BalanceFactory : IComponentFactory
 	{
 		public string ClassName { get { return "MettlerToledo-Multi"; } }
+        public override string ToString() { return ClassName; }
 
 		/// <summary>Max. number of components of this class in the system</summary>
 		public int MaxCount { get { return 5; } }

TBF/BenchControl/MettlerToledo/Standard/BalanceCfg.cs

@@ -27,74 +27,40 @@ namespace TBF.BenchControl.MettlerToledo.Standard
         public StopBits StopBits;
         public Handshake Handshake;
 
-		/// Max. water mass in 'kg' or volume in 'l'
-		private float capacity;
-		public float Capacity { get { return capacity; } set { capacity = value; } }
-
-		/// Mass threshold for 'Tank is empty' in 'kg' (or volume in 'l')
-		private float empty;
-		public float Empty { get { return empty; } set { empty = value; } }
-
-        /// Mass threshold for 'Tank is empty' in 'kg' (or volume in 'l') when the drain valve is not open
-        private float emptyUp;
-        public float EmptyUp { get { return emptyUp; } set { emptyUp = value; } }
-
-		private string drainValve;
-		public string DrainValve { get { return drainValve; } set { drainValve = value; } }
-
-        private int drainTimeSec;
-        public int DrainTimeSec { get { return drainTimeSec; } set { drainTimeSec = value; } }
-
-        private string evaporation;
-        public string Evaporation { get { return evaporation; } set { evaporation = value; } }
+        public float Capacity { get; set; }     /// Max. water mass in 'kg' or volume in 'l'
+        public float Empty { get; set; }        /// Mass threshold for 'Tank is empty' in 'kg' (or volume in 'l')
+        public float EmptyUp { get; set; }      /// Mass threshold for 'Tank is empty' in 'kg' (or volume in 'l') when the drain valve is not open
+        public string DrainValve { get; set; }
+        public int DrainTimeSec { get; set; }
+        public string Evaporation { get; set; }
 		
 		public string Format;
 
         /// Buoyancy related serialized parameters displayed in Metrology tab page
-        private float buoyancyTemp;
-        private float buoyancyPress;
-        private float buoyancyHumi;
-        private float weightStandardDensity;
-        public float BuoyancyTemp
-        {
-            get { return buoyancyTemp; }
-            set { buoyancyTemp = value; }
-        }
-        public float BuoyancyPress
-        {
-            get { return buoyancyPress; }
-            set { buoyancyPress = value; }
-        }
-        public float BuoyancyHumi
-        {
-            get { return buoyancyHumi; }
-            set { buoyancyHumi = value; }
-        }
-        public float WeightStandardDensity
-        {
-            get { return weightStandardDensity; }
-            set { weightStandardDensity = value; }
-        }
+        public float BuoyancyTemp { get; set; }
+        public float BuoyancyPress { get; set; }
+        public float BuoyancyHumi { get; set; }
+        public float WeightStandardDensity { get; set; }
 
         /// Calibration info serialized parameters displayed in Metrology tab page
-        string calibCertificateNr;
-        DateTime calibDate;
-        DateTime calibValidDate;
-        public string CalibCertificateNr
-        {
-            get { return calibCertificateNr; }
-            set { calibCertificateNr = value; }
-        }
-        public DateTime CalibDate
-        {
-            get { return calibDate; }
-            set { calibDate = value; }
-        }
-        public DateTime CalibValidDate
-        {
-            get { return calibValidDate; }
-            set { calibValidDate = value; }
-        }
+        public string CalibCertificateNr { get; set; }
+        public DateTime CalibDate { get; set; }
+        public DateTime CalibValidDate { get; set; }
+
+        /// Schematic drawing info
+        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 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
@@ -117,6 +83,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
             BuoyancyTemp = 20.0f;
             BuoyancyPress = 1.0f;
             BuoyancyHumi = 40.0f;
+            Shape = SchematicDrawing.Shape.Tank;
         }
 
         public BalanceCfg(IComponentFactory factory)

TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs

@@ -21,7 +21,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
 	/// <note>
 	/// Implemented and tested on 15.10.2013 by Milan Hanajik
 	/// </note>
-	public class BalanceDev : TankDraining, IDevice, GenericDevices.IScale, GenericDevices.IHasCalendarEvents
+    public class BalanceDev : TankDraining, IDevice, GenericDevices.IScale, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItemCmpnt
     {
 		/// <summary>
 		/// Info: StartMassMeasurement() and "Balnce response = .., Mass = ..."
@@ -31,6 +31,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
 		public override string ToString() { return string.Format("MettlerToledo.Standard.Balance({0})", Cfg.ToString(1)); }
 
 		protected readonly BalanceCfg balanceCfg;
+        public SchematicDrawing.IDrawingItemCfg DrawingItemCfg { get { return balanceCfg as SchematicDrawing.IDrawingItemCfg; } }
 
 		/// <summary>
         /// Enumeration of balances via static fields and methods

TBF/BenchControl/MettlerToledo/Standard/BalanceFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
 	public class BalanceFactory : IComponentFactory
 	{
 		public string ClassName { get { return "MettlerToledo Balance"; } }
+        public override string ToString() { return ClassName; }
 
 		/// <summary>Max. number of components of this class in the system</summary>
 		public int MaxCount { get { return 5; } }

TBF/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs

@@ -9,6 +9,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
 	public class BalanceNewFactory : IComponentFactory
 	{
 		public string ClassName { get { return "MettlerToledoBalanceSN"; } }
+        public override string ToString() { return ClassName; }
 
 		/// <summary>Max. number of components of this class in the system</summary>
 		public int MaxCount { get { return 5; } }