From 4e31493cc89c45976ccc1b5dfada4f4968661408 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 27 Oct 2017 15:05:01 +0200 Subject: [PATCH] Camera : TestImagesCount up to 3000, load/save images parameters are volatile (not saved to DB), ver. 2.17.721 --- TestBenchFramework/BenchControl/Events.cs | 3 ++- .../BenchControl/Network/Camera/CLP1611/Camera.cs | 2 +- .../BenchControl/Network/Camera/CLP1611/CameraCfg.cs | 7 ++++++- .../BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs | 4 ++-- TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs | 2 +- .../BenchControl/Network/Camera/Roi/RoiCfg.cs | 4 ++++ .../BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs | 4 ++-- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/TestBenchFramework/BenchControl/Events.cs b/TestBenchFramework/BenchControl/Events.cs index 00fe1ec64..26700e6c7 100644 --- a/TestBenchFramework/BenchControl/Events.cs +++ b/TestBenchFramework/BenchControl/Events.cs @@ -27,7 +27,8 @@ namespace TBF.BenchControl Warning = 0x02, /// Some settings in the user control are suspicious, can be set after user confirmation RestartRqrd = 0x04, /// TBF program restart is required to apply all changed parameters AnyChange = 0x08, /// At least one parameter have changed - InvokeCfgChange = 0x10, /// Invoke CfgChange handler of the component + VolatileChange = 0x10, + InvokeCfgChange = 0x20, /// Invoke CfgChange handler of the component } public enum CfgChangeCmd diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs index 597f9f417..25bb815be 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs @@ -172,7 +172,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 if (cameraDetected) { - StartChangeHandler(); + //StartChangeHandler(); /// already done in StateMachine.InitializeBoardEtc(...) UiBridge.Bridge.OnCameraInfo(this.cameraIdx, string.Format("{0} ver.{1} {2} s/n {3}", Name, sdCardVer, ipAddress, CameraCfg.HardwareAddress)); diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfg.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfg.cs index 87c7c1110..d40fdf589 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfg.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfg.cs @@ -30,9 +30,14 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 /// public int HardwareAddress; public bool DisplayTerminal; + + [XmlIgnore] public TestImagesMode TestImagesMode; + + [XmlIgnore] public int TestImagesCount; + /// Private parameterless constructor invoked by all other (public) constructors CameraCfg() { } @@ -44,7 +49,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 ParentName = "Network.Adapter"; HardwareAddress = 1; TestImagesMode = TestImagesMode.None; - TestImagesCount = 200; + TestImagesCount = 3000; DebugLevel = Config.Entities.DebugMode.AutoDetect; } diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs index 855809a1e..273928557 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs @@ -115,7 +115,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 message += Environment.NewLine + string.Format("Invalid {0}", testImagesModeLabel.Text); } - if (!int.TryParse(testImagesCountTextBox.Text, out dummy) || dummy < 1 || dummy > 200) + if (!int.TryParse(testImagesCountTextBox.Text, out dummy) || dummy < 1 || dummy > 3000) { flags |= CfgUpdateFlags.Error; message += Environment.NewLine + string.Format("Invalid {0}", testImagesCountLabel.Text); @@ -161,7 +161,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 config.TestImagesMode = newTestImagesMode; config.TestImagesCount = newTestImagesCount; - flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.VolatileChange); } if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0) diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs index 78309cc43..243e4bdec 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs @@ -129,7 +129,7 @@ namespace TBF.BenchControl.Network.Camera.Roi Clear(); - StartChangeHandler(); + //StartChangeHandler(); /// already done in StateMachine.InitializeBoardEtc(...) log.Debug(this.ToString()); } diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs index e67af02a1..d642e90a7 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs @@ -18,7 +18,11 @@ namespace TBF.BenchControl.Network.Camera.Roi /// Serialized parameters /// public string PreviousRoi; + + [XmlIgnore] public bool LoadImages; + + [XmlIgnore] public bool SaveImages; /// Procedure parameters diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs index 1210d7265..5de039d41 100644 --- a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs @@ -131,8 +131,8 @@ namespace TBF.BenchControl.Network.Camera.Roi { config.LoadImages = loadImagesCheckBox.Checked; config.SaveImages = saveImagesCheckBox.Checked; - - flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + + flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.VolatileChange); } if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0) diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 759e7ed24..171ad7bec 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.17.720.1")] -[assembly: AssemblyFileVersion("2.17.720.1")] +[assembly: AssemblyVersion("2.17.721.1")] +[assembly: AssemblyFileVersion("2.17.721.1")]