Skip to content

孙克 / GeneralClassLibrary

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f13f9987 由 LN
选项

增加异常打印

1 个父辈 918db417
内嵌 并排
正在显示 6 个修改的文件 包含 56 行增加 和 25 行删除
CodeLibraryProject/CodeLibrary/BaslerCamera.cs
...@@ -58,7 +58,12 @@ namespace CodeLibrary ...@@ -58,7 +58,12 @@ namespace CodeLibrary
/// </summary> /// </summary>
public string[] CameraName public string[] CameraName
{ {
get { return cameraName.ToArray(); } get {
if (cameraName == null)
{
cameraName = new List<string>();
}
return cameraName.ToArray(); }
} }
/// <summary> /// <summary>
...@@ -100,10 +105,17 @@ namespace CodeLibrary ...@@ -100,10 +105,17 @@ namespace CodeLibrary
/// </summary> /// </summary>
public void Load() public void Load()
{ {
cameraAll = CameraFinder.Enumerate(); try
cameraName = new List<string>(); {
foreach (ICameraInfo info in cameraAll) cameraAll = CameraFinder.Enumerate();
cameraName.Add(info[CameraInfoKey.ModelName].ToString() + " (" + info[CameraInfoKey.SerialNumber].ToString() + ")"); cameraName = new List<string>();
foreach (ICameraInfo info in cameraAll)
cameraName.Add(info[CameraInfoKey.ModelName].ToString() + " (" + info[CameraInfoKey.SerialNumber].ToString() + ")");
}
catch (Exception ex)
{
HDLogUtil.error("Basler Load Error：" + ex.StackTrace);
}
} }
/// <summary> /// <summary>
......
CodeLibraryProject/CodeLibrary/HDCodeLearnHelper.cs
...@@ -61,7 +61,7 @@ namespace CodeLibrary ...@@ -61,7 +61,7 @@ namespace CodeLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
HDLogUtil.error("解析摄像机配置出错：" + ex.ToString()); HDLogUtil.error("解析摄像机配置出错：" + ex.StackTrace);
} }
} }
private static HTuple hv_AcqHandle = null; private static HTuple hv_AcqHandle = null;
......
CodeLibraryProject/CodeLibrary/HIKCamera.cs
...@@ -54,7 +54,13 @@ namespace CodeLibrary ...@@ -54,7 +54,13 @@ namespace CodeLibrary
/// </summary> /// </summary>
public string[] CameraName public string[] CameraName
{ {
get { return cameraName.ToArray(); } get
{
if (cameraName == null)
{
cameraName = new List<string>();
}
return cameraName.ToArray(); }
} }
/// <summary> /// <summary>
...@@ -96,27 +102,34 @@ namespace CodeLibrary ...@@ -96,27 +102,34 @@ namespace CodeLibrary
/// </summary> /// </summary>
public void Load() public void Load()
{ {
int rtn = MyCamera.MV_CC_EnumDevices_NET(MyCamera.MV_GIGE_DEVICE | MyCamera.MV_USB_DEVICE, ref cameraAll); try
if (rtn != MyCamera.MV_OK) return;
cameraName.Clear();
string s = "";
for (int i = 0; i < cameraAll.nDeviceNum; i++)
{ {
MyCamera.MV_CC_DEVICE_INFO device = (MyCamera.MV_CC_DEVICE_INFO)Marshal.PtrToStructure(cameraAll.pDeviceInfo[i], typeof(MyCamera.MV_CC_DEVICE_INFO)); int rtn = MyCamera.MV_CC_EnumDevices_NET(MyCamera.MV_GIGE_DEVICE | MyCamera.MV_USB_DEVICE, ref cameraAll);
if (device.nTLayerType == MyCamera.MV_GIGE_DEVICE) if (rtn != MyCamera.MV_OK) return;
{ cameraName.Clear();
IntPtr buffer = Marshal.UnsafeAddrOfPinnedArrayElement(device.SpecialInfo.stGigEInfo, 0); string s = "";
MyCamera.MV_GIGE_DEVICE_INFO gigeInfo = (MyCamera.MV_GIGE_DEVICE_INFO)Marshal.PtrToStructure(buffer, typeof(MyCamera.MV_GIGE_DEVICE_INFO));
s = "GigE:" + gigeInfo.chModelName + " (" + gigeInfo.chSerialNumber + ")"; for (int i = 0; i < cameraAll.nDeviceNum; i++)
}
else if (device.nTLayerType == MyCamera.MV_USB_DEVICE)
{ {
IntPtr buffer = Marshal.UnsafeAddrOfPinnedArrayElement(device.SpecialInfo.stUsb3VInfo, 0); MyCamera.MV_CC_DEVICE_INFO device = (MyCamera.MV_CC_DEVICE_INFO)Marshal.PtrToStructure(cameraAll.pDeviceInfo[i], typeof(MyCamera.MV_CC_DEVICE_INFO));
MyCamera.MV_USB3_DEVICE_INFO usbInfo = (MyCamera.MV_USB3_DEVICE_INFO)Marshal.PtrToStructure(buffer, typeof(MyCamera.MV_USB3_DEVICE_INFO)); if (device.nTLayerType == MyCamera.MV_GIGE_DEVICE)
s = "USB:" + usbInfo.chModelName + " (" + usbInfo.chSerialNumber + ")"; {
IntPtr buffer = Marshal.UnsafeAddrOfPinnedArrayElement(device.SpecialInfo.stGigEInfo, 0);
MyCamera.MV_GIGE_DEVICE_INFO gigeInfo = (MyCamera.MV_GIGE_DEVICE_INFO)Marshal.PtrToStructure(buffer, typeof(MyCamera.MV_GIGE_DEVICE_INFO));
s = "GigE:" + gigeInfo.chModelName + " (" + gigeInfo.chSerialNumber + ")";
}
else if (device.nTLayerType == MyCamera.MV_USB_DEVICE)
{
IntPtr buffer = Marshal.UnsafeAddrOfPinnedArrayElement(device.SpecialInfo.stUsb3VInfo, 0);
MyCamera.MV_USB3_DEVICE_INFO usbInfo = (MyCamera.MV_USB3_DEVICE_INFO)Marshal.PtrToStructure(buffer, typeof(MyCamera.MV_USB3_DEVICE_INFO));
s = "USB:" + usbInfo.chModelName + " (" + usbInfo.chSerialNumber + ")";
}
cameraName.Add(s);
} }
cameraName.Add(s); }
catch (Exception ex)
{
HDLogUtil.error("HIK Load Error：" + ex.StackTrace);
} }
} }
......
CodeLibraryProject/编译好的DLL/resources/resources.txt
...@@ -3,6 +3,7 @@ FrmCodeDecode_label4_Text,参数路径,Parameters of the path ...@@ -3,6 +3,7 @@ FrmCodeDecode_label4_Text,参数路径,Parameters of the path
FrmCodeDecode_chbUseParam_Text,使用参数,operation parameter FrmCodeDecode_chbUseParam_Text,使用参数,operation parameter
FrmCodeDecode_btnAn_Text,变暗,darken FrmCodeDecode_btnAn_Text,变暗,darken
FrmCodeDecode_btnLight_Text,提亮,brighten FrmCodeDecode_btnLight_Text,提亮,brighten
FrmCodeDecode_btnCopyN_Text,复制名称,Copy Name
FrmCodeDecode_label3_Text,条码类型：,Bar code type: FrmCodeDecode_label3_Text,条码类型：,Bar code type:
FrmCodeDecode_label2_Text,相机列表：,Camera list: FrmCodeDecode_label2_Text,相机列表：,Camera list:
FrmCodeDecode_btnExit_Text,退出,Exit FrmCodeDecode_btnExit_Text,退出,Exit
...@@ -31,3 +32,8 @@ FrmCodeLearn_label1_Text,相机：,camera: ...@@ -31,3 +32,8 @@ FrmCodeLearn_label1_Text,相机：,camera:
FrmCodeLearn_btnExit_Text,退出,Exit FrmCodeLearn_btnExit_Text,退出,Exit
FrmCodeLearn_btnStop_Text,结束学习,End of learning FrmCodeLearn_btnStop_Text,结束学习,End of learning
FrmCodeLearn_btnOpen_Text,开始学习,start to learn FrmCodeLearn_btnOpen_Text,开始学习,start to learn
selCamera,请先选择相机,Please select camera
selImage,请先选择图片,Please select picture
title,提示,Notice
imageIsNull,获取二维码图片为空,Get the two-dimensional code picture is empty
sureDelete,确定删除文件：,Make sure to delete the file:
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!