diff --git a/TBF/Rig/Ambient/Greco/Ambient.cs b/TBF/Rig/Ambient/Greco/Ambient.cs index 373dab26a..50941591a 100644 --- a/TBF/Rig/Ambient/Greco/Ambient.cs +++ b/TBF/Rig/Ambient/Greco/Ambient.cs @@ -22,7 +22,7 @@ namespace TBF.Rig.Ambient.Greco public class Ambient : ComponentBase, IDevice, IOperation, GenericDevices.IAmbient, IDrawingItCmpntWithMeasuredVal { 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("Ambient({0})", Cfg.ToString(-1)); } private readonly AmbientCfg ambientCfg; /// diff --git a/TBF/Rig/BuiltIn/Pump/Pump.cs b/TBF/Rig/BuiltIn/Pump/Pump.cs index fcc5acf12..2a7bfaae2 100644 --- a/TBF/Rig/BuiltIn/Pump/Pump.cs +++ b/TBF/Rig/BuiltIn/Pump/Pump.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.BuiltIn.Pump public class Pump : ComponentBase, GenericDevices.IPump, GenericDevices.IValve, SchematicDrawing.IDrawingItCmpnt { private static readonly ILog log = LogManager.GetLogger(typeof(Pump)); - public override string ToString() { return string.Format("Pump({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("Pump({0})", Cfg.ToString(-1)); } readonly PumpCfg pumpCfg; public SchematicDrawing.IDrawingItem DrawingItem { get { return pumpCfg as SchematicDrawing.IDrawingItem; } } diff --git a/TBF/Rig/BuiltIn/Valve/Valve.cs b/TBF/Rig/BuiltIn/Valve/Valve.cs index 19532e22a..c1b3cd04a 100644 --- a/TBF/Rig/BuiltIn/Valve/Valve.cs +++ b/TBF/Rig/BuiltIn/Valve/Valve.cs @@ -15,7 +15,7 @@ namespace TBF.Rig.BuiltIn.Valve public class Valve : ValveBase, IValve, SchematicDrawing.IDrawingItCmpnt { private static readonly ILog log = LogManager.GetLogger(typeof(Valve)); - public override string ToString() { return string.Format("Valve({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("Valve({0})", Cfg.ToString(-1)); } readonly ValveCfg valveCfg; public SchematicDrawing.IDrawingItem DrawingItem { get { return valveCfg as SchematicDrawing.IDrawingItem; } } diff --git a/TBF/Rig/BuiltIn/ValveEx/Valve.cs b/TBF/Rig/BuiltIn/ValveEx/Valve.cs index 83c596f12..b5629ca18 100644 --- a/TBF/Rig/BuiltIn/ValveEx/Valve.cs +++ b/TBF/Rig/BuiltIn/ValveEx/Valve.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.BuiltIn.ValveEx public class Valve : ComponentBase, Generic.IComponent { private static readonly ILog log = LogManager.GetLogger(typeof(Valve)); - public override string ToString() { return string.Format("ValveEx({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("ValveEx({0})", Cfg.ToString(-1)); } readonly ValveCfg valveCfg; diff --git a/TBF/Rig/Danfoss/VLT2800/Pump.cs b/TBF/Rig/Danfoss/VLT2800/Pump.cs index 6636503c2..c3deac5d9 100644 --- a/TBF/Rig/Danfoss/VLT2800/Pump.cs +++ b/TBF/Rig/Danfoss/VLT2800/Pump.cs @@ -72,7 +72,7 @@ namespace TBF.Rig.Danfoss.VLT2800 public class Pump : ComponentBase, IDevice, IOperation, GenericDevices.IPumpFM, GenericDevices.IValve, IDrawingItCmpntWithSetpoint { private static readonly ILog log = LogManager.GetLogger(typeof(Pump)); - public override string ToString() { return string.Format("Pump-Danfoss-VLT2800({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("Pump-Danfoss-VLT2800({0})", Cfg.ToString(-1)); } private readonly PumpCfg pumpCfg; public IDrawingItem DrawingItem { get { return pumpCfg as IDrawingItem; } } diff --git a/TBF/Rig/DataContainer/BackupAndSecurityOptions/Component.cs b/TBF/Rig/DataContainer/BackupAndSecurityOptions/Component.cs index 70c1edb33..404e7a1a4 100644 --- a/TBF/Rig/DataContainer/BackupAndSecurityOptions/Component.cs +++ b/TBF/Rig/DataContainer/BackupAndSecurityOptions/Component.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.DataContainer.BackupAndSecurityOptions public class Component : ComponentBase { 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)); } readonly ComponentCfg myCfg; diff --git a/TBF/Rig/DataContainer/BenchInfo/Component.cs b/TBF/Rig/DataContainer/BenchInfo/Component.cs index e20058418..3b1f1cfec 100644 --- a/TBF/Rig/DataContainer/BenchInfo/Component.cs +++ b/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("BenchInfo({0})", Cfg.ToString(-1)); } readonly ComponentCfg myCfg; diff --git a/TBF/Rig/DataContainer/Buoyancy/Component.cs b/TBF/Rig/DataContainer/Buoyancy/Component.cs index 73d48c599..3ee2cf65a 100644 --- a/TBF/Rig/DataContainer/Buoyancy/Component.cs +++ b/TBF/Rig/DataContainer/Buoyancy/Component.cs @@ -14,7 +14,7 @@ namespace TBF.Rig.DataContainer.Buoyancy public class Component : ComponentBase, GenericDevices.IHasCalendarEvents { 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)); } readonly ComponentCfg myCfg; diff --git a/TBF/Rig/DataContainer/Density/Component.cs b/TBF/Rig/DataContainer/Density/Component.cs index 9ee3a6997..f2cc8784c 100644 --- a/TBF/Rig/DataContainer/Density/Component.cs +++ b/TBF/Rig/DataContainer/Density/Component.cs @@ -14,7 +14,7 @@ namespace TBF.Rig.DataContainer.Density public class Component : ComponentBase, GenericDevices.IHasCalendarEvents { 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)); } readonly ComponentCfg myCfg; diff --git a/TBF/Rig/DataContainer/iPerlBenchInfo/Component.cs b/TBF/Rig/DataContainer/iPerlBenchInfo/Component.cs index 7cec79824..0a8de418b 100644 --- a/TBF/Rig/DataContainer/iPerlBenchInfo/Component.cs +++ b/TBF/Rig/DataContainer/iPerlBenchInfo/Component.cs @@ -18,7 +18,7 @@ namespace TBF.Rig.DataContainer.iPerlBenchInfo public class Component : ComponentBase, GenericDevices.IBenchInfo, GenericDevices.IHasCalendarEvents { private static readonly ILog log = LogManager.GetLogger(typeof(Component)); - public override string ToString() { return string.Format("BenchInfo.iPerl({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("BenchInfo.iPerl({0})", Cfg.ToString(-1)); } readonly ComponentCfg myCfg; diff --git a/TBF/Rig/DataEntry/Combined/EntryForm.cs b/TBF/Rig/DataEntry/Combined/EntryForm.cs index d0b156f4c..b05e14c8f 100644 --- a/TBF/Rig/DataEntry/Combined/EntryForm.cs +++ b/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("DataEntry.Combined({0})", Cfg.ToString(-1)); } public bool UsesCameras() { return false; } diff --git a/TBF/Rig/DataEntry/Fewa/EntryFormNoStartEnd.cs b/TBF/Rig/DataEntry/Fewa/EntryFormNoStartEnd.cs index ac27fcb20..257e751d1 100644 --- a/TBF/Rig/DataEntry/Fewa/EntryFormNoStartEnd.cs +++ b/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("DataEntry.Standard24({0})", Cfg.ToString(-1)); } public bool UsesCameras() { return false; } diff --git a/TBF/Rig/DataEntry/Single/EntryFormNoStartEnd.cs b/TBF/Rig/DataEntry/Single/EntryFormNoStartEnd.cs index a519f6e51..82e7fbe32 100644 --- a/TBF/Rig/DataEntry/Single/EntryFormNoStartEnd.cs +++ b/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("DataEntry.Standard24({0})", Cfg.ToString(-1)); } public bool UsesCameras() { return false; } diff --git a/TBF/Rig/DataEntry/Standard12/EntryFormNoStartEnd.cs b/TBF/Rig/DataEntry/Standard12/EntryFormNoStartEnd.cs index 4f817aed8..7599ba6fa 100644 --- a/TBF/Rig/DataEntry/Standard12/EntryFormNoStartEnd.cs +++ b/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("DataEntry.Standard12({0})", Cfg.ToString(-1)); } public bool UsesCameras() { return false; } diff --git a/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs b/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs index 0b514ba4a..913f7f79b 100644 --- a/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs +++ b/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("DataEntry.Standard24({0})", Cfg.ToString(-1)); } public bool UsesCameras() { return false; } diff --git a/TBF/Rig/DataEntry/Standard48/EntryFormNoStartEnd.cs b/TBF/Rig/DataEntry/Standard48/EntryFormNoStartEnd.cs index 362613866..84163c2e2 100644 --- a/TBF/Rig/DataEntry/Standard48/EntryFormNoStartEnd.cs +++ b/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("DataEntry.Standard48({0})", Cfg.ToString(-1)); } public bool UsesCameras() { return false; } diff --git a/TBF/Rig/DataEntry/Standard6/EntryFormNoStartEnd.cs b/TBF/Rig/DataEntry/Standard6/EntryFormNoStartEnd.cs index a9b16918b..b5071afab 100644 --- a/TBF/Rig/DataEntry/Standard6/EntryFormNoStartEnd.cs +++ b/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("DataEntry.Standard6({0})", Cfg.ToString(-1)); } public bool UsesCameras() { return false; } diff --git a/TBF/Rig/DataEntry/StandardCamera/EntryForm.cs b/TBF/Rig/DataEntry/StandardCamera/EntryForm.cs index d071c29c1..5c7170617 100644 --- a/TBF/Rig/DataEntry/StandardCamera/EntryForm.cs +++ b/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("DataEntry.Standard24({0})", Cfg.ToString(-1)); } readonly EntryFormCfg entryFormCfg; diff --git a/TBF/Rig/DataEntry/iPerl/EntryForm.cs b/TBF/Rig/DataEntry/iPerl/EntryForm.cs index d23394059..5e7741aab 100644 --- a/TBF/Rig/DataEntry/iPerl/EntryForm.cs +++ b/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("DataEntry.iPerl({0})", Cfg.ToString(-1)); } public bool UsesCameras() { return false; } diff --git a/TBF/Rig/Dummy/FlowMeter/FlowMeter.cs b/TBF/Rig/Dummy/FlowMeter/FlowMeter.cs index 10f892ea0..9d538171f 100644 --- a/TBF/Rig/Dummy/FlowMeter/FlowMeter.cs +++ b/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("FlowMeter({0})", Cfg.ToString(-1)); } readonly FlowMeterCfg flowMeterCfg; public double NominalFlow { get { return flowMeterCfg.NominalFlow; } } diff --git a/TBF/Rig/Dummy/RegulValve/RegulValve.cs b/TBF/Rig/Dummy/RegulValve/RegulValve.cs index 19f2d3aa4..82817cb59 100644 --- a/TBF/Rig/Dummy/RegulValve/RegulValve.cs +++ b/TBF/Rig/Dummy/RegulValve/RegulValve.cs @@ -11,7 +11,7 @@ namespace TBF.Rig.Dummy.RegulValve public class RegulValve : ComponentBase, IDevice, GenericDevices.IRegValve, SchematicDrawing.IDrawingItCmpnt { private static readonly ILog log = LogManager.GetLogger(typeof(RegulValve)); - public override string ToString() { return string.Format("RegulValve({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("RegulValve({0})", Cfg.ToString(-1)); } public readonly RegulValveCfg RegulValveCfg; public SchematicDrawing.IDrawingItem DrawingItem { get { return RegulValveCfg as SchematicDrawing.IDrawingItem; } } diff --git a/TBF/Rig/Elde/CoverTest/CoverTest.cs b/TBF/Rig/Elde/CoverTest/CoverTest.cs index b7ece97f6..ab0eaab69 100644 --- a/TBF/Rig/Elde/CoverTest/CoverTest.cs +++ b/TBF/Rig/Elde/CoverTest/CoverTest.cs @@ -16,7 +16,7 @@ namespace TBF.Rig.Elde.CoverTest private static readonly ILog log = LogManager.GetLogger(typeof(CoverTest)); private static readonly ILog bypassLog = LogManager.GetLogger("BypassLog"); - public override string ToString() { return string.Format("CoverTest({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("CoverTest({0})", Cfg.ToString(-1)); } readonly CoverTestCfg coverTestCfg; diff --git a/TBF/Rig/Elde/FlowMeterDewa/FlowMeter.cs b/TBF/Rig/Elde/FlowMeterDewa/FlowMeter.cs index 871b6132e..c4a4a5083 100644 --- a/TBF/Rig/Elde/FlowMeterDewa/FlowMeter.cs +++ b/TBF/Rig/Elde/FlowMeterDewa/FlowMeter.cs @@ -13,7 +13,7 @@ namespace TBF.Rig.Elde.FlowMeterDewa public class FlowMeter : ComponentBase, IFlowMeter { 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("FlowMeter({0})", Cfg.ToString(-1)); } readonly FlowMeterCfg flowMeterCfg; readonly CBoard controlBoard; diff --git a/TBF/Rig/Elde/FlowMeterTriplet/FlowMeter.cs b/TBF/Rig/Elde/FlowMeterTriplet/FlowMeter.cs index 435a60a1a..7f706e42b 100644 --- a/TBF/Rig/Elde/FlowMeterTriplet/FlowMeter.cs +++ b/TBF/Rig/Elde/FlowMeterTriplet/FlowMeter.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.Elde.FlowMeterTriplet public class FlowMeter : ComponentBase, GenericDevices.IFlowMeter { 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("FlowMeter({0})", Cfg.ToString(-1)); } readonly FlowMeterCfg flowMeterCfg; readonly CBoard cBoard; diff --git a/TBF/Rig/Elde/FlowMeterTwins/FlowMeter.cs b/TBF/Rig/Elde/FlowMeterTwins/FlowMeter.cs index fca55ce8c..7e9d57cde 100644 --- a/TBF/Rig/Elde/FlowMeterTwins/FlowMeter.cs +++ b/TBF/Rig/Elde/FlowMeterTwins/FlowMeter.cs @@ -13,7 +13,7 @@ namespace TBF.Rig.Elde.FlowMeterTwins public class FlowMeter : ComponentBase, GenericDevices.IFlowMeter { private static readonly ILog log = LogManager.GetLogger(typeof(FlowMeter)); - public override string ToString() { return string.Format("FlowMeterTwins({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("FlowMeterTwins({0})", Cfg.ToString(-1)); } readonly FlowMeterCfg flowMeterCfg; readonly CBoard controlBoard; diff --git a/TBF/Rig/Elde/TempMeter/TempMeter.cs b/TBF/Rig/Elde/TempMeter/TempMeter.cs index 3650d7b40..df6685b60 100644 --- a/TBF/Rig/Elde/TempMeter/TempMeter.cs +++ b/TBF/Rig/Elde/TempMeter/TempMeter.cs @@ -14,7 +14,7 @@ namespace TBF.Rig.Elde.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("TempMeter({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("TempMeter({0})", Cfg.ToString(-1)); } readonly TempMeterCfg tempMtrCfg; public SchematicDrawing.IDrawingItem DrawingItem { get { return tempMtrCfg as SchematicDrawing.IDrawingItem; } } diff --git a/TBF/Rig/Elde/TempMeterInternal/TempMeter.cs b/TBF/Rig/Elde/TempMeterInternal/TempMeter.cs index a3a6f72ef..a2d687115 100644 --- a/TBF/Rig/Elde/TempMeterInternal/TempMeter.cs +++ b/TBF/Rig/Elde/TempMeterInternal/TempMeter.cs @@ -14,7 +14,7 @@ namespace TBF.Rig.Elde.TempMeterInternal 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("TempMeter({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("TempMeter({0})", Cfg.ToString(-1)); } readonly TempMeterCfg tempMtrCfg; public SchematicDrawing.IDrawingItem DrawingItem { get { return tempMtrCfg as SchematicDrawing.IDrawingItem; } } diff --git a/TBF/Rig/Hart/Common/Hart.cs b/TBF/Rig/Hart/Common/Hart.cs index 033b65aaf..3f23302c8 100644 --- a/TBF/Rig/Hart/Common/Hart.cs +++ b/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("Modbus({0})", Cfg.ToString(-1)); } private readonly HartCfg hartCfg; diff --git a/TBF/Rig/Keithley/Multimeter_2010_RS232/Multimeter.cs b/TBF/Rig/Keithley/Multimeter_2010_RS232/Multimeter.cs index c054dc684..317a212b4 100644 --- a/TBF/Rig/Keithley/Multimeter_2010_RS232/Multimeter.cs +++ b/TBF/Rig/Keithley/Multimeter_2010_RS232/Multimeter.cs @@ -20,7 +20,7 @@ namespace TBF.Rig.Keithley.Multimeter_2010_RS232 public class Multimeter : ComponentBase, IDevice { private static readonly ILog log = LogManager.GetLogger(typeof(Multimeter)); - 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)); } private readonly MultimeterCfg multimeterCfg; diff --git a/TBF/Rig/Keithley/TempMeter/TempMeter.cs b/TBF/Rig/Keithley/TempMeter/TempMeter.cs index 4570013ef..418e1354d 100644 --- a/TBF/Rig/Keithley/TempMeter/TempMeter.cs +++ b/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("Keithley.TempMeter({0})", Cfg.ToString(-1)); } readonly TempMeterCfg tempMtrCfg; /// configuration public SchematicDrawing.IDrawingItem DrawingItem { get { return tempMtrCfg as SchematicDrawing.IDrawingItem; } } diff --git a/TBF/Rig/MettlerToledo/Multi/BalanceDev.cs b/TBF/Rig/MettlerToledo/Multi/BalanceDev.cs index 7e50c9b0a..b281d5a38 100644 --- a/TBF/Rig/MettlerToledo/Multi/BalanceDev.cs +++ b/TBF/Rig/MettlerToledo/Multi/BalanceDev.cs @@ -27,7 +27,7 @@ namespace TBF.Rig.MettlerToledo.Multi /// Warn: Start measurement when busy is true /// private static readonly ILog log = LogManager.GetLogger(typeof(BalanceDev)); - public override string ToString() { return string.Format("MettlerToledo.Multi.Balance({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("MettlerToledo.Multi.Balance({0})", Cfg.ToString(-1)); } protected readonly BalanceCfg balanceCfg; protected static BalanceCfg balance1Cfg; diff --git a/TBF/Rig/MettlerToledo/Standard/BalanceDev.cs b/TBF/Rig/MettlerToledo/Standard/BalanceDev.cs index e1cee7289..f4eb8479e 100644 --- a/TBF/Rig/MettlerToledo/Standard/BalanceDev.cs +++ b/TBF/Rig/MettlerToledo/Standard/BalanceDev.cs @@ -36,7 +36,7 @@ namespace TBF.Rig.MettlerToledo.Standard /// Warn: Start measurement when busy is true /// private static readonly ILog log = LogManager.GetLogger(typeof(BalanceDev)); - public override string ToString() { return string.Format("MettlerToledo.Standard.Balance({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("MettlerToledo.Standard.Balance({0})", Cfg.ToString(-1)); } protected readonly BalanceCfg balanceCfg; public IDrawingItem DrawingItem { get { return balanceCfg as IDrawingItem; } } diff --git a/TBF/Rig/MettlerToledo/Standard/BalanceNewDev.cs b/TBF/Rig/MettlerToledo/Standard/BalanceNewDev.cs index b34595538..de08eeb22 100644 --- a/TBF/Rig/MettlerToledo/Standard/BalanceNewDev.cs +++ b/TBF/Rig/MettlerToledo/Standard/BalanceNewDev.cs @@ -22,7 +22,7 @@ namespace TBF.Rig.MettlerToledo.Standard /// Warn: Start measurement when busy is true /// private static readonly ILog log = LogManager.GetLogger(typeof(BalanceNewDev)); - public override string ToString() { return string.Format("MettlerToledo.Standard.BalanceNew({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("MettlerToledo.Standard.BalanceNew({0})", Cfg.ToString(-1)); } /// Serial number after GetSerialNumber() when MsrmntState == MsrmntState.Valid public string SerialNumber { get { return serialNumber; } } diff --git a/TBF/Rig/MettlerToledo/Standard/BalanceOld.cs b/TBF/Rig/MettlerToledo/Standard/BalanceOld.cs index beccb14cd..a3b1e00ce 100644 --- a/TBF/Rig/MettlerToledo/Standard/BalanceOld.cs +++ b/TBF/Rig/MettlerToledo/Standard/BalanceOld.cs @@ -25,7 +25,7 @@ namespace TBF.Rig.MettlerToledo.Standard /// Warn: Start measurement when busy is true /// private static readonly ILog log = LogManager.GetLogger(typeof(BalanceOld)); - public override string ToString() { return string.Format("MettlerToledo.Standard.BalanceOld({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("MettlerToledo.Standard.BalanceOld({0})", Cfg.ToString(-1)); } public BalanceOld() { } diff --git a/TBF/Rig/Modbus/Ambient/Comet/Ambient.cs b/TBF/Rig/Modbus/Ambient/Comet/Ambient.cs index 45f4d4a9b..743627134 100644 --- a/TBF/Rig/Modbus/Ambient/Comet/Ambient.cs +++ b/TBF/Rig/Modbus/Ambient/Comet/Ambient.cs @@ -19,7 +19,7 @@ namespace TBF.Rig.Modbus.Ambient.Comet public class Ambient : ComponentBase, IDevice, IOperation, GenericDevices.IAmbient, IDrawingItCmpntWithMeasuredVal { 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("Ambient({0})", Cfg.ToString(-1)); } /// /// Configuration and wrappers diff --git a/TBF/Rig/Modbus/Easytherm/Easytherm.cs b/TBF/Rig/Modbus/Easytherm/Easytherm.cs index 7b3e464bf..f9962f5f7 100644 --- a/TBF/Rig/Modbus/Easytherm/Easytherm.cs +++ b/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("Easytherm({0})", Cfg.ToString(-1)); } readonly EasythermCfg easythermCfg; readonly GenericDevices.IModbus modbus; diff --git a/TBF/Rig/Modbus/PumpFM/DanfossVLT/Pump.cs b/TBF/Rig/Modbus/PumpFM/DanfossVLT/Pump.cs index a5670bacc..e984bee55 100644 --- a/TBF/Rig/Modbus/PumpFM/DanfossVLT/Pump.cs +++ b/TBF/Rig/Modbus/PumpFM/DanfossVLT/Pump.cs @@ -69,7 +69,7 @@ namespace TBF.Rig.Modbus.PumpFM.DanfossVLT public class Pump : ComponentBase, IDevice, IOperation, GenericDevices.IPumpFM, GenericDevices.IValve, IDrawingItCmpntWithSetpoint { private static readonly ILog log = LogManager.GetLogger(typeof(Pump)); - 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)); } private readonly PumpCfg pumpCfg; public IDrawingItem DrawingItem { get { return pumpCfg as IDrawingItem; } } diff --git a/TBF/Rig/Modbus/QuidoRS/QuidoRS.cs b/TBF/Rig/Modbus/QuidoRS/QuidoRS.cs index 2d5b6a1dc..a9ab7c3c8 100644 --- a/TBF/Rig/Modbus/QuidoRS/QuidoRS.cs +++ b/TBF/Rig/Modbus/QuidoRS/QuidoRS.cs @@ -14,7 +14,7 @@ namespace TBF.Rig.Modbus.QuidoRS public class QuidoRS : ComponentBase, IDevice, GenericDevices.IParallelOutput { private static readonly ILog log = LogManager.GetLogger(typeof(QuidoRS)); - 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 QuidoRSCfg quidoRSCfg; readonly GenericDevices.IModbus modbus; diff --git a/TBF/Rig/Modbus/TankSelector/TankSelector.cs b/TBF/Rig/Modbus/TankSelector/TankSelector.cs index 874910783..7847cf3e5 100644 --- a/TBF/Rig/Modbus/TankSelector/TankSelector.cs +++ b/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("TankSelector({0})", Cfg.ToString(-1)); } readonly TankSelectorCfg tankSelectorCfg; diff --git a/TBF/Rig/Modbus/UltrasoundLevelMeter/LevelMeter.cs b/TBF/Rig/Modbus/UltrasoundLevelMeter/LevelMeter.cs index 2b0c90c96..680fc44b4 100644 --- a/TBF/Rig/Modbus/UltrasoundLevelMeter/LevelMeter.cs +++ b/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("LevelMeter({0})", Cfg.ToString(-1)); } readonly LevelMeterCfg myCfg; readonly GenericDevices.IModbus modbus; diff --git a/TBF/Rig/Modbus/WaterAnalyzer/Analyzer.cs b/TBF/Rig/Modbus/WaterAnalyzer/Analyzer.cs index ed58b41d2..ab4756316 100644 --- a/TBF/Rig/Modbus/WaterAnalyzer/Analyzer.cs +++ b/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("Analyzer({0})", Cfg.ToString(-1)); } readonly AnalyzerCfg myCfg; readonly GenericDevices.IModbus modbus; diff --git a/TBF/Rig/Network/Comet/Ambient/Ambient.cs b/TBF/Rig/Network/Comet/Ambient/Ambient.cs index 19fd8d677..8679d69f8 100644 --- a/TBF/Rig/Network/Comet/Ambient/Ambient.cs +++ b/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("Ambient({0})", Cfg.ToString(-1)); } readonly AmbientCfg myCfg; readonly IPAddress ipAddress; diff --git a/TBF/Rig/Output/DB/ProductionTracing/Tracing.cs b/TBF/Rig/Output/DB/ProductionTracing/Tracing.cs index 766c7a7e9..b32246b68 100644 --- a/TBF/Rig/Output/DB/ProductionTracing/Tracing.cs +++ b/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("Tracing({0})", Cfg.ToString(-1)); } public const string WorkstepName = "Test_bench"; diff --git a/TBF/Rig/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs b/TBF/Rig/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs index 981e5f0b1..9eeb5fda7 100644 --- a/TBF/Rig/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs +++ b/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("SaveFlowmeterCorr({0})", Cfg.ToString(-1)); } SaveFlowmeterCorrCfg myCfg; diff --git a/TBF/Rig/Output/DB/SensusOracle/Database.cs b/TBF/Rig/Output/DB/SensusOracle/Database.cs index 1062c0517..390f1ac3b 100644 --- a/TBF/Rig/Output/DB/SensusOracle/Database.cs +++ b/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})", GetType().Namespace.Substring(8), Cfg.ToString(-1)); } public const int Anbid_StaraTura = 4; diff --git a/TBF/Rig/Output/EventTriggers/Iperl/Trigger.cs b/TBF/Rig/Output/EventTriggers/Iperl/Trigger.cs index 6da87ae15..f12cc8fee 100644 --- a/TBF/Rig/Output/EventTriggers/Iperl/Trigger.cs +++ b/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; diff --git a/TBF/Rig/Output/EventTriggers/Standard/Trigger.cs b/TBF/Rig/Output/EventTriggers/Standard/Trigger.cs index 9154c5845..06089cc9d 100644 --- a/TBF/Rig/Output/EventTriggers/Standard/Trigger.cs +++ b/TBF/Rig/Output/EventTriggers/Standard/Trigger.cs @@ -11,7 +11,7 @@ namespace TBF.Rig.Output.EventTriggers.Standard 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; string src { get { return triggerCfg.EventSource; } } diff --git a/TBF/Rig/Output/FileWriters/Basic/Writer.cs b/TBF/Rig/Output/FileWriters/Basic/Writer.cs index 44e27316e..cc7c7e6bf 100644 --- a/TBF/Rig/Output/FileWriters/Basic/Writer.cs +++ b/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("Output.FileWriters.Basic({0})", Cfg.ToString(-1)); } readonly WriterCfg writerCfg; diff --git a/TBF/Rig/Output/FileWriters/Elde/Writer.cs b/TBF/Rig/Output/FileWriters/Elde/Writer.cs index e4078281b..2655b680c 100644 --- a/TBF/Rig/Output/FileWriters/Elde/Writer.cs +++ b/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("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); } readonly WriterCfg writerCfg; diff --git a/TBF/Rig/Output/FileWriters/Enhanced/Writer.cs b/TBF/Rig/Output/FileWriters/Enhanced/Writer.cs index d0049253b..db62580ac 100644 --- a/TBF/Rig/Output/FileWriters/Enhanced/Writer.cs +++ b/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("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); } readonly WriterCfg writerCfg; diff --git a/TBF/Rig/Output/FileWriters/ImageArchiver/Archiver.cs b/TBF/Rig/Output/FileWriters/ImageArchiver/Archiver.cs index 39ff332e8..91a3cd086 100644 --- a/TBF/Rig/Output/FileWriters/ImageArchiver/Archiver.cs +++ b/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("Output.FileWriters.Basic({0})", Cfg.ToString(-1)); } readonly ArchiverCfg writerCfg; diff --git a/TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs b/TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs index cc3f4c48a..9d5c5466a 100644 --- a/TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs +++ b/TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs @@ -21,7 +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("Sensus-Oracle-Database({0})", Cfg.ToString(-1)); } WriterCfg writerCfg; diff --git a/TBF/Rig/Output/FileWriters/OneFilePerMeter/Writer.cs b/TBF/Rig/Output/FileWriters/OneFilePerMeter/Writer.cs index 971c0abfa..916d0bdd0 100644 --- a/TBF/Rig/Output/FileWriters/OneFilePerMeter/Writer.cs +++ b/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("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); } readonly WriterCfg writerCfg; diff --git a/TBF/Rig/Output/FileWriters/Xml/Writer.cs b/TBF/Rig/Output/FileWriters/Xml/Writer.cs index 68a328d27..0a30943bd 100644 --- a/TBF/Rig/Output/FileWriters/Xml/Writer.cs +++ b/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("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); } readonly WriterCfg writerCfg; diff --git a/TBF/Rig/Output/FileWriters/XmlBatch/Writer.cs b/TBF/Rig/Output/FileWriters/XmlBatch/Writer.cs index d9b0c8f89..7b424653e 100644 --- a/TBF/Rig/Output/FileWriters/XmlBatch/Writer.cs +++ b/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("Output.FileWriters.Enhanced({0})", Cfg.ToString(-1)); } readonly WriterCfg writerCfg; diff --git a/TBF/Rig/Output/Printers/Enhanced/Printer.cs b/TBF/Rig/Output/Printers/Enhanced/Printer.cs index 4dec94266..1111b7dff 100644 --- a/TBF/Rig/Output/Printers/Enhanced/Printer.cs +++ b/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("Output.Printers.Enhanced({0})", Cfg.ToString(-1)); } readonly PrinterCfg printerCfg; diff --git a/TBF/Rig/Output/Printers/Label/Printer.cs b/TBF/Rig/Output/Printers/Label/Printer.cs index f88956dfd..dd089377e 100644 --- a/TBF/Rig/Output/Printers/Label/Printer.cs +++ b/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("LabelPrinter({0})", Cfg.ToString(-1)); } readonly PrinterCfg printerCfg; diff --git a/TBF/Rig/Output/Printers/MultiLabel/Printer.cs b/TBF/Rig/Output/Printers/MultiLabel/Printer.cs index 2c13209bb..da236c5bf 100644 --- a/TBF/Rig/Output/Printers/MultiLabel/Printer.cs +++ b/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("MultiLabel.Printer({0})", Cfg.ToString(-1)); } readonly PrinterCfg printerCfg; diff --git a/TBF/Rig/Output/Printers/OnePerBatch/Printer.cs b/TBF/Rig/Output/Printers/OnePerBatch/Printer.cs index 7d906d928..994544eb8 100644 --- a/TBF/Rig/Output/Printers/OnePerBatch/Printer.cs +++ b/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("Output.Printers.OnePerMeter({0})", Cfg.ToString(-1)); } readonly PrinterCfg printerCfg; diff --git a/TBF/Rig/Output/Printers/OnePerMeter/Printer.cs b/TBF/Rig/Output/Printers/OnePerMeter/Printer.cs index 07ba2fc23..da8499cc7 100644 --- a/TBF/Rig/Output/Printers/OnePerMeter/Printer.cs +++ b/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("Output.Printers.OnePerMeter({0})", Cfg.ToString(-1)); } readonly PrinterCfg printerCfg; diff --git a/TBF/Rig/Output/Printers/Zapiska/Printer.cs b/TBF/Rig/Output/Printers/Zapiska/Printer.cs index b715c5c9c..108bb514f 100644 --- a/TBF/Rig/Output/Printers/Zapiska/Printer.cs +++ b/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("Output.Printers.Zapiska({0})", Cfg.ToString(-1)); } readonly PrinterCfg printerCfg; diff --git a/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/EntryForm.cs b/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/EntryForm.cs index 442b4fb83..a09290a17 100644 --- a/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/EntryForm.cs +++ b/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("DataEntry.Standard48({0})", Cfg.ToString(-1)); } public bool UsesCameras() { return false; } diff --git a/TBF/Rig/RegisterReaders/KPackE/Radio/Radio.cs b/TBF/Rig/RegisterReaders/KPackE/Radio/Radio.cs index 67d87cb65..bac5e360f 100644 --- a/TBF/Rig/RegisterReaders/KPackE/Radio/Radio.cs +++ b/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("Radio({0})", Cfg.ToString(-1)); } enum KPackE_Type { diff --git a/TBF/Rig/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs b/TBF/Rig/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs index 108f218f8..f5aebabb3 100644 --- a/TBF/Rig/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs +++ b/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("KPackE.RegisterReader({0})", Cfg.ToString(-1)); } readonly RRCfg registerReaderCfg; readonly Radio.Radio radio; diff --git a/TBF/Rig/RegisterReaders/PulsesFromUniCB/RegisterReader.cs b/TBF/Rig/RegisterReaders/PulsesFromUniCB/RegisterReader.cs index b27db500a..42d3dd3e6 100644 --- a/TBF/Rig/RegisterReaders/PulsesFromUniCB/RegisterReader.cs +++ b/TBF/Rig/RegisterReaders/PulsesFromUniCB/RegisterReader.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.RegisterReaders.PulsesFromUniCB public class RegisterReader : ComponentBase, GenericDevices.IRegReader, IOperation { 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("RegisterReader({0})", Cfg.ToString(-1)); } readonly RRCfg registerReaderCfg; diff --git a/TBF/Rig/RegisterReaders/SerialStream/SerialStream.cs b/TBF/Rig/RegisterReaders/SerialStream/SerialStream.cs index bfc61cc9f..c5fbdac91 100644 --- a/TBF/Rig/RegisterReaders/SerialStream/SerialStream.cs +++ b/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("RegisterReaders.SerialStream({0})", Cfg.ToString(-1)); } readonly SerialStreamCfg myCfg; diff --git a/TBF/Rig/RegisterReaders/StandingStartStop/RegisterReader.cs b/TBF/Rig/RegisterReaders/StandingStartStop/RegisterReader.cs index 40d26a403..612dff30f 100644 --- a/TBF/Rig/RegisterReaders/StandingStartStop/RegisterReader.cs +++ b/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("FixedStartRegisterReader({0})", Cfg.ToString(-1)); } readonly RRCfg registerReaderCfg; readonly ControlBoard.IControlBoard controlBoard; diff --git a/TBF/Rig/TestMethods/Adjustment/TestMethod.cs b/TBF/Rig/TestMethods/Adjustment/TestMethod.cs index a7261e4fc..d00997946 100644 --- a/TBF/Rig/TestMethods/Adjustment/TestMethod.cs +++ b/TBF/Rig/TestMethods/Adjustment/TestMethod.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.Adjustment public class TestMethod : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - 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 bool CanTest(MetersKind meters) { return meters == MetersKind.Single; } public bool DoTransitions() { return true; } diff --git a/TBF/Rig/TestMethods/ChangeFlowDirection/TestMethod.cs b/TBF/Rig/TestMethods/ChangeFlowDirection/TestMethod.cs index 37153f9f0..f418fa458 100644 --- a/TBF/Rig/TestMethods/ChangeFlowDirection/TestMethod.cs +++ b/TBF/Rig/TestMethods/ChangeFlowDirection/TestMethod.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.ChangeFlowDirection public class TestMethod : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - 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 bool CanTest(MetersKind meters) { return meters == MetersKind.Single; } public bool DoTransitions() { return true; } diff --git a/TBF/Rig/TestMethods/CombinedWithDetection/TestMethod.cs b/TBF/Rig/TestMethods/CombinedWithDetection/TestMethod.cs index 7b3ee9536..b60f072a2 100644 --- a/TBF/Rig/TestMethods/CombinedWithDetection/TestMethod.cs +++ b/TBF/Rig/TestMethods/CombinedWithDetection/TestMethod.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection public class TestMethod : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - 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 bool CanTest(MetersKind meters) { return meters == MetersKind.Combined; } public bool DoTransitions() { return true; } diff --git a/TBF/Rig/TestMethods/Counter/TestMethod.cs b/TBF/Rig/TestMethods/Counter/TestMethod.cs index 64cd71e72..03d59fcfc 100644 --- a/TBF/Rig/TestMethods/Counter/TestMethod.cs +++ b/TBF/Rig/TestMethods/Counter/TestMethod.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.Counter public class TestMethod : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - 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 bool CanTest(MetersKind meters) { return true; } public bool DoTransitions() { return false; } diff --git a/TBF/Rig/TestMethods/Dummy/TestMethod.cs b/TBF/Rig/TestMethods/Dummy/TestMethod.cs index dc9aa7eab..d14fb7f7f 100644 --- a/TBF/Rig/TestMethods/Dummy/TestMethod.cs +++ b/TBF/Rig/TestMethods/Dummy/TestMethod.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.Dummy public class TestMethod : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - 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 bool CanTest(MetersKind meters) { return true; } public bool DoTransitions() { return true; } diff --git a/TBF/Rig/TestMethods/FixedStartAdvanced/Single/Component.cs b/TBF/Rig/TestMethods/FixedStartAdvanced/Single/Component.cs index efd120c56..b907d1679 100644 --- a/TBF/Rig/TestMethods/FixedStartAdvanced/Single/Component.cs +++ b/TBF/Rig/TestMethods/FixedStartAdvanced/Single/Component.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.FixedStartAdvanced.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})", ClassName, 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; } diff --git a/TBF/Rig/TestMethods/GrabImage/Component.cs b/TBF/Rig/TestMethods/GrabImage/Component.cs index 700a9919b..d4222d10a 100644 --- a/TBF/Rig/TestMethods/GrabImage/Component.cs +++ b/TBF/Rig/TestMethods/GrabImage/Component.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.GrabImage public class Component : ComponentBase, GenericDevices.ITestMethod { 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 bool CanTest(MetersKind meters) { return true; } public bool DoTransitions() { return false; } diff --git a/TBF/Rig/TestMethods/LeakTest/TestMethod.cs b/TBF/Rig/TestMethods/LeakTest/TestMethod.cs index cd5a8b7e0..68f668302 100644 --- a/TBF/Rig/TestMethods/LeakTest/TestMethod.cs +++ b/TBF/Rig/TestMethods/LeakTest/TestMethod.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.LeakTest public class TestMethod : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - 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 bool CanTest(MetersKind meters) { return true; } public bool DoTransitions() { return true; } diff --git a/TBF/Rig/TestMethods/LiveStream/Component.cs b/TBF/Rig/TestMethods/LiveStream/Component.cs index 91c443120..eef6ee16a 100644 --- a/TBF/Rig/TestMethods/LiveStream/Component.cs +++ b/TBF/Rig/TestMethods/LiveStream/Component.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.LiveStream public class Component : ComponentBase, GenericDevices.ITestMethod { 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 bool CanTest(MetersKind meters) { return true; } public bool DoTransitions() { return false; } diff --git a/TBF/Rig/TestMethods/ManualEntry/Component.cs b/TBF/Rig/TestMethods/ManualEntry/Component.cs index db8f47c48..62b427b9f 100644 --- a/TBF/Rig/TestMethods/ManualEntry/Component.cs +++ b/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("ManualEntry({0})", Cfg.ToString(-1)); } readonly ManualEntryCfg myCfg; diff --git a/TBF/Rig/TestMethods/PulsesTest/TestMethod.cs b/TBF/Rig/TestMethods/PulsesTest/TestMethod.cs index 08b5c5c89..2caa072ee 100644 --- a/TBF/Rig/TestMethods/PulsesTest/TestMethod.cs +++ b/TBF/Rig/TestMethods/PulsesTest/TestMethod.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.PulsesTest public class TestMethod : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - 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 bool CanTest(MetersKind meters) { return meters == MetersKind.Single; } public bool DoTransitions() { return true; } diff --git a/TBF/Rig/TestMethods/PulsesTestManual/TestMethod.cs b/TBF/Rig/TestMethods/PulsesTestManual/TestMethod.cs index 63052b1ea..6fe577217 100644 --- a/TBF/Rig/TestMethods/PulsesTestManual/TestMethod.cs +++ b/TBF/Rig/TestMethods/PulsesTestManual/TestMethod.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.PulsesTestManual public class TestMethod : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - 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 bool CanTest(MetersKind meters) { return meters == MetersKind.Single; } public bool DoTransitions() { return true; } diff --git a/TBF/Rig/TestMethods/Q2CorrectionFromHistory/Component.cs b/TBF/Rig/TestMethods/Q2CorrectionFromHistory/Component.cs index 86a3e6443..34f0968b7 100644 --- a/TBF/Rig/TestMethods/Q2CorrectionFromHistory/Component.cs +++ b/TBF/Rig/TestMethods/Q2CorrectionFromHistory/Component.cs @@ -11,7 +11,7 @@ namespace TBF.Rig.TestMethods.Q2CorrectionFromHistory public class Component : ComponentBase, GenericDevices.ISimultTestMethod { 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 bool CanTest(MetersKind meters) { return true; } public bool DoTransitions() { return false; } diff --git a/TBF/Rig/TestMethods/RoiDetection/RoiDetection.cs b/TBF/Rig/TestMethods/RoiDetection/RoiDetection.cs index c0e09dcf3..a01130a81 100644 --- a/TBF/Rig/TestMethods/RoiDetection/RoiDetection.cs +++ b/TBF/Rig/TestMethods/RoiDetection/RoiDetection.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.RoiDetection public class RoiDetection : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(RoiDetection)); - 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 bool CanTest(MetersKind meters) { return true; } public bool DoTransitions() { return true; } diff --git a/TBF/Rig/TestMethods/SensitivityTest/TestMethod.cs b/TBF/Rig/TestMethods/SensitivityTest/TestMethod.cs index 46845d024..15aac28da 100644 --- a/TBF/Rig/TestMethods/SensitivityTest/TestMethod.cs +++ b/TBF/Rig/TestMethods/SensitivityTest/TestMethod.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.TestMethods.SensitivityTest public class TestMethod : ComponentBase, GenericDevices.ITestMethod { private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); - 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 bool CanTest(MetersKind meters) { return meters == MetersKind.Single; } public bool DoTransitions() { return true; } diff --git a/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs b/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs index dd7f0bea0..9e341406d 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs @@ -15,7 +15,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication private static readonly ILog log = LogManager.GetLogger(typeof(TestMethod)); protected static readonly ILog rfidDataLogger = LogManager.GetLogger("RfidData"); - 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 bool CanTest(MetersKind meters) { return meters == MetersKind.Single; } public bool DoTransitions() { return false; } diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs index b72f1ec83..251a3afca 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs +++ b/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("iPerl({0})", Cfg.ToString(-1)); } public const int MaxOptoDataCount = 40000; diff --git a/TBF/Rig/Uni/RegValveAnalog/RegValve.cs b/TBF/Rig/Uni/RegValveAnalog/RegValve.cs index 089b2c2d7..c580a774d 100644 --- a/TBF/Rig/Uni/RegValveAnalog/RegValve.cs +++ b/TBF/Rig/Uni/RegValveAnalog/RegValve.cs @@ -13,7 +13,7 @@ namespace TBF.Rig.Uni.RegValveAnalog public class RegValve : ComponentBase, GenericDevices.IRegValve, IDrawingItCmpntWithSetpoint { 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("RegulValve({0})", Cfg.ToString(-1)); } readonly RegValveCfg regValveCfg; diff --git a/TBF/Rig/Various/ManualLevelMsrmnt/ManualLevelMsrmnt.cs b/TBF/Rig/Various/ManualLevelMsrmnt/ManualLevelMsrmnt.cs index aee4442cf..9783d199f 100644 --- a/TBF/Rig/Various/ManualLevelMsrmnt/ManualLevelMsrmnt.cs +++ b/TBF/Rig/Various/ManualLevelMsrmnt/ManualLevelMsrmnt.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.Various.ManualLevelMsrmnt public class ManualLevelMsrmnt : ComponentBase, ILevelMeter, IOperation { private static readonly ILog log = LogManager.GetLogger(typeof(ManualLevelMsrmnt)); - public override string ToString() { return string.Format("ManualLevelMsrmnt({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("ManualLevelMsrmnt({0})", Cfg.ToString(-1)); } readonly TestMethodCfg myCfg; diff --git a/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs b/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs index 9cefefb65..1897a3e12 100644 --- a/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs +++ b/TBF/Rig/Various/StatisticsMonitoring/ProcessStatistics.cs @@ -13,7 +13,7 @@ namespace TBF.Rig.Various.StatisticsMonitoring public class ProcessStatistics : ComponentBase, IOperation, GenericDevices.IStatisticsMonitoring { private static readonly ILog log = LogManager.GetLogger(typeof(ProcessStatistics)); - 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 StatisticsCfg statisticsCfg; diff --git a/TBF/Rig/Various/TankWithLevelMsrmnt/Tank.cs b/TBF/Rig/Various/TankWithLevelMsrmnt/Tank.cs index 4dd610d91..fbbf53672 100644 --- a/TBF/Rig/Various/TankWithLevelMsrmnt/Tank.cs +++ b/TBF/Rig/Various/TankWithLevelMsrmnt/Tank.cs @@ -20,7 +20,7 @@ namespace TBF.Rig.Various.TankWithLevelMsrmnt /// Warn: Start measurement when busy is true /// private static readonly ILog log = LogManager.GetLogger(typeof(Tank)); - public override string ToString() { return string.Format("TankWithLevelMsrmnt({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("TankWithLevelMsrmnt({0})", Cfg.ToString(-1)); } readonly TankCfg tankCfg; diff --git a/TBF/Rig/WaterMeters/WaterMeter/WaterMeter.cs b/TBF/Rig/WaterMeters/WaterMeter/WaterMeter.cs index ddc6e7552..56191e4ba 100644 --- a/TBF/Rig/WaterMeters/WaterMeter/WaterMeter.cs +++ b/TBF/Rig/WaterMeters/WaterMeter/WaterMeter.cs @@ -12,7 +12,7 @@ namespace TBF.Rig.WaterMeters.WaterMeter public class WaterMeter : ComponentBase, GenericDevices.IWaterMeter, SchematicDrawing.IDrawingItCmpnt { private static readonly ILog log = LogManager.GetLogger(typeof(WaterMeter)); - public override string ToString() { return string.Format("WaterMeter({0})", Cfg.ToString(1)); } + public override string ToString() { return string.Format("WaterMeter({0})", Cfg.ToString(-1)); } readonly WaterMeterCfg waterMeterCfg; public SchematicDrawing.IDrawingItem DrawingItem { get { return waterMeterCfg as SchematicDrawing.IDrawingItem; } }