|
|
@@ -26,7 +26,6 @@ using TeamAAS_VP;
|
|
|
using TeamAAS_VP.Enums;
|
|
|
using TeamAAS_VP.Interfaces;
|
|
|
using TeamAAS_VP.Models;
|
|
|
-using TeamAAS_VP.Resources.Languages;
|
|
|
|
|
|
namespace TeamAAS_VP.Core.Cameras
|
|
|
{
|
|
|
@@ -49,7 +48,7 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
public int Index { get; set; }
|
|
|
public string ManufacturerName { get; private set; }
|
|
|
|
|
|
- public bool IsFindByIp { get; private set; }
|
|
|
+ public bool IsFindByIp { get; private set; }
|
|
|
|
|
|
public string ModelName { get; private set; }
|
|
|
|
|
|
@@ -108,14 +107,14 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
public event Action<Guid, bool> CameraConnectChangedEvent;
|
|
|
#endregion
|
|
|
|
|
|
- public MvCamera(Guid id,int index, string name, string serialNumber,string cameraip,bool isFindByIp)
|
|
|
+ public MvCamera(Guid id, int index, string name, string serialNumber, string cameraip, bool isFindByIp)
|
|
|
{
|
|
|
ID = id;
|
|
|
Name = serialNumber;
|
|
|
Index = index;
|
|
|
- CameraIp=cameraip;
|
|
|
+ CameraIp = cameraip;
|
|
|
SerialNumber = serialNumber;
|
|
|
- IsFindByIp= isFindByIp;
|
|
|
+ IsFindByIp = isFindByIp;
|
|
|
mvCameraAcq = new MvCameraAcqTool.MvCameraAcqTool();
|
|
|
MyCamera.MV_CC_DEVICE_INFO_LIST stDeviceList = default(MyCamera.MV_CC_DEVICE_INFO_LIST);
|
|
|
mvCameraAcq.EnumDeivce(ref stDeviceList);
|
|
|
@@ -130,8 +129,8 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
uint nIp2 = ((stGigEDeviceInfo.nCurrentIp & 0x00ff0000) >> 16);
|
|
|
uint nIp3 = ((stGigEDeviceInfo.nCurrentIp & 0x0000ff00) >> 8);
|
|
|
uint nIp4 = (stGigEDeviceInfo.nCurrentIp & 0x000000ff);
|
|
|
- string ip= string.Format("{0}.{1}.{2}.{3}", nIp1, nIp2, nIp3, nIp4);
|
|
|
-
|
|
|
+ string ip = string.Format("{0}.{1}.{2}.{3}", nIp1, nIp2, nIp3, nIp4);
|
|
|
+
|
|
|
if (IsFindByIp)
|
|
|
{
|
|
|
if (CameraIp == ip)
|
|
|
@@ -190,7 +189,7 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
{
|
|
|
if (!CheckSoftwareInstalled().isInstalled)
|
|
|
{
|
|
|
- LogHelper.WriteLogInfo(Lang.未安装MVS);
|
|
|
+ LogHelper.WriteLogInfo("未安装MVS");
|
|
|
return cameras.ToArray();
|
|
|
}
|
|
|
List<CCameraInfo> m_ltDeviceList = new List<CCameraInfo>();
|
|
|
@@ -211,7 +210,7 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
string ip = string.Format("{0}.{1}.{2}.{3}", nIp1, nIp2, nIp3, nIp4);
|
|
|
cameras.Add(new CameraInfo()
|
|
|
{
|
|
|
- CameraNo= i + 1,
|
|
|
+ CameraNo = i + 1,
|
|
|
CameraName = gigeInfo.UserDefinedName,
|
|
|
CameraBrand = CameraBrand.HikRobot_MVS,
|
|
|
CameraType = CameraType.GIGE,
|
|
|
@@ -219,7 +218,7 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
Model = gigeInfo.chModelName,
|
|
|
SerialNumber = gigeInfo.chSerialNumber,
|
|
|
CameraIp = ip,
|
|
|
- IsFindByIp=true,
|
|
|
+ IsFindByIp = true,
|
|
|
});
|
|
|
}
|
|
|
else if (m_ltDeviceList[i].nTLayerType == CSystem.MV_USB_DEVICE)
|
|
|
@@ -256,7 +255,7 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
- LogHelper.WriteLogError(Lang.搜索海康相机列表时出错, ex);
|
|
|
+ LogHelper.WriteLogError("搜索海康相机列表时出错!", ex);
|
|
|
}
|
|
|
|
|
|
return cameras.ToArray();
|
|
|
@@ -286,7 +285,7 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
using (RegistryKey subKey = key.OpenSubKey(subKeyName))
|
|
|
{
|
|
|
string displayName = subKey.GetValue("DisplayName")?.ToString();
|
|
|
- if (displayName != null && displayName.ToUpper().Trim()==softwareName.ToUpper())
|
|
|
+ if (displayName != null && displayName.ToUpper().Trim() == softwareName.ToUpper())
|
|
|
{
|
|
|
string version = subKey.GetValue("DisplayVersion")?.ToString();
|
|
|
Version v1 = new Version(version);
|
|
|
@@ -379,7 +378,7 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
}
|
|
|
if (!IsHaveCamera)
|
|
|
{
|
|
|
- throw new Exception(Lang.没有发现相机);
|
|
|
+ throw new Exception("没有发现相机");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -429,10 +428,11 @@ namespace TeamAAS_VP.Core.Cameras
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
- /// 采集图像
|
|
|
+ /// 采集单张图片
|
|
|
/// </summary>
|
|
|
+ /// <param name="lastImageOnly">true:采集一张新图像,false:返回最后一张图像</param>
|
|
|
/// <returns></returns>
|
|
|
- public ICogImage Grab()
|
|
|
+ public ICogImage Grab(bool lastImageOnly = true)
|
|
|
{
|
|
|
_operationSemaphore.Wait();
|
|
|
try
|