SchematicDrawing: Editing completed, TODO: Display

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; } }

TBF/BenchControl/MettlerToledo/Standard/BalanceOldFactory.cs

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