diff --git a/TBF/BenchControl/TbfComponents.cs b/TBF/BenchControl/TbfComponents.cs index 4d94537e0..0f7adf7f2 100644 --- a/TBF/BenchControl/TbfComponents.cs +++ b/TBF/BenchControl/TbfComponents.cs @@ -77,7 +77,7 @@ namespace TBF.BenchControl Factories.Add(new TestMethods.PMaxTest.TestMethodFactory()); Factories.Add(new TestMethods.PulsesTest.Factory()); Factories.Add(new TestMethods.PulsesTestManual.Factory()); - Factories.Add(new TestMethods.SensitivityTest.TestMethodFactory()); + Factories.Add(new TestMethods.SensitivityTest.Factory()); Factories.Add(new TestMethods.iPerlCommunication.TestMethodFactory()); /// iPerlCommunication Factories.Add(new TestMethods.RoiDetection.RoiDetectionFactory()); Factories.Add(new DataEntry.WMStates.EntryFormFactory()); diff --git a/TBF/BenchControl/TestMethods/PulsesTest/Factory.cs b/TBF/BenchControl/TestMethods/PulsesTest/Factory.cs index 8ea50aa83..7c55f292f 100644 --- a/TBF/BenchControl/TestMethods/PulsesTest/Factory.cs +++ b/TBF/BenchControl/TestMethods/PulsesTest/Factory.cs @@ -16,10 +16,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest public IComponent GetComponent(IComponentCfg cfg, IList components) { return new TestMethod(cfg); } - public IComponentCfg DefaultConfig() - { - return new TestMethodCfg(this.GetType().Namespace.Substring(29), this); - } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this.GetType().Namespace.Substring(29), this); } public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component) { diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodFactory.cs b/TBF/BenchControl/TestMethods/SensitivityTest/Factory.cs similarity index 84% rename from TBF/BenchControl/TestMethods/SensitivityTest/TestMethodFactory.cs rename to TBF/BenchControl/TestMethods/SensitivityTest/Factory.cs index 4b04026e9..66119b14c 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodFactory.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/Factory.cs @@ -1,14 +1,14 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2018 Sensus Slovensko a.s. /// using System.Collections.Generic; using TBF.BenchControl.Generic; namespace TBF.BenchControl.TestMethods.SensitivityTest { - public class TestMethodFactory : IComponentFactory + public class Factory : IComponentFactory { - public string ClassName { get { return this.GetType().Namespace.Substring(17) + ".Single"; } } + public string ClassName { get { return this.GetType().Namespace.Substring(17); } } public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs index cb36286a3..de69f6f21 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2018 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -23,83 +23,33 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest /// /// The test. /// The repetition nr. + /// true when this is the last repetition /// The test parameters. /// The debug level. /// - public IList Execute(Config.Entities.Test test, int repetitionNr, - SensitivityTestParams testParams, + public IList Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition, + TestParams testParams, Config.Entities.DebugMode debugLevel) { - IList e = new List(); /// Events from currently running operations - checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state + if (debugLevel == Config.Entities.DebugMode.Simulate) + { + /// TODO: Test method simulation + IList retListSim = new List(1); + retListSim.Add(Event.Done); + return retListSim; + } + + IList e = new List(); /// Events from currently running operations + + checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state float switchTimeStart = 0.001f; /// in seconds, original vale is 1 ms float switchTimeEnd = 0.001f; /// in seconds, original vale is 1 ms - if (test.Part < 1 || test.Part > Config.Data.CompoundWMsCount) - { - UiBridge.Bridge.OnError(this, string.Format("Test 'Part' should be 1 .. {0}", Config.Data.CompoundWMsCount)); - IList retval = new List(1); - retval.Add(Event.ConfigurationError); - return retval; - } - - if (debugLevel == Config.Entities.DebugMode.Simulate) - { - /// - /// Test method simulation - /// - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting)); - - if (test.Name.ToLower().Contains("rise") || test.Name.ToLower().Contains("steig")) - { - MakeSimulatedCompound(test, 1, 0, 0.7f, 0.0f); - } - else - { - MakeSimulatedCompound(test, 1, 0, 0.7f, 0.9f); - } - - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); - allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file - - for (int i = 0; i < Config.Data.WMsCount; i++) - { - TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = ((sensPath.RegisterReaders != null) && (i < sensPath.RegisterReaders.Length)) - ? (sensPath.RegisterReaders[i] as TestMethods.iPerlCommunication.iPerlHead.IperlHead) - : null; - if (iPerl != null) - { - /// TODO: Reimplement - //iPerl.LastTestResult = meterRslt; /// Save this water meter test result to iPerl WM - iPerl.NominalTestFlowLph = 500.0 * (double)(test.Qfrom + test.Qto); /// Ave. + convert to liter/hour - } - } - - //------------------------------------------------ - Bridge.OnActivity(this, string.Format("Simulating {0}", test.Name)); - //------------------------------------------------ - - State.Create(string.Format("{0}({1}) : Simulating", test.Method, test.Name)) - .AddOperation(checkUiOp) - .EnterState(); - e = StateMachine.WaitRunDevsRunOps(); - - Event retVal = Event.Done; - if (TestAndLogUiCmdStop(test, e)) retVal = Event.UiCmdStop; - - /// Create a list with one item 'retVal' (default is Event.Done) and return it - IList retListSim = new List(1); - retListSim.Add(retVal); - return retListSim; - } - - Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; /// Specific for combined meters - int[] lastWMPulses = new int[2 * Config.Data.CompoundWMsCount]; + int[] lastWMPulses = new int[Config.Data.WMsCount]; //-------------------------------- State.Create(string.Format("{0}({1}) : stopTest diverter gate etc", test.Method, test.Name)) @@ -136,42 +86,6 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest Qrise = 0; - if (!test.DoDraining) /// Do not skip emptying if test.Emptying==true - { - //-------------------------------- - State.Create(string.Format("{0}({1}) : Mesuring mass of water in the tank", test.Method, test.Name)) - .AddOperation(checkUiOp) - .AddOperation(outPath.Scale.ReadMassOp(ref Mass)) - .EnterState(); - do - { - e = StateMachine.WaitRunDevsRunOps(); - if (e.Contains(Event.Error)) goto error; - if (TestAndLogUiCmdStop(test,e)) goto stopTest; - } - while (!e.Contains(Event.BalanceDone)); - - double estimatedEndMass = Mass.Val + test.Volume; - if (estimatedEndMass < outPath.Scale.Capacity * Constants.TankFullFactor) - { - goto switching_flow_detection; /// Enough room in the tank -> skip emptying - } - } - - // Empty the water tank - switch (DrainTheTank(outPath.Scale.DrainValve, outPath.Scale)) - { - case Event.Error: goto error; - case Event.UiCmdStop: goto stopTest; - } - - switching_flow_detection: - - int flowDetectTime0 = StateMachine.Time; - int flowDetectTime = 0; - float estFlowSetTime = 100.0f; - - /// /// Prepare cameras, ROI-s and measurementOperations /// @@ -214,6 +128,10 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest + int flowDetectTime0 = StateMachine.Time; + int flowDetectTime = 0; + float estFlowSetTime = 100.0f; + //------------------------------------------------ Bridge.OnActivity(this, Strings.Switching_flow_detection); //------------------------------------------------ @@ -249,7 +167,8 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest Bridge.OnError(this, Strings.Flow_adjustment_failed); goto error; } - } + if (e.Contains(Event.Next)) goto init_flow_set; + } while (!e.Contains(Event.FlowReached)); //-------------------------------- @@ -259,9 +178,12 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest case Event.UiCmdStop: goto stopTest; } - //==================================== - // Find the switching flow - //==================================== + + init_flow_set: + + //==================================== + // Find the switching flow + //==================================== int flowSetTime0 = StateMachine.Time; @@ -304,7 +226,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest while (!e.Contains(Event.PositionReached)); // Last pulses are kept to calculate differences - for (int i = 0; i < 2 * Config.Data.CompoundWMsCount; i++) lastWMPulses[i] = RegisterReaders[i].WMPulses; + for (int i = 0; i < Config.Data.WMsCount; i++) lastWMPulses[i] = RegisterReaders[i].WMPulses; // Shift data in the detection buffers for (int i = DetectionBufferSize - 2; i >= 0; i--) @@ -424,9 +346,9 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest //-------------------------------- State.Create(string.Format("{0}({1}) : Stopping diverter, gate, etc.", test.Method, test.Name)) - .AddOperation(checkUiOp) - .AddOperation(cBrd.StopPreviousOp()) - .EnterState(); + .AddOperation(checkUiOp) + .AddOperation(cBrd.StopPreviousOp()) + .EnterState(); do { e = StateMachine.WaitRunDevsRunOps(); @@ -535,17 +457,21 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest /// Quit this sequence /// ///----------------------/// - /// Stop the pump - State.Create(string.Format("{0}({1}) : Test(s) completed -> Stopping the pump", test.Method, test.Name)) - .AddOperation(checkUiOp) - .AddOperation(cBrd.SetValvesOp(null, inPath.Pump)) - .AddOperation((inPath != null && inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOffOp() : null) - .EnterState(); - do { - e = StateMachine.WaitRunDevsRunOps(); - if (e.Contains(Event.Error)) goto error; + if (isLastRepetition) + { + /// Stop the pump + State.Create(string.Format("{0}({1}) : Test(s) completed -> Stopping the pump", test.Method, test.Name)) + .AddOperation(checkUiOp) + .AddOperation(cBrd.SetValvesOp(null, inPath.Pump)) + .AddOperation((inPath != null && inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOffOp() : null) + .EnterState(); + do + { + e = StateMachine.WaitRunDevsRunOps(); + if (e.Contains(Event.Error)) goto error; + } + while (!e.Contains(Event.ValvesSet) || ((inPath.Pump is GenericDevices.IPumpFM) && !e.Contains(Event.TurnPumpOnOffDone))); } - while (!e.Contains(Event.ValvesSet) || ((inPath.Pump is GenericDevices.IPumpFM) && !e.Contains(Event.TurnPumpOnOffDone))); /// Create the return value - a list with one event Event.Done - and return IList retval1 = new List(1); diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs index a49e202d7..3513edd4c 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2018 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest public IList Execute(Test test, int repetNr, bool isLastRepetition) { - return (new SensitivityTestSeq()).Execute(test, repetNr, testMethodCfg.TestParams, DebugLevel); + return (new SensitivityTestSeq()).Execute(test, repetNr, isLastRepetition, testMethodCfg.TestParams, DebugLevel); } } } diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs index 4f7da7079..aa4895618 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2018 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -7,6 +7,7 @@ using System.IO; using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.BenchControl.Configs.NameOnly; namespace TBF.BenchControl.TestMethods.SensitivityTest { @@ -19,9 +20,9 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest /// Test parameters [XmlIgnore] - public SensitivityTestParams TestParams; + public TestParams TestParams; public override IParamsProvider GetRuntimeTestParamsProvider() { return TestParams; } - public override IParamsProvider CreateTestParamsProvider() { return new SensitivityTestParams(true); } + public override IParamsProvider CreateTestParamsProvider() { return new TestParams(true); } public override IParamsProvider GetUITestParamsProvider(Test test) { return (test.Method == Name) ? base.GetUITestParamsProvider(test) : null; @@ -30,7 +31,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() { - TestParams = new SensitivityTestParams(true); + TestParams = new TestParams(true); } public TestMethodCfg(string name, IComponentFactory factory) diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs deleted file mode 100644 index 6b05a49c0..000000000 --- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs +++ /dev/null @@ -1,69 +0,0 @@ -/// -/// Copyright (c) 2017 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using Config.Entities; -using TBF.BenchControl.Generic; - -namespace TBF.BenchControl.TestMethods.SensitivityTest -{ - public partial class TestMethodCfgCtrl : UserControl, IComponentCfgCtrl - { - public bool ShowMore { get { return false; } } - - TestMethodCfg config; - public IComponentCfg Config - { - get { return config as IComponentCfg; } - set - { - config = value as TestMethodCfg; - Redraw(); - } - } - - public TestMethodCfgCtrl() - { - InitializeComponent(); - } - - private void EntryFormCfgCtrl_Load(object sender, EventArgs e) - { - Redraw(); - } - - public void Closing() - { - } - - void Redraw() - { - if (config == null) return; /// Control was not loaded, settings were not changed - classNameLabel.Text = config.Factory.ClassName; - nameTextBox.Text = config.Name; - } - - public void Unlock() - { - nameTextBox.Enabled = true; - } - - public CfgUpdateFlags VerifyCfg(ref string message) - { - CfgUpdateFlags flags = CfgUpdateFlags.None; - return flags; - } - - public CfgUpdateFlags UpdateCfg() - { - CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd; - - if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed - - config.Name = nameTextBox.Text; - - return flags; - } - } -} diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.designer.cs deleted file mode 100644 index 6aa2c766e..000000000 --- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.designer.cs +++ /dev/null @@ -1,86 +0,0 @@ -/// -/// Copyright (c) 2017 Sensus Metering Systems -/// -namespace TBF.BenchControl.TestMethods.SensitivityTest -{ - partial class TestMethodCfgCtrl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.nameTextBox = new System.Windows.Forms.TextBox(); - this.nameLabel = new System.Windows.Forms.Label(); - this.classNameLabel = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(137, 57); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(130, 20); - this.nameTextBox.TabIndex = 5; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(27, 60); - this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); - this.nameLabel.TabIndex = 4; - this.nameLabel.Text = "Name"; - // - // classNameLabel - // - this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(134, 33); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(83, 13); - this.classNameLabel.TabIndex = 3; - this.classNameLabel.Text = "ComonentName"; - // - // BasicPrinterCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Name = "BasicPrinterCfgCtrl"; - this.Size = new System.Drawing.Size(300, 200); - this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox nameTextBox; - private System.Windows.Forms.Label nameLabel; - private System.Windows.Forms.Label classNameLabel; - } -} diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestParams.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestParams.cs similarity index 85% rename from TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestParams.cs rename to TBF/BenchControl/TestMethods/SensitivityTest/TestParams.cs index c31fb3676..e2eb912b4 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestParams.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/TestParams.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2018 Sensus Slovensko a.s. /// using System; using System.IO; @@ -11,9 +11,9 @@ using TBF.Resources; namespace TBF.BenchControl.TestMethods.SensitivityTest { - public class SensitivityTestParams : TestParamsBase, IParamsProvider, ITestParams + public class TestParams : TestParamsBase, IParamsProvider, ITestParams { - public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(SensitivityTestParams) })[0]; + public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestParams) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } public float TargetQ; /// Target=terminal flow durning detection when increasing or decreasing the flow @@ -88,7 +88,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest return false; } - void CopyContentTo(SensitivityTestParams prms) + void CopyContentTo(TestParams prms) { prms.TargetQ = this.TargetQ; prms.RateOfChange = this.RateOfChange; @@ -98,7 +98,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest public IParamsProvider Clone() { - SensitivityTestParams pars = new SensitivityTestParams(); + TestParams pars = new TestParams(); CopyContentTo(pars); return pars; } @@ -108,7 +108,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest if (dbEntity == null) return; try { - SensitivityTestParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as SensitivityTestParams; + TestParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as TestParams; testParamsEntity = dbEntity; componentName = dbEntity.CmpntName; @@ -124,16 +124,16 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest /// /// Parameterless constructor initializes the parameters /// - public SensitivityTestParams() + public TestParams() { } - public SensitivityTestParams(bool initialize) + public TestParams(bool initialize) { if (initialize) InitializeAll(); } - public SensitivityTestParams(ComponentTest testParamsEntity, string componentName, Test test) + public TestParams(ComponentTest testParamsEntity, string componentName, Test test) { this.testParamsEntity = testParamsEntity; this.componentName = componentName; diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 11f0af4cd..54baf75a4 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1019.0")] -[assembly: AssemblyFileVersion("2.18.1019.0")] +[assembly: AssemblyVersion("2.18.1020.0")] +[assembly: AssemblyFileVersion("2.18.1020.0")] diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index fd3b95dc5..2019e49b8 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -1226,16 +1226,10 @@ WMPulsesForm24.cs - + - - UserControl - - - TestMethodCfgCtrl.cs - - + @@ -2573,9 +2567,6 @@ TestMethodCfgCtrl.cs - - TestMethodCfgCtrl.cs - ErrorsCfgCtrl.cs