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

Changes for Xylem Nanjing, ver. 3.1.1676

Browse Source
This commit is contained in:
Milan Hanajik
2021-06-18 15:35:46 +02:00
parent f1ef16e1a3
commit 827a9f7c58
837 changed files with 46518 additions and 5851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/Network/Adapter/NetadapterCfgCtrl.cs
+1
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Net;
using System.Windows.Forms;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
TBF/Rig/Network/Camera/CLP1611/Camera.cs
+6 -5
View File
@@ -14,6 +14,7 @@ using System.Threading;
using System.Timers;
using log4net;
using Renci.SshNet;
using Common;
using Config.Entities;
using TBF.Rig.Network.Telnet;
using TBF.Resources;
@@ -385,11 +386,11 @@ namespace TBF.Rig.Network.Camera.CLP1611
}
string msg = string.Format("Camera {0} detected in {1} ms: HWAddress={2} IPAddress={3} {4}",
CameraCfg.Name,
duration_ms,
CameraCfg.HardwareAddress,
ipAddress == null ? "not detected" : ipAddress.ToString(),
response);
CameraCfg.Name,
duration_ms,
CameraCfg.HardwareAddress,
ipAddress == null ? "not detected" : ipAddress.ToString(),
response);
log.Debug(msg);
Console.WriteLine(msg);
TBF/Rig/Network/Camera/CLP1611/CameraCfg.cs
+1 -1
View File
@@ -53,7 +53,7 @@ namespace TBF.Rig.Network.Camera.CLP1611
HardwareAddress = 1;
TestImagesMode = TestImagesMode.None;
TestImagesCount = 3000;
DebugLevel = Config.Entities.DebugMode.AutoDetect;
DebugLevel = Common.DebugMode.AutoDetect;
}
public string ToString(int i)
TBF/Rig/Network/Camera/CLP1611/CameraCfgCtrl.cs
+1
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Windows.Forms;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.Resources;
TBF/Rig/Network/Camera/CLP1611/GrabImagesOp.cs
+5 -4
View File
@@ -4,6 +4,7 @@
using System;
using System.Diagnostics;
using log4net;
using Common;
using Config.Entities;
using TBF.Rig.Network.Telnet;
using System.IO;
@@ -78,7 +79,7 @@ namespace TBF.Rig.Network.Camera.CLP1611
///
File.Delete(imgFileNames[0]);
if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate || camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.DetectedOff)
if (camera.CameraCfg.DebugLevel == DebugMode.Simulate || camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
{
///
/// Camera is in simulation mode => create a simulated image
@@ -97,8 +98,8 @@ namespace TBF.Rig.Network.Camera.CLP1611
///
return Event.GrabPassed;
}
else if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.DetectedOff)
else if (camera.CameraCfg.DebugLevel == DebugMode.Simulate ||
camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
{
///
/// Camera is in simulation mode => create a simulated image and complete
@@ -211,7 +212,7 @@ namespace TBF.Rig.Network.Camera.CLP1611
public void Stop()
{
if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate) return;
if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return;
if (grabImageCommandSent)
{
TBF/Rig/Network/Camera/CLP1611/LiveStreamOp.cs
+2 -2
View File
@@ -34,7 +34,7 @@ namespace TBF.Rig.Network.Camera.CLP1611
public Event Run()
{
if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate) return Event.None;
if (camera.CameraCfg.DebugLevel == Common.DebugMode.Simulate) return Event.None;
log.DebugFormat("Run(): telnet.State = {0}, liveStreamCommandSent = {1}", telnet.State, liveStreamCommandSent);
@@ -53,7 +53,7 @@ namespace TBF.Rig.Network.Camera.CLP1611
public void Stop()
{
if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate) return;
if (camera.CameraCfg.DebugLevel == Common.DebugMode.Simulate) return;
log.DebugFormat("Stop(): telnet.State = {0}, liveStreamCommandSent = {1}", telnet.State, liveStreamCommandSent);
TBF/Rig/Network/Camera/Display/DisplayCfgCtrl.cs
+1
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Windows.Forms;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.UI.Bench.Components;
TBF/Rig/Network/Camera/Roi/ProcedureParams.cs
+1
View File
@@ -5,6 +5,7 @@ using System;
using System.IO;
using System.Text;
using System.Xml.Serialization;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.Resources;
TBF/Rig/Network/Camera/Roi/Roi.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.Text;
using log4net;
using Common;
using Config.Entities;
namespace TBF.Rig.Network.Camera.Roi
@@ -36,7 +37,7 @@ namespace TBF.Rig.Network.Camera.Roi
return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
}
}
public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Camera; } }
public RegisterReaderType RegisterReaderType { get { return RegisterReaderType.Camera; } }
public double PulsesPerLtr { get { return RoiCfg.ProcParams.PulsesPerLtr; } }
public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }
TBF/Rig/Network/Camera/Roi/RoiCfg.cs
+1 -1
View File
@@ -3,7 +3,7 @@
///
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using Common;
using TBF.Rig.Generic;
namespace TBF.Rig.Network.Camera.Roi
TBF/Rig/Network/Camera/Roi/RoiCfgCtrl.cs
+1
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Windows.Forms;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.UI.Bench.Components;
TBF/Rig/Network/Camera/RoiForFixedStart/ProcedureParams.cs
+1
View File
@@ -3,6 +3,7 @@
///
using System.IO;
using System.Xml.Serialization;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.Resources;
TBF/Rig/Network/Camera/RoiForFixedStart/Roi.cs
+3 -2
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using log4net;
using Common;
using Config.Entities;
namespace TBF.Rig.Network.Camera.RoiForFixedStart
@@ -33,7 +34,7 @@ namespace TBF.Rig.Network.Camera.RoiForFixedStart
return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
}
}
public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Manual; } }
public RegisterReaderType RegisterReaderType { get { return RegisterReaderType.Manual; } }
public double PulsesPerLtr { get { return roiCfg.ProcParams.PulsesPerLtr; } }
public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }
@@ -118,7 +119,7 @@ namespace TBF.Rig.Network.Camera.RoiForFixedStart
}
public IOperation GrabImageOp(string imageFileName,
bool blackAndWhite, bool lowResolution, Config.Entities.ImageRotation imageRotation)
bool blackAndWhite, bool lowResolution, ImageRotation imageRotation)
{
if (NetCamera != null)
{
TBF/Rig/Network/Camera/RoiForFixedStart/RoiCfg.cs
+1
View File
@@ -3,6 +3,7 @@
///
using System.Collections.Generic;
using System.Xml.Serialization;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
TBF/Rig/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs
+1
View File
@@ -4,6 +4,7 @@
using System;
using System.Windows.Forms;
using log4net;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.Resources;
TBF/Rig/Network/Comet/Ambient/AmbientCfgCtrl.cs
+1
View File
@@ -4,6 +4,7 @@
using System;
using System.Net;
using System.Windows.Forms;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.Resources;