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

SchematicDrawing: Editing completed, TODO: Display

Browse Source
This commit is contained in:
Milan Hanajik
2020-06-02 12:00:45 +02:00
parent 2c100c7150
commit 070a76aade
337 changed files with 6267 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Keithley/TempMeter/Factory.cs
+1
View File
@@ -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
+2 -1
View File
@@ -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
+23 -4
View File
@@ -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}",