ToString( ) methods of all components are equal, start with ClassName.

TBF/Rig/ControlBoard/Legacy/ControlBoardDev.cs

@@ -16,7 +16,7 @@ namespace TBF.Rig.ControlBoard.Legacy
     public class CBoard : ComponentBase, IControlBoard
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(CBoard));
-		public override string ToString() { return string.Format("ControlBoard({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         const int FiltersCount = 8;
 

TBF/Rig/DataContainer/BenchInfo/Component.cs

@@ -17,7 +17,7 @@ namespace TBF.Rig.DataContainer.BenchInfo
 	public class Component : ComponentBase, GenericDevices.IBenchInfo
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString() { return string.Format("BenchInfo({0})", Cfg.ToString(-1)); }
+		public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         readonly ComponentCfg myCfg;
 

TBF/Rig/DataEntry/Combined/EntryForm.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.Combined
 	public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasWMStatesForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
-        public override string ToString() { return string.Format("DataEntry.Combined({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/DataEntry/Fewa/EntryFormNoStartEnd.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.Fewa
 	public class EntryFormNoStartEnd : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryFormNoStartEnd));
-        public override string ToString() { return string.Format("DataEntry.Standard24({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/DataEntry/HeatMeters12/EntryForm.cs

@@ -13,10 +13,7 @@ namespace TBF.Rig.DataEntry.HeatMeters12
 	public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasHeatMtrStatesForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+		public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/DataEntry/HeatMeters6/EntryForm.cs

@@ -13,10 +13,7 @@ namespace TBF.Rig.DataEntry.HeatMeters6
     public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasHeatMtrStatesForm
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
-        public override string ToString()
-        {
-            return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-        }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/DataEntry/Single/EntryFormNoStartEnd.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.Single
 	public class EntryFormNoStartEnd : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryFormNoStartEnd));
-        public override string ToString() { return string.Format("DataEntry.Standard24({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/DataEntry/Standard12/EntryFormNoStartEnd.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.Standard12
 	public class EntryFormNoStartEnd : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryFormNoStartEnd));
-        public override string ToString() { return string.Format("DataEntry.Standard12({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.Standard24
 	public class EntryFormNoStartEnd : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryFormNoStartEnd));
-        public override string ToString() { return string.Format("DataEntry.Standard24({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/DataEntry/Standard48/EntryFormNoStartEnd.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.Standard48
 	public class EntryFormNoStartEnd : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryFormNoStartEnd));
-        public override string ToString() { return string.Format("DataEntry.Standard48({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/DataEntry/Standard6/EntryFormNoStartEnd.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.Standard6
 	public class EntryFormNoStartEnd : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryFormNoStartEnd));
-        public override string ToString() { return string.Format("DataEntry.Standard6({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/DataEntry/StandardCamera/EntryForm.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.StandardCamera
 	public class EntryForm : ComponentBase, IOperation, IDataEntryForCamera, IHasWMStatesForm, IHasCycleBeginForm, IHasCycleEndForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
-        public override string ToString() { return string.Format("DataEntry.Standard24({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 
         readonly EntryFormCfg entryFormCfg;

TBF/Rig/DataEntry/iPerl/EntryForm.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.iPerl
 	public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasWMStatesForm
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
-        public override string ToString() { return string.Format("DataEntry.iPerl({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/Dummy/Balance/Component.cs

@@ -12,7 +12,7 @@ namespace TBF.Rig.Dummy.Balance
     public class Component : ComponentBase, IScale, IOperation
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         public int ScaleNr { get { return 0; } }
         public double Capacity { get { return 10000.0; } }

TBF/Rig/Dummy/Diverter/Component.cs

@@ -13,10 +13,7 @@ namespace TBF.Rig.Dummy.Diverter
     public class Component : ComponentBase, IDiverter
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-        public override string ToString()
-        {
-            return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-        }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         FloatBox switchTimeStart;
         FloatBox switchTimeEnd;

TBF/Rig/Dummy/FlowMeter/FlowMeter.cs

@@ -12,7 +12,7 @@ namespace TBF.Rig.Dummy.FlowMeter
     public class FlowMeter : ComponentBase, GenericDevices.IFlowMeter, IDrawingItCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(FlowMeter));
-        public override string ToString() { return string.Format("FlowMeter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly FlowMeterCfg flowMeterCfg;
         public double NominalFlow { get { return flowMeterCfg.NominalFlow; } }
@@ -38,7 +38,6 @@ namespace TBF.Rig.Dummy.FlowMeter
 			: base(cfg)
 		{
 			flowMeterCfg = cfg as FlowMeterCfg;
-
             log.Warn(this.ToString());
 		}
 

TBF/Rig/Dummy/RegValve/RegValve.cs

@@ -11,7 +11,7 @@ namespace TBF.Rig.Dummy.RegValve
     public class RegValve : ComponentBase, GenericDevices.IRegValve, SchematicDrawing.IDrawingItCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegValve));
-        public override string ToString() { return string.Format("RegulValve({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public readonly RegValveCfg RegulValveCfg;
         public SchematicDrawing.IDrawingItem DrawingItem { get { return RegulValveCfg as SchematicDrawing.IDrawingItem; } }

TBF/Rig/Dummy/Valve/Component.cs

@@ -19,6 +19,7 @@ namespace TBF.Rig.Dummy.Valve
         public int LagOpening { get { return 0; } }
         public int LagClosing { get { return 0; } }
 
+
         public Component() { }
 
         public Component(Generic.IComponentCfg cfg)

TBF/Rig/Hart/Common/Hart.cs

@@ -22,7 +22,7 @@ namespace TBF.Rig.Hart.Common
 	public class Hart : ComponentBase, IDevice, GenericDevices.IHart
     {
 		private static readonly ILog log = LogManager.GetLogger(typeof(Hart));
-		public override string ToString() { return string.Format("Modbus({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		private readonly HartCfg hartCfg;
 

TBF/Rig/Keithley/TempMeter/TempMeter.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Keithley.TempMeter
     public class TempMeter : ComponentBase, GenericDevices.ITempMeter, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(TempMeter));
-		public override string ToString() { return string.Format("Keithley.TempMeter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly TempMeterCfg tempMtrCfg;       /// configuration
         public SchematicDrawing.IDrawingItem DrawingItem { get { return tempMtrCfg as SchematicDrawing.IDrawingItem; } }

TBF/Rig/Modbus/Common/Modbus.cs

@@ -19,7 +19,7 @@ namespace TBF.Rig.Modbus.Common
 	public class Modbus : ComponentBase, IDevice, GenericDevices.IModbus
     {
 		private static readonly ILog log = LogManager.GetLogger(typeof(Modbus));
-		public override string ToString() { return string.Format("Modbus({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         const int MaxTelegramsPerSecond = 5;    /// Max. number of telegrams to be sent per second (100 ms for each telegram)
         const int RegTelegramsPerSecond = 3;    /// Number of registered polling telegrams per second

TBF/Rig/Modbus/Easytherm/Easytherm.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.Modbus.Easytherm
     public class Easytherm : ComponentBase, IDevice, GenericDevices.ITempMeter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Easytherm));
-        public override string ToString() { return string.Format("Easytherm({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly EasythermCfg easythermCfg;
 	    readonly GenericDevices.IModbus modbus;

TBF/Rig/Modbus/Novus/Novus.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.Modbus.Novus
     public class Novus : ComponentBase, IDevice, GenericDevices.ITempMeter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Novus));
-        public override string ToString() { return string.Format("Novus({0})", Cfg.ToString(1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         const ushort SetpointAddress = 0;           /// Temperature setpoint
         const ushort ProcessValueAddress = 1;       /// Actual temperature

TBF/Rig/Modbus/TankSelector/TankSelector.cs

@@ -77,7 +77,7 @@ namespace TBF.Rig.Modbus.TankSelector
 	public class TankSelector : ComponentBase, ISequenceCondition, IDevice
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(TankSelector));
-        public override string ToString() { return string.Format("TankSelector({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly TankSelectorCfg tankSelectorCfg;
 

TBF/Rig/Modbus/TempMeter/Groch/TempMeter.cs

@@ -16,7 +16,7 @@ namespace TBF.Rig.Modbus.TempMeter.Groch
                              SchematicDrawing.IDrawingItCmpntWithMeasuredVal
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(TempMeter));
-		public override string ToString() { return string.Format("TempMeter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         public const int GrochAddress = 3;
 

TBF/Rig/Modbus/UltrasoundLevelMeter/LevelMeter.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Modbus.UltrasoundLevelMeter
     public class LevelMeter : ComponentBase, GenericDevices.ILevelMeter, GenericDevices.ITempMeter, IDevice
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(LevelMeter));
-        public override string ToString() { return string.Format("LevelMeter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly LevelMeterCfg myCfg;
 	    readonly Common.Modbus modbus;

TBF/Rig/Modbus/WaterAnalyzer/Analyzer.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Modbus.WaterAnalyzer
     public class Analyzer : ComponentBase, GenericDevices.ITempMeter, IDevice
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Analyzer));
-        public override string ToString() { return string.Format("Analyzer({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly AnalyzerCfg myCfg;
         readonly Common.Modbus modbus;

TBF/Rig/Network/Adapter/Netadapter.cs

@@ -9,18 +9,13 @@ namespace TBF.Rig.Network.Adapter
 	public class Netadapter : ComponentBase, GenericDevices.INetworkAdapter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Netadapter));
-		public override string ToString()
-		{
-			return string.Format("Component={0} IPAddress={1} NetMask={2} Description={3}", Cfg.Name, IPAddress, NetMask, (Cfg as NetadapterCfg).Description);
-		}
-
-		public bool Running { get { return running; }  }
-		bool running;
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly NetadapterCfg netadapterCfg;
-		readonly IPAddress ipAddress;
-		readonly IPAddress netMask;
-		readonly IPAddress broadcastAddress;
+
+		IPAddress ipAddress;
+		IPAddress netMask;
+		IPAddress broadcastAddress;
 
 		public IPAddress IPAddress { get { return ipAddress; } }
 		public IPAddress NetMask { get { return netMask; } }
@@ -33,17 +28,16 @@ namespace TBF.Rig.Network.Adapter
             : base(cfg)
         {
 			netadapterCfg = cfg as NetadapterCfg;
-			AdapterInfo.RefreshNetAdaptersInfo();
-			AdapterInfo netadapter = AdapterInfo.GetNetAdapter(netadapterCfg.Description);
-			ipAddress = netadapter.IPAddress;
-			netMask = netadapter.NetMask;
-			broadcastAddress = netadapter.GetBroadcastAddress();
-
-			running = false;
-
             log.Warn(this.ToString());
 		}
 
-        public override void Initialize() { }
+        public override void Initialize()
+        {
+            AdapterInfo.RefreshNetAdaptersInfo();
+            AdapterInfo netadapter = AdapterInfo.GetNetAdapter(netadapterCfg.Description);
+            ipAddress = netadapter.IPAddress;
+            netMask = netadapter.NetMask;
+            broadcastAddress = netadapter.GetBroadcastAddress();
+        }
 	}
 }

TBF/Rig/Network/Camera/Display/Display.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Network.Camera.Display
 	public class Display : ComponentBase, IOperation, ICameraDisplay
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Display));
-		public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public readonly DisplayCfg DisplayCfg;
 

TBF/Rig/Network/Camera/Roi/Roi.cs

@@ -15,14 +15,8 @@ namespace TBF.Rig.Network.Camera.Roi
 		/// TODO: Implement support for sharing one camera by multiple ROI-s
 
 		private static readonly ILog log = LogManager.GetLogger(typeof(Roi));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
-		///
-		/// Cfg 
-		///
 		public readonly RoiCfg RoiCfg;
 
 		public readonly CLP1611.Camera NetCamera;
@@ -141,6 +135,13 @@ namespace TBF.Rig.Network.Camera.Roi
             Clear();
         }
 
+        public void Clear()
+        {
+            pulsesDelta = -cameraPulses;
+            timeDelta = -cameraTime;
+            wmRefPulses = 0;
+        }
+
         #region Configuration Change Handling
 
         public static void OnCfgChange(object sender, CfgChangeArgs args)
@@ -170,14 +171,6 @@ namespace TBF.Rig.Network.Camera.Roi
 
         #endregion Configuration Change Handling
 
-		public void Clear()
-		{
-			pulsesDelta = -cameraPulses;
-			timeDelta = -cameraTime;
-			wmRefPulses = 0;
-		}
-
-
 		public IOperation RoiDetectionOp()
 		{
 			if (NetCamera != null && RoiCfg.DebugLevel != DebugMode.Simulate)

TBF/Rig/Network/Camera/RoiForFixedStart/Roi.cs

@@ -14,14 +14,8 @@ namespace TBF.Rig.Network.Camera.RoiForFixedStart
 		/// TODO: Implement support for sharing one camera by multiple ROI-s
 
 		private static readonly ILog log = LogManager.GetLogger(typeof(Roi));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
-		///
-		/// Cfg 
-		///
 		readonly RoiCfg roiCfg;
 
 		///

TBF/Rig/Network/Comet/Ambient/Ambient.cs

@@ -20,7 +20,7 @@ namespace TBF.Rig.Network.Comet.Ambient
 	public class Ambient : ComponentBase, IDevice, IOperation, GenericDevices.IAmbient
     {
 		private static readonly ILog log = LogManager.GetLogger(typeof(Ambient));
-		public override string ToString() { return string.Format("Ambient({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly AmbientCfg myCfg;
         readonly IPAddress ipAddress;

TBF/Rig/Output/DB/ProductionTracing/Tracing.cs

@@ -31,7 +31,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
     public class Tracing : ComponentBase, IOperation, GenericDevices.IResultsWriter, GenericDevices.IStartInfoReader, Generic.IDevice
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Tracing));
-        public override string ToString() { return string.Format("Tracing({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         public const string WorkstepName = "Test_bench";
 

TBF/Rig/Output/DB/SaveDiverterCorrections/SaveDiverterCorr.cs

@@ -23,7 +23,7 @@ namespace TBF.Rig.Output.DB.SaveDiverterCorrections
 	public class SaveDiverterCorr : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(SaveDiverterCorr));
-        public override string ToString() { return string.Format("SaveDiverterCorr({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         SaveDiverterCorrCfg myCfg;
 

TBF/Rig/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs

@@ -23,7 +23,7 @@ namespace TBF.Rig.Output.DB.SaveFlowmeterCorrections
 	public class SaveFlowmeterCorr : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(SaveFlowmeterCorr));
-        public override string ToString() { return string.Format("SaveFlowmeterCorr({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         SaveFlowmeterCorrCfg myCfg;
 

TBF/Rig/Output/DB/SensusOracle/Database.cs

@@ -51,7 +51,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
 	public class Database : ComponentBase, IOperation, GenericDevices.IResultsWriter, GenericDevices.IStartInfoReader, Generic.IDevice
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Database));
-        public override string ToString() { return string.Format("{0}({1})", GetType().Namespace.Substring(8), Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         public const int Anbid_StaraTura = 4;
 

TBF/Rig/Output/EventTriggers/Iperl/Trigger.cs

@@ -9,7 +9,7 @@ namespace TBF.Rig.Output.EventTriggers.Iperl
     public class Trigger : ComponentBase, IOperation, GenericDevices.IEventTrigger
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Trigger));
-		public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly TriggerCfg triggerCfg;
 

TBF/Rig/Output/FileWriters/Basic/Writer.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.Output.FileWriters.Basic
 	public class Writer : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Writer));
-		public override string ToString() { return string.Format("Output.FileWriters.Basic({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly WriterCfg writerCfg;
 

TBF/Rig/Output/FileWriters/Elde/Writer.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Output.FileWriters.Elde
 	public class Writer : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Writer));
-		public override string ToString() { return string.Format("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly WriterCfg writerCfg;
 

TBF/Rig/Output/FileWriters/Enhanced/Writer.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Output.FileWriters.Enhanced
 	public class Writer : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Writer));
-		public override string ToString() { return string.Format("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly WriterCfg writerCfg;
 

TBF/Rig/Output/FileWriters/ImageArchiver/Archiver.cs

@@ -15,7 +15,7 @@ namespace TBF.Rig.Output.FileWriters.ImageArchiver
 	public class Archiver : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Archiver));
-		public override string ToString() { return string.Format("Output.FileWriters.Basic({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 
 		readonly ArchiverCfg writerCfg;

TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs

@@ -21,8 +21,7 @@ namespace TBF.Rig.Output.FileWriters.IperlLogger
 	public class Writer : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Writer));
-		public override string ToString() { return string.Format("Sensus-Oracle-Database({0})", Cfg.ToString(-1)); }
-
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         WriterCfg writerCfg;
 

TBF/Rig/Output/FileWriters/OneFilePerMeter/Writer.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Output.FileWriters.OneFilePerMeter
 	public class Writer : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Writer));
-		public override string ToString() { return string.Format("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly WriterCfg writerCfg;
 

TBF/Rig/Output/FileWriters/Xml/Writer.cs

@@ -16,7 +16,7 @@ namespace TBF.Rig.Output.FileWriters.Xml
 	public class Writer : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Writer));
-		public override string ToString() { return string.Format("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly WriterCfg writerCfg;
 

TBF/Rig/Output/FileWriters/XmlBatch/Writer.cs

@@ -16,7 +16,7 @@ namespace TBF.Rig.Output.FileWriters.XmlBatch
 	public class Writer : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Writer));
-		public override string ToString() { return string.Format("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly WriterCfg writerCfg;
 

TBF/Rig/Output/Printers/Enhanced/Printer.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Output.Printers.Enhanced
 	public class Printer : ComponentBase, IOperation, GenericDevices.IResultsPrinter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Printer));
-        public override string ToString() { return string.Format("Output.Printers.Enhanced({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly PrinterCfg printerCfg;
 

TBF/Rig/Output/Printers/Label/Printer.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.Output.Printers.Label
 	public class Printer : ComponentBase, IOperation, GenericDevices.IResultsPrinter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Printer));
-		public override string ToString() { return string.Format("LabelPrinter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly PrinterCfg printerCfg;
 

TBF/Rig/Output/Printers/MultiLabel/Printer.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.Output.Printers.MultiLabel
 	public class Printer : ComponentBase, IOperation, GenericDevices.IResultsPrinter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Printer));
-        public override string ToString() { return string.Format("MultiLabel.Printer({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly PrinterCfg printerCfg;
 

TBF/Rig/Output/Printers/OnePerBatch/Printer.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Output.Printers.OnePerBatch
 	public class Printer : ComponentBase, IOperation, GenericDevices.IResultsPrinter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Printer));
-        public override string ToString() { return string.Format("Output.Printers.OnePerMeter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly PrinterCfg printerCfg;
 

TBF/Rig/Output/Printers/OnePerMeter/Printer.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
 	public class Printer : ComponentBase, IOperation, GenericDevices.IResultsPrinter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Printer));
-        public override string ToString() { return string.Format("Output.Printers.OnePerMeter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly PrinterCfg printerCfg;
 

TBF/Rig/Output/Printers/Zapiska/Printer.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.Output.Printers.Zapiska
 	public class Printer : ComponentBase, IOperation, GenericDevices.IResultsPrinter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Printer));
-        public override string ToString() { return string.Format("Output.Printers.Zapiska({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly PrinterCfg printerCfg;
 

TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/EntryForm.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.RegisterReaders.KPackE.DataEntryForRadio
 	public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasWMStatesForm, IReceivesDataFromRadio
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
-        public override string ToString() { return string.Format("DataEntry.Standard48({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool UsesCameras() { return false; }
 

TBF/Rig/RegisterReaders/KPackE/Radio/Radio.cs

@@ -23,7 +23,7 @@ namespace TBF.Rig.RegisterReaders.KPackE.Radio
 	public class Radio : ComponentBase, IDevice
     {
 		private static readonly ILog log = LogManager.GetLogger(typeof(Radio));
-		public override string ToString() { return string.Format("Radio({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         enum KPackE_Type
         {

TBF/Rig/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs

@@ -11,7 +11,7 @@ namespace TBF.Rig.RegisterReaders.KPackE.RegisterReader
 	public class RegisterReader : ComponentBase, GenericDevices.IRegReader, IOperation
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegisterReader));
-        public override string ToString() { return string.Format("KPackE.RegisterReader({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         readonly RRCfg registerReaderCfg;
         readonly Radio.Radio radio;

TBF/Rig/RegisterReaders/PulsesFromUniCB/RegisterReader.cs

@@ -10,7 +10,7 @@ namespace TBF.Rig.RegisterReaders.PulsesFromUniCB
 	public class RegisterReader : ComponentBase, GenericDevices.IRegReader
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegisterReader));
-        public override string ToString() { return string.Format("RegisterReader({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         readonly RRCfg rrCfg;
         readonly TBF.Rig.ControlBoard.IControlBoard cb;

TBF/Rig/RegisterReaders/SerialStream/SerialStream.cs

@@ -17,7 +17,7 @@ namespace TBF.Rig.RegisterReaders.SerialStream
     public class SerialStream : ComponentBase, IDevice, GenericDevices.IRegReaderDatastream, GenericDevices.IHasTestName, IOperation
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(SerialStream));
-        public override string ToString() { return string.Format("RegisterReaders.SerialStream({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 
 		readonly SerialStreamCfg myCfg;
@@ -175,9 +175,7 @@ namespace TBF.Rig.RegisterReaders.SerialStream
         private TextReader textReader;      /// Used instead of serialPort in DebugMode.Simulate
 
 
-		public SerialStream()
-		{
-		}
+		public SerialStream() { }
 
 		public SerialStream(Generic.IComponentCfg cfg)
 			: base(cfg)

TBF/Rig/RegisterReaders/StandingStartStop/RegisterReader.cs

@@ -11,7 +11,7 @@ namespace TBF.Rig.RegisterReaders.StandingStartStop
 	public class RegisterReader : ComponentBase, GenericDevices.IRegReader, IOperation
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegisterReader));
-        public override string ToString() { return string.Format("FixedStartRegisterReader({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         readonly RRCfg registerReaderCfg;
         readonly ControlBoard.IControlBoard controlBoard;
@@ -54,9 +54,7 @@ namespace TBF.Rig.RegisterReaders.StandingStartStop
 
 
 
-		public RegisterReader()
-		{
-		}
+		public RegisterReader() { }
 
 		public RegisterReader(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
 			: base(cfg)

TBF/Rig/TestMethods/DiverterTest/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }
@@ -27,14 +24,14 @@ namespace TBF.Rig.TestMethods.DiverterTest
         readonly TestMethodCfg testMethodCfg;
 
 		public Component() { }
-        /// 
-		public Component(Generic.IComponentCfg cfg)
+
+        public Component(Generic.IComponentCfg cfg)
             : base(cfg)
         {
             testMethodCfg = cfg as TestMethodCfg;
             log.Warn(this.ToString());
 		}
-        /// 
+
         public override void Initialize() { }
 
 		public IList<Event> Execute(Test test, int repetNr, bool isLastRepetition)

TBF/Rig/TestMethods/Endurance/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.Endurance
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         public bool CanTest(MetersKind meters) { return true; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStart/Compound/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStart.Compound
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStart/HeatMeters/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStart.HeatMeters
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStart/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStart.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartDeferredEval/Compound/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval.Compound
 	public class Component : ComponentBase, GenericDevices.ITestMethodWith2ndPass
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartDeferredEval/HeatMeters/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval.HeatMeters
 	public class Component : ComponentBase, GenericDevices.ITestMethodWith2ndPass
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartDeferredEval/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethodWith2ndPass
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartMassCollAdvanced/Compound/Component.cs

@@ -13,10 +13,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollAdvanced.Compound
     public class Component : ComponentBase, GenericDevices.ITestMethod, ISequenceCondition
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartMassCollAdvanced/HeatMeters/Component.cs

@@ -13,10 +13,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollAdvanced.HeatMeters
     public class Component : ComponentBase, GenericDevices.ITestMethod, ISequenceCondition
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartMassCollAdvanced/Single/Component.cs

@@ -13,10 +13,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollAdvanced.Single
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/Compound/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval.Compound
 	public class Component : ComponentBase, GenericDevices.ITestMethodWith2ndPass
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval.HeatMeters
 	public class Component : ComponentBase, GenericDevices.ITestMethodWith2ndPass
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethodWith2ndPass
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartMassCollection/Compound/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection.Compound
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection.HeatMeters
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartMassCollection/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartTankCollection/Compound/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartTankCollection.Compound
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FixedStartTankCollection/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FixedStartTankCollection.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlowAdjustment/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlowAdjustment
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStart/Compound/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStart.Compound
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStart/HeatMeters/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStart.HeatMeters
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStart/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStart.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl.Compound
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl.HeatMeters
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartMassCollComparative/Compound/Component.cs

@@ -12,10 +12,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative.Compound
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartMassCollComparative/HeatMeters/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative.HeatMeters
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartMassCollComparative/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartMassCollProlonged/Compound/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged.Compound
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged.HeatMeters
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartMassCollProlonged/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartMassCollection/Compound/Component.cs

@@ -12,10 +12,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection.Compound
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection.HeatMeters
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.HeatMeter; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartMassCollection/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartTankCollection/Compound/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartTankCollection.Compound
     public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/FlyingStartTankCollection/Single/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.FlyingStartTankCollection.Single
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/ManualEntry/Component.cs

@@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.ManualEntry
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-        public override string ToString() { return string.Format("ManualEntry({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         readonly ManualEntryCfg myCfg;
 

TBF/Rig/TestMethods/OuterLoop/End/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.OuterLoop.End
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return true; }
         public bool DoTransitions() { return false; }

TBF/Rig/TestMethods/OuterLoop/Start/Component.cs

@@ -11,10 +11,7 @@ namespace TBF.Rig.TestMethods.OuterLoop.Start
 	public class Component : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Component));
-		public override string ToString()
-		{
-			return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-		}
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return true; }
         public bool DoTransitions() { return false; }

TBF/Rig/TestMethods/PMaxTest/TestMethod.cs

@@ -12,10 +12,7 @@ namespace TBF.Rig.TestMethods.PMaxTest
 	public class TestMethod : ComponentBase, GenericDevices.ITestMethod
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod));
-        public override string ToString()
-        {
-            return string.Format("{0}({1})", this.GetType().Namespace.Substring(8), Cfg.ToString(1));
-        }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public bool CanTest(MetersKind meters) { return true; }
         public bool DoTransitions() { return true; }

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs

@@ -17,7 +17,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
     public class IperlHead : ComponentBase, IDevice, GenericDevices.IRegReaderDatastream, GenericDevices.IHasTestName, IOperation
 	{
         private static readonly ILog log = LogManager.GetLogger(typeof(IperlHead));
-        public override string ToString() { return string.Format("iPerl({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 
         public const int MaxOptoDataCount = 40000;

TBF/Rig/Uni/Diverter/Diverter.cs

@@ -16,7 +16,7 @@ namespace TBF.Rig.Uni.Diverter
     public class Diverter : ComponentBase, IDevice, GenericDevices.IDiverter, GenericDevices.ISequenceCondition, GenericDevices.IHasCalendarEvents, IDrawingItCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Diverter));
-        public override string ToString() { return string.Format("Diverter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         /// Configuration and wrappers
 		readonly DiverterCfg divCfg;