SchematicDrawing: Editing completed, TODO: Display

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)