Skip to content

李娜 / SO664-HCSingleStore

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

视觉识别修改，识别时增加参数planName

1 个父辈 8fce0372
内嵌 并排
正在显示 15 个修改的文件 包含 487 行增加 和 351 行删除
dll/camera/Asa.Camera.VisionLib.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<name>Asa.Camera.VisionLib</name> <name>Asa.Camera.VisionLib</name>
</assembly> </assembly>
<members> <members>
<member name="M:Asa.Barcode.EyemAPI.eyemImageRead(System.String,System.Int32,Asa.Barcode.EyemAPI.EyemImage@)"> <member name="M:CameraVisionLib.Model.BarcodeAPI.eyemImageRead(System.String,System.Int32,CameraVisionLib.Model.BarcodeAPI.EyemImage@)">
<summary> <summary>
读取图像 读取图像
</summary> </summary>
...@@ -13,379 +13,451 @@ ...@@ -13,379 +13,451 @@
<param name="ucpImage"></param> <param name="ucpImage"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Barcode.EyemAPI.eyemImageFree(System.IntPtr)"> <member name="M:CameraVisionLib.Model.BarcodeAPI.eyemImageFree(System.IntPtr)">
<summary> <summary>
释放图像资源 释放图像资源
</summary> </summary>
<param name="ipImage"></param> <param name="ipImage"></param>
</member> </member>
<member name="M:Asa.Barcode.EyemAPI.eyemDetectAndDecodeFree(System.IntPtr)"> <member name="M:CameraVisionLib.Model.BarcodeAPI.eyemDetectAndDecodeFree(System.IntPtr)">
<summary> <summary>
释放工具 释放工具
</summary> </summary>
<param name="hObject"></param> <param name="hObject"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemImage.ucpImage"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemImage.ucpImage">
<summary> <summary>
地址 地址
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemImage.iWidth"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemImage.iWidth">
<summary> <summary>
图像内存 x 方向大小 图像内存 x 方向大小
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemImage.iHeight"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemImage.iHeight">
<summary> <summary>
图像内存 y 方向大小 图像内存 y 方向大小
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemImage.iChannel"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemImage.iChannel">
<summary> <summary>
图像通道数 图像通道数
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemRect.iXs"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemRect.iXs">
<summary> <summary>
起始点（左上角） x 坐标 起始点（左上角） x 坐标
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemRect.iYs"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemRect.iYs">
<summary> <summary>
起始点（左上角） y 坐标 起始点（左上角） y 坐标
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemRect.iWidth"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemRect.iWidth">
<summary> <summary>
x 方向大小（宽度） x 方向大小（宽度）
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemRect.iHeight"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemRect.iHeight">
<summary> <summary>
y 方向大小（高度） y 方向大小（高度）
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemBarCode.dAngle"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemBarCode.dAngle">
<summary> <summary>
角度 角度
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemBarCode.iCenterX"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemBarCode.iCenterX">
<summary> <summary>
x坐标 x坐标
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemBarCode.iCenterY"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemBarCode.iCenterY">
<summary> <summary>
y坐标 y坐标
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemBarCode.hType"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemBarCode.hType">
<summary> <summary>
码类型 码类型
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.EyemAPI.EyemBarCode.hText"> <member name="F:CameraVisionLib.Model.BarcodeAPI.EyemBarCode.hText">
<summary> <summary>
码内容 码内容
</summary> </summary>
</member> </member>
<member name="T:Asa.Barcode.Identify"> <member name="T:CameraVisionLib.Model.BarcodeInfo">
<summary>
条码识别，1DBarcode、2DBarcode
</summary>
</member>
<member name="M:Asa.Barcode.Identify.#ctor(System.String,System.String)">
<summary>
条码识别，1DBarcode、2DBarcode
</summary>
<param name="configPath"></param>
<param name="logName"></param>
</member>
<member name="M:Asa.Barcode.Identify.GetCode(System.Drawing.Bitmap)">
<summary>
获取条码
</summary>
<param name="image"></param>
<returns></returns>
</member>
<member name="T:Asa.Barcode.CodeInfo">
<summary> <summary>
条码信息，1DBarcode、2DBarcode 条码信息，1DBarcode、2DBarcode
</summary> </summary>
</member> </member>
<member name="P:Asa.Barcode.CodeInfo.Text"> <member name="P:CameraVisionLib.Model.BarcodeInfo.Text">
<summary> <summary>
文本 文本
</summary> </summary>
</member> </member>
<member name="P:Asa.Barcode.CodeInfo.CodeType"> <member name="P:CameraVisionLib.Model.BarcodeInfo.CodeType">
<summary> <summary>
条码类型 条码类型
</summary> </summary>
</member> </member>
<member name="P:Asa.Barcode.CodeInfo.Center"> <member name="P:CameraVisionLib.Model.BarcodeInfo.Center">
<summary> <summary>
中心点 中心点
</summary> </summary>
</member> </member>
<member name="P:Asa.Barcode.CodeInfo.Angle"> <member name="P:CameraVisionLib.Model.BarcodeInfo.Angle">
<summary> <summary>
角度，3点钟方向0°，逆时针为正，顺时针为负。 角度，3点钟方向0°，逆时针为正，顺时针为负。
</summary> </summary>
</member> </member>
<member name="P:Asa.Barcode.CodeInfo.Size"> <member name="P:CameraVisionLib.Model.BarcodeInfo.Size">
<summary> <summary>
条码尺寸大小 条码尺寸大小
</summary> </summary>
</member> </member>
<member name="P:Asa.Barcode.CodeInfo.Distance"> <member name="P:CameraVisionLib.Model.BarcodeInfo.Distance">
<summary> <summary>
原点垂直于经过中心点的直线的距离 原点垂直于经过中心点的直线的距离
</summary> </summary>
</member> </member>
<member name="M:Asa.Barcode.CodeInfo.Clone"> <member name="M:CameraVisionLib.Model.BarcodeInfo.Clone">
<summary> <summary>
副本，深拷贝 副本，深拷贝
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:Asa.Barcode.CodeOrder"> <member name="T:CameraVisionLib.Model.ScanCodeOrder">
<summary> <summary>
扫描条码的顺序 扫描条码的顺序
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.CodeOrder.HalconOnly"> <member name="F:CameraVisionLib.Model.ScanCodeOrder.HalconOnly">
<summary> <summary>
仅使用Halcon 仅使用Halcon
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.CodeOrder.EyemLibOnly"> <member name="F:CameraVisionLib.Model.ScanCodeOrder.EyemLibOnly">
<summary> <summary>
仅使用EyemLib 仅使用EyemLib
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.CodeOrder.HalconEyemLib"> <member name="F:CameraVisionLib.Model.ScanCodeOrder.HalconEyemLib">
<summary> <summary>
优先Halcon，扫码失败时使用EyemLib 优先Halcon，扫码失败时使用EyemLib
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.CodeOrder.EyemLibHalcon"> <member name="F:CameraVisionLib.Model.ScanCodeOrder.EyemLibHalcon">
<summary> <summary>
优先EyemLib，扫码失败时使用Halcon 优先EyemLib，扫码失败时使用Halcon
</summary> </summary>
</member> </member>
<member name="T:Asa.Barcode.CodeType"> <member name="T:CameraVisionLib.Model.CodeType">
<summary> <summary>
条码类型 条码类型
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.CodeType.All"> <member name="F:CameraVisionLib.Model.CodeType.All">
<summary> <summary>
一维和二维条码 一维和二维条码
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.CodeType.Barcode1D"> <member name="F:CameraVisionLib.Model.CodeType.Barcode1D">
<summary> <summary>
一维条码 一维条码
</summary> </summary>
</member> </member>
<member name="F:Asa.Barcode.CodeType.Barcode2D"> <member name="F:CameraVisionLib.Model.CodeType.Barcode2D">
<summary> <summary>
二维条码，QRCode，DataMatrix，PDF417 二维条码，QRCode，DataMatrix，PDF417
</summary> </summary>
</member> </member>
<member name="T:Asa.Basler.VisionCamera"> <member name="T:CameraVisionLib.Model.IPCameraAPI">
<summary> <summary>
机器视觉面阵相机 CHCNetSDK 的摘要说明。
</summary> </summary>
</member> </member>
<member name="F:Asa.Basler.VisionCamera.cameraCurr"> <member name="F:CameraVisionLib.Model.IPCameraAPI.NET_DVR_IPADDR.sIpV4">
char[16]
</member>
<member name="F:CameraVisionLib.Model.IPCameraAPI.NET_DVR_IPADDR.byRes">
BYTE[128]
</member>
<member name="F:CameraVisionLib.Model.IPCameraAPI.NET_DVR_ATM_FRAMEFORMAT_V30.byRes1">
输入方式:0-网络监听、1网络协议、2-串口监听、3-串口协议
</member>
<member name="F:CameraVisionLib.Model.IPCameraAPI.NET_VCA_POLYGON.dwPointNum">
DWORD->unsigned int
</member>
<member name="F:CameraVisionLib.Model.IPCameraAPI.MAX_OVERLAP_ITEM_NUM">
抓拍机
</member>
<member name="T:CameraVisionLib.Model.IPCameraInfo">
<summary> <summary>
当前相机 登录信息
</summary> </summary>
</member> </member>
<member name="F:Asa.Basler.VisionCamera.cameraAll"> <member name="T:Asa.Barcode.Identify">
<summary> <summary>
所有相机列表 条码识别，1DBarcode、2DBarcode
</summary> </summary>
</member> </member>
<member name="F:Asa.Basler.VisionCamera.cameraName"> <member name="M:Asa.Barcode.Identify.#ctor(CameraVisionLib.Model.ScanParam)">
<summary> <summary>
所有相机的名称 条码识别，1DBarcode、2DBarcode
</summary> </summary>
<param name="param"></param>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.#ctor(System.String)"> <member name="M:Asa.Barcode.Identify.GetCode(System.Drawing.Bitmap)">
<summary> <summary>
机器视觉面阵相机 获取条码
</summary> </summary>
<param name="image"></param>
<returns></returns>
</member>
<member name="T:Asa.Camera.VisionLib">
<summary>
视觉库
</summary>
</member>
<member name="M:Asa.Camera.VisionLib.#ctor(System.String,System.String)">
<summary>
视觉库
</summary>
<param name="configPath"></param>
<param name="logName"></param> <param name="logName"></param>
</member> </member>
<member name="P:Asa.Basler.VisionCamera.Name"> <member name="M:Asa.Camera.VisionLib.Dispose">
<summary> <summary>
相机名称 释放
</summary> </summary>
</member> </member>
<member name="P:Asa.Basler.VisionCamera.Count"> <member name="P:Asa.Camera.VisionLib.Count">
<summary> <summary>
相机总数 相机数量
</summary> </summary>
</member> </member>
<member name="P:Asa.Basler.VisionCamera.IsOpen"> <member name="M:Asa.Camera.VisionLib.GetCameraName">
<summary> <summary>
相机是否打开 获取相机名称
</summary> </summary>
<returns></returns>
</member> </member>
<member name="P:Asa.Basler.VisionCamera.Size"> <member name="M:Asa.Camera.VisionLib.Open">
<summary> <summary>
图像分辨率 打开
</summary> </summary>
</member> </member>
<member name="P:Asa.Basler.VisionCamera.Image"> <member name="M:Asa.Camera.VisionLib.Open(System.String)">
<summary> <summary>
相机获取到的图像 打开
</summary> </summary>
<param name="cameraName"></param>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.Load"> <member name="M:Asa.Camera.VisionLib.Close">
<summary> <summary>
加载 关闭
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.Dispose"> <member name="M:Asa.Camera.VisionLib.Close(System.String)">
<summary> <summary>
释放所有 关闭
</summary> </summary>
<param name="cameraName"></param>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.OpenAll"> <member name="M:Asa.Camera.VisionLib.GetImage">
<summary> <summary>
打开所有摄像机 获取当前图像
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.CloseAll"> <member name="M:Asa.Camera.VisionLib.GetImage(System.String)">
<summary> <summary>
关闭所有摄像机 获取当前图像
</summary> </summary>
<param name="cameraName"></param>
<returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.Open(System.Int32)"> <member name="M:Asa.Camera.VisionLib.SaveImage(System.String,System.String,System.Drawing.Imaging.ImageFormat)">
<summary> <summary>
打开摄像机 保存当前图像
</summary> </summary>
<param name="cameraIndex"></param> <param name="path">文件夹路径</param>
<param name="fileName">文件名，不带扩展名</param>
<param name="format">图像类型</param>
</member>
<member name="M:Asa.Camera.VisionLib.SaveImage(System.String,System.String,System.String,System.Drawing.Imaging.ImageFormat)">
<summary>
保存当前图像
</summary>
<param name="cameraName">相机名称</param>
<param name="path">文件夹路径</param>
<param name="fileName">文件名，不带扩展名</param>
<param name="format">图像类型</param>
</member>
<member name="M:Asa.Camera.VisionLib.GetBarCodeText(System.Collections.Generic.List{System.Drawing.Bitmap}@)">
<summary>
从相机图像获取条码
</summary>
<param name="image"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.Open(System.String)"> <member name="M:Asa.Camera.VisionLib.GetBarCodeText(System.String,System.Drawing.Bitmap@)">
<summary> <summary>
打开相机 从相机图像获取条码
</summary> </summary>
<param name="cameraName"></param> <param name="cameraName"></param>
<param name="image"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.Close(System.Int32)"> <member name="M:Asa.Camera.VisionLib.GetBarCodeText(System.Drawing.Bitmap)">
<summary> <summary>
关闭摄像机 从给定的图像中获取条码文本
</summary> </summary>
<param name="cameraIndex"></param> <param name="bmp"></param>
<returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.GrabOne(System.Drawing.Bitmap[]@)"> <member name="M:Asa.Camera.VisionLib.GetBarCodeText(System.Collections.Generic.List{CameraVisionLib.Model.BarcodeInfo})">
<summary> <summary>
抓取所有摄像机一张图像 从给定的条码中获取条码文本
</summary>
<param name="info"></param>
<returns></returns>
</member>
<member name="M:Asa.Camera.VisionLib.GetBarCode(System.Collections.Generic.List{System.Drawing.Bitmap}@)">
<summary>
从相机图像获取条码
</summary>
<param name="image"></param>
<returns></returns>
</member>
<member name="M:Asa.Camera.VisionLib.GetBarCode(System.String,System.Drawing.Bitmap@)">
<summary>
从相机图像获取条码
</summary>
<param name="cameraName"></param>
<param name="image"></param>
<returns></returns>
</member>
<member name="M:Asa.Camera.VisionLib.GetBarCode(System.Drawing.Bitmap)">
<summary>
从给定的图像中获取条码
</summary> </summary>
<param name="bmp"></param> <param name="bmp"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.GrabOne(System.Int32)"> <member name="M:Asa.Camera.VisionLib.FeatureOriginal">
<summary> <summary>
抓取一张图像 特征原始图
</summary> </summary>
<param name="cameraIndex">相机索引</param> </member>
<member name="M:Asa.Camera.VisionLib.FeatureOriginal(System.String)">
<summary>
特征原始图
</summary>
<param name="cameraName"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.GrabOne(System.Int32,System.Drawing.Bitmap@)"> <member name="M:Asa.Camera.VisionLib.FeatureOriginal(System.String,System.String)">
<summary> <summary>
抓取一张图像 特征原始图
</summary> </summary>
<param name="cameraIndex">相机索引</param> <param name="cameraName"></param>
<param name="bmp">Bitmap图像</param> <param name="planName"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.GrabOne(System.String,System.Drawing.Bitmap@)"> <member name="M:Asa.Camera.VisionLib.FeatureOriginal(System.Drawing.Bitmap,System.String,System.String)">
<summary> <summary>
抓取一张图像 特征原始图
</summary> </summary>
<param name="cameraName">相机名称</param> <param name="bmp"></param>
<param name="bmp">Bitmap图像</param> <param name="name"></param>
<param name="planName"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.GrabOne(System.Int32,System.Byte[]@,System.Drawing.Imaging.PixelFormat@)"> <member name="M:Asa.Camera.VisionLib.FeatureCompare(System.Collections.Generic.Dictionary{System.String,System.Collections.Generic.Dictionary{System.String,System.Collections.Generic.Dictionary{System.String,System.Boolean}}}@)">
<summary> <summary>
抓取一张图像字节 特征比较图
</summary> </summary>
<param name="cameraIndex">相机索引</param> <param name="exist"></param>
<param name="buff">图像字节数组</param> </member>
<param name="format"></param> <member name="M:Asa.Camera.VisionLib.FeatureCompare(System.String,System.Collections.Generic.Dictionary{System.String,System.Collections.Generic.Dictionary{System.String,System.Boolean}}@)">
<summary>
特征比较图
</summary>
<param name="cameraName"></param>
<param name="exist"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Basler.VisionCamera.GrabOne(System.Int32,System.IntPtr@,System.Drawing.Imaging.PixelFormat@)"> <member name="M:Asa.Camera.VisionLib.FeatureCompare(System.String,System.String,System.Collections.Generic.Dictionary{System.String,System.Boolean}@)">
<summary> <summary>
抓取一张图像指针 特征比较图
</summary> </summary>
<param name="cameraIndex"></param> <param name="cameraName"></param>
<param name="handle"></param> <param name="planName"></param>
<param name="format"></param> <param name="exist"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:Asa.HIK.API"> <member name="M:Asa.Camera.VisionLib.FeatureCompare(System.Drawing.Bitmap,System.String,System.String,System.Collections.Generic.Dictionary{System.String,System.Boolean}@)">
<summary> <summary>
CHCNetSDK 的摘要说明。 特征比较图
</summary> </summary>
<param name="bmp"></param>
<param name="name"></param>
<param name="planName"></param>
<param name="exist"></param>
<returns></returns>
</member> </member>
<member name="F:Asa.HIK.API.NET_DVR_IPADDR.sIpV4"> <member name="F:Asa.Camera.FrmOpenCamera.components">
char[16] <summary>
Required designer variable.
</summary>
</member> </member>
<member name="F:Asa.HIK.API.NET_DVR_IPADDR.byRes"> <member name="M:Asa.Camera.FrmOpenCamera.Dispose(System.Boolean)">
BYTE[128] <summary>
Clean up any resources being used.
</summary>
<param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
</member> </member>
<member name="F:Asa.HIK.API.NET_DVR_ATM_FRAMEFORMAT_V30.byRes1"> <member name="M:Asa.Camera.FrmOpenCamera.InitializeComponent">
输入方式:0-网络监听、1网络协议、2-串口监听、3-串口协议 <summary>
Required method for Designer support - do not modify
the contents of this method with the code editor.
</summary>
</member> </member>
<member name="F:Asa.HIK.API.NET_VCA_POLYGON.dwPointNum"> <member name="F:Asa.Camera.FrmSetting.components">
DWORD->unsigned int <summary>
Required designer variable.
</summary>
</member> </member>
<member name="F:Asa.HIK.API.MAX_OVERLAP_ITEM_NUM"> <member name="M:Asa.Camera.FrmSetting.Dispose(System.Boolean)">
抓拍机 <summary>
Clean up any resources being used.
</summary>
<param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
</member>
<member name="M:Asa.Camera.FrmSetting.InitializeComponent">
<summary>
Required method for Designer support - do not modify
the contents of this method with the code editor.
</summary>
</member> </member>
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.sMonitorIP" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.dwChanIndex" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.dwWidth" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.dwHeight" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.struCheckTime" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byResult" -->
<member name="F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.bySignalResult">
0-未检测 1-正常 2-异常 3-登录失败 4-取流异常
</member>
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byBlurResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byLumaResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byChromaResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.bySnowResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byStreakResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byFreezeResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byPTZResult" -->
<!-- Badly formed XML comment ignored for member "F:Asa.HIK.API.NET_DVR_DIAGNOSIS_UPLOAD.byContrastResult" -->
<member name="T:Asa.HIK.IPCamera"> <member name="T:Asa.HIK.IPCamera">
<summary> <summary>
网络监控摄像机 网络监控摄像机
</summary> </summary>
</member> </member>
<member name="M:Asa.HIK.IPCamera.#ctor(System.String,System.String)"> <member name="M:Asa.HIK.IPCamera.#ctor(System.Collections.Generic.List{CameraVisionLib.Model.IPCameraInfo})">
<summary> <summary>
网络监控摄像机 网络监控摄像机
</summary> </summary>
<param name="configPath"></param> <param name="info"></param>
<param name="logName"></param>
</member> </member>
<member name="P:Asa.HIK.IPCamera.Name"> <member name="P:Asa.HIK.IPCamera.Name">
<summary> <summary>
...@@ -412,11 +484,6 @@ ...@@ -412,11 +484,6 @@
相机获取到的图像 相机获取到的图像
</summary> </summary>
</member> </member>
<member name="P:Asa.HIK.IPCamera.Preview">
<summary>
预览控件
</summary>
</member>
<member name="M:Asa.HIK.IPCamera.Load"> <member name="M:Asa.HIK.IPCamera.Load">
<summary> <summary>
加载 加载
...@@ -446,12 +513,25 @@ ...@@ -446,12 +513,25 @@
<param name="cameraIndex"></param> <param name="cameraIndex"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.HIK.IPCamera.Open(System.String)">
<summary>
打开摄像机
</summary>
<param name="cameraName"></param>
<returns></returns>
</member>
<member name="M:Asa.HIK.IPCamera.Close(System.Int32)"> <member name="M:Asa.HIK.IPCamera.Close(System.Int32)">
<summary> <summary>
关闭摄像机 关闭摄像机
</summary> </summary>
<param name="cameraIndex"></param> <param name="cameraIndex"></param>
</member> </member>
<member name="M:Asa.HIK.IPCamera.Close(System.String)">
<summary>
关闭摄像机
</summary>
<param name="cameraName"></param>
</member>
<member name="M:Asa.HIK.IPCamera.GrabOne(System.Drawing.Bitmap[]@)"> <member name="M:Asa.HIK.IPCamera.GrabOne(System.Drawing.Bitmap[]@)">
<summary> <summary>
抓取所有摄像机一张图像 抓取所有摄像机一张图像
...@@ -500,21 +580,15 @@ ...@@ -500,21 +580,15 @@
<param name="format"></param> <param name="format"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:Asa.HIK.LoginInfo">
<summary>
登录信息
</summary>
</member>
<member name="T:Asa.HIK.VisionCamera"> <member name="T:Asa.HIK.VisionCamera">
<summary> <summary>
机器视觉面阵相机 机器视觉面阵相机
</summary> </summary>
</member> </member>
<member name="M:Asa.HIK.VisionCamera.#ctor(System.String)"> <member name="M:Asa.HIK.VisionCamera.#ctor">
<summary> <summary>
机器视觉面阵相机 机器视觉面阵相机
</summary> </summary>
<param name="logName"></param>
</member> </member>
<member name="P:Asa.HIK.VisionCamera.Name"> <member name="P:Asa.HIK.VisionCamera.Name">
<summary> <summary>
...@@ -583,6 +657,12 @@ ...@@ -583,6 +657,12 @@
</summary> </summary>
<param name="cameraIndex"></param> <param name="cameraIndex"></param>
</member> </member>
<member name="M:Asa.HIK.VisionCamera.Close(System.String)">
<summary>
关闭相机
</summary>
<param name="cameraName"></param>
</member>
<member name="M:Asa.HIK.VisionCamera.GrabOne(System.Drawing.Bitmap[]@)"> <member name="M:Asa.HIK.VisionCamera.GrabOne(System.Drawing.Bitmap[]@)">
<summary> <summary>
抓取所有相机一张图像 抓取所有相机一张图像
...@@ -631,238 +711,197 @@ ...@@ -631,238 +711,197 @@
<param name="format"></param> <param name="format"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:Asa.Region.Feature"> <member name="T:Asa.Basler.VisionCamera">
<summary> <summary>
区域特征 机器视觉面阵相机
</summary> </summary>
</member> </member>
<member name="M:Asa.Region.Feature.#ctor(System.String,System.String,System.String)"> <member name="F:Asa.Basler.VisionCamera.cameraCurr">
<summary> <summary>
区域特征 当前相机
</summary> </summary>
<param name="configPath"></param>
<param name="cameraName"></param>
<param name="logName"></param>
</member> </member>
<member name="P:Asa.Region.Feature.CameraName"> <member name="F:Asa.Basler.VisionCamera.cameraAll">
<summary> <summary>
相机名称 所有相机列表
</summary> </summary>
</member> </member>
<member name="M:Asa.Region.Feature.OriginalImage(System.Drawing.Bitmap)"> <member name="F:Asa.Basler.VisionCamera.cameraName">
<summary> <summary>
原始图像 所有相机的名称
</summary> </summary>
<param name="image"></param>
<returns></returns>
</member> </member>
<member name="M:Asa.Region.Feature.CompareImage(System.Drawing.Bitmap,System.Collections.Generic.Dictionary{System.String,System.Boolean}@)"> <member name="M:Asa.Basler.VisionCamera.#ctor">
<summary> <summary>
比较图像 机器视觉面阵相机
</summary> </summary>
<param name="image"></param>
<param name="exist"></param>
<returns></returns>
</member> </member>
<member name="M:Asa.Region.Feature.CompareImage(System.Drawing.Bitmap,System.Collections.Generic.Dictionary{System.String,System.Boolean}@,System.Drawing.Bitmap@)"> <member name="P:Asa.Basler.VisionCamera.Name">
<summary> <summary>
比较图像 相机名称
</summary> </summary>
<param name="image"></param>
<param name="exist"></param>
<param name="dspImage"></param>
<returns></returns>
</member> </member>
<member name="M:Asa.Region.Feature.CompareImage(System.IntPtr,System.Drawing.Imaging.PixelFormat,System.Collections.Generic.Dictionary{System.String,System.Boolean}@,System.Drawing.Bitmap@)"> <member name="P:Asa.Basler.VisionCamera.Count">
<summary> <summary>
比较图像 相机总数
</summary> </summary>
<param name="bmpPtr"></param>
<param name="format"></param>
<param name="exist"></param>
<param name="dspImage"></param>
<returns></returns>
</member> </member>
<member name="T:Asa.Camera.VisionLib"> <member name="P:Asa.Basler.VisionCamera.IsOpen">
<summary> <summary>
视觉库 相机是否打开
</summary> </summary>
</member> </member>
<member name="M:Asa.Camera.VisionLib.#ctor(System.String,System.String)"> <member name="P:Asa.Basler.VisionCamera.Size">
<summary> <summary>
视觉库 图像分辨率
</summary> </summary>
<param name="configPath"></param>
<param name="logName"></param>
</member> </member>
<member name="M:Asa.Camera.VisionLib.Dispose"> <member name="P:Asa.Basler.VisionCamera.Image">
<summary> <summary>
释放 相机获取到的图像
</summary> </summary>
</member> </member>
<member name="P:Asa.Camera.VisionLib.Count"> <member name="M:Asa.Basler.VisionCamera.Load">
<summary> <summary>
相机数量 加载
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetCameraName"> <member name="M:Asa.Basler.VisionCamera.Dispose">
<summary> <summary>
获取相机名称 释放所有
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.Open"> <member name="M:Asa.Basler.VisionCamera.OpenAll">
<summary> <summary>
打开 打开所有摄像机
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.Close"> <member name="M:Asa.Basler.VisionCamera.CloseAll">
<summary> <summary>
关闭 关闭所有摄像机
</summary> </summary>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetImage"> <member name="M:Asa.Basler.VisionCamera.Open(System.Int32)">
<summary> <summary>
获取当前图像 打开摄像机
</summary> </summary>
<param name="cameraIndex"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetImage(System.String)"> <member name="M:Asa.Basler.VisionCamera.Open(System.String)">
<summary> <summary>
获取当前图像 打开相机
</summary> </summary>
<param name="cameraName"></param> <param name="cameraName"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.SaveImage(System.String,System.String,System.Drawing.Imaging.ImageFormat)"> <member name="M:Asa.Basler.VisionCamera.Close(System.Int32)">
<summary> <summary>
保存当前图像 关闭摄像机
</summary> </summary>
<param name="path">文件夹路径</param> <param name="cameraIndex"></param>
<param name="fileName">文件名，不带扩展名</param>
<param name="format">图像类型</param>
</member> </member>
<member name="M:Asa.Camera.VisionLib.SaveImage(System.String,System.String,System.String,System.Drawing.Imaging.ImageFormat)"> <member name="M:Asa.Basler.VisionCamera.Close(System.String)">
<summary> <summary>
保存当前图像 关闭摄像机
</summary> </summary>
<param name="cameraName">相机名称</param> <param name="cameraName"></param>
<param name="path">文件夹路径</param>
<param name="fileName">文件名，不带扩展名</param>
<param name="format">图像类型</param>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetBarCodeText(System.Collections.Generic.List{System.Drawing.Bitmap}@)"> <member name="M:Asa.Basler.VisionCamera.GrabOne(System.Drawing.Bitmap[]@)">
<summary> <summary>
从相机图像获取条码 抓取所有摄像机一张图像
</summary> </summary>
<param name="image"></param> <param name="bmp"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetBarCodeText(System.String,System.Drawing.Bitmap@)"> <member name="M:Asa.Basler.VisionCamera.GrabOne(System.Int32)">
<summary> <summary>
从相机图像获取条码 抓取一张图像
</summary> </summary>
<param name="cameraName"></param> <param name="cameraIndex">相机索引</param>
<param name="image"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetBarCodeText(System.Drawing.Bitmap)"> <member name="M:Asa.Basler.VisionCamera.GrabOne(System.Int32,System.Drawing.Bitmap@)">
<summary> <summary>
从给定的图像中获取条码文本 抓取一张图像
</summary> </summary>
<param name="bmp"></param> <param name="cameraIndex">相机索引</param>
<param name="bmp">Bitmap图像</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetBarCodeText(System.Collections.Generic.List{Asa.Barcode.CodeInfo})"> <member name="M:Asa.Basler.VisionCamera.GrabOne(System.String,System.Drawing.Bitmap@)">
<summary> <summary>
从给定的条码中获取条码文本 抓取一张图像
</summary> </summary>
<param name="info"></param> <param name="cameraName">相机名称</param>
<param name="bmp">Bitmap图像</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetBarCode(System.Collections.Generic.List{System.Drawing.Bitmap}@)"> <member name="M:Asa.Basler.VisionCamera.GrabOne(System.Int32,System.Byte[]@,System.Drawing.Imaging.PixelFormat@)">
<summary> <summary>
从相机图像获取条码 抓取一张图像字节
</summary> </summary>
<param name="image"></param> <param name="cameraIndex">相机索引</param>
<param name="buff">图像字节数组</param>
<param name="format"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetBarCode(System.String,System.Drawing.Bitmap@)"> <member name="M:Asa.Basler.VisionCamera.GrabOne(System.Int32,System.IntPtr@,System.Drawing.Imaging.PixelFormat@)">
<summary> <summary>
从相机图像获取条码 抓取一张图像指针
</summary> </summary>
<param name="cameraName"></param> <param name="cameraIndex"></param>
<param name="image"></param> <param name="handle"></param>
<param name="format"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.GetBarCode(System.Drawing.Bitmap)"> <member name="T:Asa.Region.Feature">
<summary> <summary>
从给定的图像中获取条码 区域特征
</summary> </summary>
<param name="bmp"></param>
<returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.FeatureOriginal"> <member name="M:Asa.Region.Feature.#ctor(System.Collections.Generic.List{System.String},System.Collections.Generic.List{CameraVisionLib.Model.RegionAPI.EyemRegion})">
<summary> <summary>
特征原始图 区域特征
</summary> </summary>
<returns></returns> <param name="name"></param>
<param name="regions"></param>
</member> </member>
<member name="M:Asa.Camera.VisionLib.FeatureOriginal(System.String)"> <member name="M:Asa.Region.Feature.OriginalImage(System.Drawing.Bitmap)">
<summary> <summary>
特征原始图 原始图像
</summary> </summary>
<param name="cameraName"></param> <param name="image"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.FeatureCompare(System.Collections.Generic.Dictionary{System.String,System.Boolean}@)"> <member name="M:Asa.Region.Feature.CompareImage(System.Drawing.Bitmap,System.Collections.Generic.Dictionary{System.String,System.Boolean}@)">
<summary> <summary>
特征比较图 比较图像
</summary> </summary>
<param name="image"></param>
<param name="exist"></param> <param name="exist"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Camera.VisionLib.FeatureCompare(System.String,System.Collections.Generic.Dictionary{System.String,System.Boolean}@)"> <member name="M:Asa.Region.Feature.CompareImage(System.Drawing.Bitmap,System.Collections.Generic.Dictionary{System.String,System.Boolean}@,System.Drawing.Bitmap@)">
<summary> <summary>
特征比较图 比较图像
</summary> </summary>
<param name="cameraName"></param> <param name="image"></param>
<param name="exist"></param> <param name="exist"></param>
<param name="dspImage"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="F:Asa.Camera.FrmOpenCamera.components"> <member name="M:Asa.Region.Feature.CompareImage(System.IntPtr,System.Drawing.Imaging.PixelFormat,System.Collections.Generic.Dictionary{System.String,System.Boolean}@,System.Drawing.Bitmap@)">
<summary>
Required designer variable.
</summary>
</member>
<member name="M:Asa.Camera.FrmOpenCamera.Dispose(System.Boolean)">
<summary>
Clean up any resources being used.
</summary>
<param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
</member>
<member name="M:Asa.Camera.FrmOpenCamera.InitializeComponent">
<summary>
Required method for Designer support - do not modify
the contents of this method with the code editor.
</summary>
</member>
<member name="F:Asa.Camera.FrmSetting.components">
<summary>
Required designer variable.
</summary>
</member>
<member name="M:Asa.Camera.FrmSetting.Dispose(System.Boolean)">
<summary>
Clean up any resources being used.
</summary>
<param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
</member>
<member name="M:Asa.Camera.FrmSetting.InitializeComponent">
<summary> <summary>
Required method for Designer support - do not modify 比较图像
the contents of this method with the code editor.
</summary> </summary>
<param name="bmpPtr"></param>
<param name="format"></param>
<param name="exist"></param>
<param name="dspImage"></param>
<returns></returns>
</member> </member>
</members> </members>
</doc> </doc>
dll/camera/Camera.json
{"CodeOrder":"HalconOnly","Halcon":{"CodeType":"All","Zoom1DCode":1.5,"Zoom2DCode":1.5},"EyemLib":{"CodeType":"All","BlockSize":11,"RangeC":5,"SymbolMin":128,"SymbolMax":215},"Region":[{"CameraName":"monitor","RegionName":"LeftTop","X":952,"Y":268,"Width":416,"Height":479,"Ratio":0.7},{"CameraName":"monitor","RegionName":"RightTop","X":967,"Y":288,"Width":396,"Height":456,"Ratio":0.7},{"CameraName":"monitor","RegionName":"name1","X":526,"Y":424,"Width":640,"Height":375,"Ratio":0.7}],"HIKIPCamera":[{"Name":"monitor","IP":"192.168.102.210","Port":"8000","User":"admin","Pwd":"acc123456"}]}
\ No newline at end of file \ No newline at end of file
{"CodeOrder":"HalconOnly","Halcon":{"CodeType":"All","Zoom1DCode":1.5,"Zoom2DCode":1.5},"EyemLib":{"CodeType":"All","BlockSize":11,"RangeC":5,"SymbolMin":128,"SymbolMax":215},"Region":{"monitor":{"Aplan":[{"RegionName":"one","X":133,"Y":167,"Width":396,"Height":456,"Ratio":0.5},{"RegionName":"two","X":555,"Y":170,"Width":390,"Height":450,"Ratio":0.6}],"Bplan":[{"RegionName":"one","X":927,"Y":278,"Width":396,"Height":456,"Ratio":0.5},{"RegionName":"two","X":1353,"Y":276,"Width":396,"Height":456,"Ratio":0.5}],"C计划":[{"RegionName":"name1","X":122,"Y":147,"Width":100,"Height":100,"Ratio":0.4}]},"monitor2":{"key1":[{"RegionName":"one","X":967,"Y":288,"Width":396,"Height":456,"Ratio":0.5}]}},"HIKIPCamera":[{"Name":"monitor","IP":"192.168.10.64","User":"admin","Password":"qwert2asdfg","Port":8000}]}
\ No newline at end of file \ No newline at end of file
dll/camera/log4net.config 0 → 100644
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<log4net>
<logger name="log">
<level value="Debug"/>
<appender-ref ref="log"/>
</logger>
<appender name="log" type="log4net.Appender.RollingFileAppender">
<param name="File" value="Logs\\CameraVisionLibSetting.log" />
<param name="Encoding" value="UTF-8"/>
<param name="AppendToFile" value="true" />
<param name="RollingStyle" value="Date" />
<param name="DatePattern" value="yyyy-MM-dd" />
<param name="MaxSizeRollBackups" value="100" />
<param name="MaxFileSize" value="10240" />
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="[%d][%t][%c:%L]%-5p %m%n" />
</layout>
</appender>
</log4net>
</configuration>
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/acSingleStore/BoxBean.cs
...@@ -85,6 +85,28 @@ namespace OnlineStore.DeviceLibrary ...@@ -85,6 +85,28 @@ namespace OnlineStore.DeviceLibrary
lineConnect = new LineConnect(config.GetStoreId(),config.CID); lineConnect = new LineConnect(config.GetStoreId(),config.CID);
mainTimer.Enabled = false; mainTimer.Enabled = false;
} }
public void FeatureOriginal(string planName)
{
try
{
//判断是否记录比较原图
if (MoveInfo.MoveType.Equals(StoreMoveType.ReturnHome) && StoreManager.Store.vision != null && (!String.IsNullOrEmpty(Config.Camera_Name)))
{
LogInfo("" + MoveInfo.MoveType + $"：获取特征原始图[{Config.Camera_Name}][{planName}]");
StoreManager.Store.vision.FeatureOriginal(Config.Camera_Name, planName);
}
}
catch (AccessViolationException e)
{
LogUtil.error(Name + "FeatureOriginal 出错 AccessViolationException：" + e.ToString());
}
catch (Exception ex)
{
LogUtil.error(Name + "FeatureOriginal 出错：" + ex.ToString());
}
}
private int vcount = 0; private int vcount = 0;
/// <summary> /// <summary>
/// 视觉比较是否有料 /// 视觉比较是否有料
...@@ -92,7 +114,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -92,7 +114,7 @@ namespace OnlineStore.DeviceLibrary
/// <param name="exist"></param> /// <param name="exist"></param>
/// <returns>true=有料，false=无料</returns> /// <returns>true=有料，false=无料</returns>
[HandleProcessCorruptedStateExceptions] [HandleProcessCorruptedStateExceptions]
public bool VisionComp(out Dictionary<string, bool> exist) public bool VisionComp(string planName,out Dictionary<string, bool> exist)
{ {
LastCheckTime = DateTime.Now; LastCheckTime = DateTime.Now;
bool returnResult = false; bool returnResult = false;
...@@ -106,7 +128,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -106,7 +128,7 @@ namespace OnlineStore.DeviceLibrary
if (StoreManager.Store. vision != null) if (StoreManager.Store. vision != null)
{ {
vcount++; vcount++;
bool result= StoreManager.Store.vision.FeatureCompare(Config.Camera_Name, out exist); bool result= StoreManager.Store.vision.FeatureCompare(Config.Camera_Name,planName, out exist);
if (!result) if (!result)
{ {
LogUtil.error(Name + " VisionComp ["+ Config.Camera_Name + "] =" + result); LogUtil.error(Name + " VisionComp ["+ Config.Camera_Name + "] =" + result);
...@@ -128,7 +150,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -128,7 +150,7 @@ namespace OnlineStore.DeviceLibrary
str += key + "=" + exist[key] + ";"; str += key + "=" + exist[key] + ";";
} }
} }
LogUtil.info(Name + "VisionComp "+ vcount + " [" + Config.Camera_Name + "] 结果：" + str); LogUtil.info(Name +$"VisionComp{ vcount } [{ Config.Camera_Name }][{planName}] 结果：{str}" );
} }
} }
} }
...@@ -225,8 +247,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -225,8 +247,16 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NewMove(StoreMoveType.ReturnHome); MoveInfo.NewMove(StoreMoveType.ReturnHome);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutBack); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutBack);
ACAxisHomeMove(Config.InOut_Axis); ACAxisHomeMove(Config.InOut_Axis);
LogInfo( "开始原点返回，先把进出轴回原点");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
if (MoveInfo.MoveType.Equals(StoreMoveType.ReturnHome) && StoreManager.Store.vision != null && (!String.IsNullOrEmpty(Config.Camera_Name)))
{
LogInfo("开始原点返回，先把进出轴回原点，打开仓门");
OpenDoor(true);
}
else
{
LogInfo("开始原点返回，先把进出轴回原点");
}
} }
public void MoveToP1() public void MoveToP1()
{ {
...@@ -267,7 +297,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -267,7 +297,7 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutMove); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutMove);
LogInfo( "复位中，等待2秒后进出轴开始原点返回"); LogInfo("复位中，等待2秒后进出轴开始原点返回");
//ACAxisHomeMove(Config.InOut_Axis); //ACAxisHomeMove(Config.InOut_Axis);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
...@@ -291,15 +321,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -291,15 +321,17 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_H_InOutMove: case StoreMoveStep.BOX_H_InOutMove:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutBack); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutBack);
ACAxisHomeMove(Config.InOut_Axis); ACAxisHomeMove(Config.InOut_Axis);
LogInfo( "" + MoveInfo.MoveType + "：进出轴开始原点返回"); LogInfo("" + MoveInfo.MoveType + "：进出轴开始原点返回");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
break; break;
case StoreMoveStep.BOX_H_InOutBack: case StoreMoveStep.BOX_H_InOutBack:
Thread.Sleep(200); Thread.Sleep(200);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutToP1); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutToP1);
LogInfo( "" + MoveInfo.MoveType + "：进出轴到待机点P1["+ Config.InOutAxis_P1_Position + "]，关闭舱门"); LogInfo( "" + MoveInfo.MoveType + "：进出轴到待机点P1["+ Config.InOutAxis_P1_Position + "]");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed); ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
CloseDoor();
//判断是否记录比较原图
FeatureOriginal(StoreManager.PlanName_OpenDoor);
break; break;
case StoreMoveStep.BOX_H_InOutToP1: case StoreMoveStep.BOX_H_InOutToP1:
//如果此时轴三还在报警，需要提示错误并等待 //如果此时轴三还在报警，需要提示错误并等待
...@@ -312,9 +344,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -312,9 +344,11 @@ namespace OnlineStore.DeviceLibrary
} }
} }
//复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴 //复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
LogInfo( "" + MoveInfo.MoveType + "： 压紧轴，旋转轴，上下轴开始 原点返回"); LogInfo( "" + MoveInfo.MoveType + "： 压紧轴，旋转轴，上下轴开始 原点返回，关闭舱门");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack);
CloseDoor();
MoveInfo.TimeOutSeconds = 100; MoveInfo.TimeOutSeconds = 100;
if (UseCompress_Axis) if (UseCompress_Axis)
{ {
...@@ -337,6 +371,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -337,6 +371,9 @@ namespace OnlineStore.DeviceLibrary
Thread.Sleep(500); Thread.Sleep(500);
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed);
//判断是否记录比较原图
FeatureOriginal(StoreManager.PlanName_CloseDoor);
break; break;
case StoreMoveStep.BOX_H_MiddleAxisToP1: case StoreMoveStep.BOX_H_MiddleAxisToP1:
LogInfo( "" + MoveInfo.MoveType + "完成"); LogInfo( "" + MoveInfo.MoveType + "完成");
......
source/DeviceLibrary/acSingleStore/BoxBean_Partial.cs
...@@ -274,7 +274,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -274,7 +274,7 @@ namespace OnlineStore.DeviceLibrary
TimeSpan checkSpan = DateTime.Now - LastCheckTime; TimeSpan checkSpan = DateTime.Now - LastCheckTime;
if (checkSpan.TotalSeconds > 1) if (checkSpan.TotalSeconds > 1)
{ {
bool result = VisionComp(out Dictionary<string, bool> exist); bool result = VisionComp(wait.PlanName, out Dictionary<string, bool> exist);
if (result && wait.IoValue.Equals(IO_VALUE.HIGH)) if (result && wait.IoValue.Equals(IO_VALUE.HIGH))
{ {
wait.IsEnd = true; wait.IsEnd = true;
...@@ -443,7 +443,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -443,7 +443,7 @@ namespace OnlineStore.DeviceLibrary
if (alarmType.Equals(StoreAlarmType.None) && String.IsNullOrEmpty(WarnMsg)) if (alarmType.Equals(StoreAlarmType.None) && String.IsNullOrEmpty(WarnMsg))
{ {
//如果视觉检测有料，也可以入库 //如果视觉检测有料，也可以入库
if (VisionComp(out Dictionary<string, bool> exist)) if (VisionComp(StoreManager.PlanName_CloseDoor, out Dictionary<string, bool> exist))
{ {
string imgName = SaveComName(); string imgName = SaveComName();
InStoreLog("入库：门口检测信号不亮，但视觉识别有料盘，认为有料:"+imgName); InStoreLog("入库：门口检测信号不亮，但视觉识别有料盘，认为有料:"+imgName);
...@@ -851,17 +851,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -851,17 +851,17 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SO_22_WaitNoTray); MoveInfo.NextMoveStep(StoreMoveStep.SO_22_WaitNoTray);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
OpenDoor(); OpenDoor(true);
} }
else if (MoveInfo.MoveStep == StoreMoveStep.SO_22_WaitNoTray) else if (MoveInfo.MoveStep == StoreMoveStep.SO_22_WaitNoTray)
{ {
if (IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW) && VisionComp(out Dictionary<string, bool> exist)) if (IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW) && VisionComp(StoreManager.PlanName_OpenDoor, out Dictionary<string, bool> exist))
{ {
string fileName = SaveComName( ); string fileName = SaveComName( );
LogUtil.error(Name + "_" + MoveInfo.MoveStep + "_" + MoveInfo.MoveParam.PosInfo.PosId + "出库：门口检测信号无料，但视觉识别有料盘:"+fileName+"，重新等待仓门口无料"); LogUtil.error(Name + "_" + MoveInfo.MoveStep + "_" + MoveInfo.MoveParam.PosInfo.PosId + "出库：门口检测信号无料，但视觉识别有料盘:"+fileName+"，重新等待仓门口无料");
MoveInfo.NextMoveStep(StoreMoveStep.SO_22_WaitNoTray); MoveInfo.NextMoveStep(StoreMoveStep.SO_22_WaitNoTray);
MoveInfo.WaitList.Add(WaitResultInfo.WaitVisionComp( IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitVisionComp(StoreManager.PlanName_OpenDoor, IO_VALUE.LOW));
} }
else else
{ {
...@@ -898,7 +898,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -898,7 +898,7 @@ namespace OnlineStore.DeviceLibrary
{ {
SO_28_GoBack(); SO_28_GoBack();
} }
else if (VisionComp(out Dictionary<string, bool> exist)) else if (VisionComp(StoreManager.PlanName_CloseDoor, out Dictionary<string, bool> exist))
{ {
SO_28_GoBack(); SO_28_GoBack();
} }
...@@ -963,7 +963,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -963,7 +963,7 @@ namespace OnlineStore.DeviceLibrary
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : ""; string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
string barcode = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.barcode : ""; string barcode = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.barcode : "";
//再次检测 //再次检测
bool hasReel = VisionComp(out Dictionary<string, bool> exist); bool hasReel = VisionComp(StoreManager.PlanName_CloseDoor, out Dictionary<string, bool> exist);
if (hasReel) if (hasReel)
{ {
string fileName = SaveComName(); string fileName = SaveComName();
......
source/DeviceLibrary/acSingleStore/StoreBean.cs
...@@ -148,7 +148,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -148,7 +148,7 @@ namespace OnlineStore.DeviceLibrary
{ {
vision = new Asa.Camera.VisionLib(vfile, "RollingLogFileAppender"); vision = new Asa.Camera.VisionLib(vfile, "RollingLogFileAppender");
vision.Open(); vision.Open();
vision.FeatureOriginal(); //vision.FeatureOriginal();
LogUtil.info(" InitVisionLib [" + vfile + "] [RollingLogFileAppender] 完成"); LogUtil.info(" InitVisionLib [" + vfile + "] [RollingLogFileAppender] 完成");
} }
} }
......
source/DeviceLibrary/acSingleStore/StoreManager.cs
...@@ -352,9 +352,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -352,9 +352,10 @@ namespace OnlineStore.DeviceLibrary
return msg; return msg;
} }
public static string PlanName_CloseDoor = "DoorClosed";
} public static string PlanName_OpenDoor = "DoorOpening";
public class ResultData }
public class ResultData
{ {
//{"code":0,"msg":"ok","data":"7"} //{"code":0,"msg":"ok","data":"7"}
public int code { get; set; } public int code { get; set; }
......
source/DeviceLibrary/bean/model/StoreMoveInfo.cs
...@@ -219,13 +219,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -219,13 +219,14 @@ namespace OnlineStore.DeviceLibrary
/// 等待有料 /// 等待有料
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static WaitResultInfo WaitVisionComp(IO_VALUE value) public static WaitResultInfo WaitVisionComp(string planName, IO_VALUE value)
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0; wait.CanWhileMoveCount = 0;
wait.WaitType = 8; wait.WaitType = 8;
wait.IoValue = value; wait.IoValue = value;
wait.IsEnd = false; wait.IsEnd = false;
wait.PlanName = planName;
return wait; return wait;
} }
...@@ -340,7 +341,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -340,7 +341,7 @@ namespace OnlineStore.DeviceLibrary
public int AxisOrgValue = 0; public int AxisOrgValue = 0;
public string PlanName = "";
public DateTime LastHasOrgTime = DateTime.Now; public DateTime LastHasOrgTime = DateTime.Now;
......
source/HCSingleStore/Camera.json
{"CodeOrder":"HalconOnly","Halcon":{"CodeType":"All","Zoom1DCode":1.5,"Zoom2DCode":1.5},"EyemLib":{"CodeType":"All","BlockSize":11,"RangeC":5,"SymbolMin":128,"SymbolMax":215},"Region":[{"CameraName":"monitor","RegionName":"LeftTop","X":76,"Y":172,"Width":416,"Height":479,"Ratio":0.5},{"CameraName":"monitor","RegionName":"RightTop","X":555,"Y":170,"Width":286,"Height":202,"Ratio":0.4},{"CameraName":"monitor","RegionName":"name1","X":526,"Y":424,"Width":640,"Height":375,"Ratio":0.7}],"HIKIPCamera":[{"Name":"monitor","IP":"192.168.1.64","Port":"8000","User":"admin","Pwd":"qwert2asdfg"},{"Name":"photoCamera","IP":"192.168.1.121","Port":"8000","User":"admin","Pwd":"admin123"}]}
\ No newline at end of file \ No newline at end of file
{"CodeOrder":"HalconOnly","Halcon":{"CodeType":"All","Zoom1DCode":1.5,"Zoom2DCode":1.5},"EyemLib":{"CodeType":"All","BlockSize":11,"RangeC":5,"SymbolMin":128,"SymbolMax":215},"Region":{"monitor":{"Aplan":[{"RegionName":"one","X":133,"Y":167,"Width":396,"Height":456,"Ratio":0.5},{"RegionName":"two","X":555,"Y":170,"Width":390,"Height":450,"Ratio":0.6}],"Bplan":[{"RegionName":"one","X":927,"Y":278,"Width":396,"Height":456,"Ratio":0.5},{"RegionName":"two","X":1353,"Y":276,"Width":396,"Height":456,"Ratio":0.5}],"C计划":[{"RegionName":"name1","X":122,"Y":147,"Width":100,"Height":100,"Ratio":0.4}]},"monitor2":{"key1":[{"RegionName":"one","X":967,"Y":288,"Width":396,"Height":456,"Ratio":0.5}]}},"HIKIPCamera":[{"Name":"monitor","IP":"192.168.10.64","User":"admin","Password":"qwert2asdfg","Port":8000}]}
\ No newline at end of file \ No newline at end of file
source/HCSingleStore/FrmBox.Designer.cs
...@@ -34,9 +34,12 @@ ...@@ -34,9 +34,12 @@
this.btnAxisP = new System.Windows.Forms.Button(); this.btnAxisP = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.btnImgSave = new System.Windows.Forms.Button(); this.groupcom = new System.Windows.Forms.GroupBox();
this.cmbPlanName = new System.Windows.Forms.ComboBox();
this.btnFcomp = new System.Windows.Forms.Button(); this.btnFcomp = new System.Windows.Forms.Button();
this.btnImgSave = new System.Windows.Forms.Button();
this.btnForig = new System.Windows.Forms.Button(); this.btnForig = new System.Windows.Forms.Button();
this.chbStop = new System.Windows.Forms.CheckBox();
this.lblLSend = new System.Windows.Forms.Label(); this.lblLSend = new System.Windows.Forms.Label();
this.lblSend = new System.Windows.Forms.Label(); this.lblSend = new System.Windows.Forms.Label();
this.lblMoveStr = new System.Windows.Forms.Label(); this.lblMoveStr = new System.Windows.Forms.Label();
...@@ -142,9 +145,9 @@ ...@@ -142,9 +145,9 @@
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox5 = new System.Windows.Forms.GroupBox(); this.groupBox5 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.chbStop = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.groupcom.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.tabPage3.SuspendLayout(); this.tabPage3.SuspendLayout();
...@@ -268,10 +271,9 @@ ...@@ -268,10 +271,9 @@
// //
// tabPage2 // tabPage2
// //
this.tabPage2.Controls.Add(this.groupcom);
this.tabPage2.Controls.Add(this.chbStop); this.tabPage2.Controls.Add(this.chbStop);
this.tabPage2.Controls.Add(this.btnImgSave); this.tabPage2.Controls.Add(this.btnImgSave);
this.tabPage2.Controls.Add(this.btnFcomp);
this.tabPage2.Controls.Add(this.btnForig);
this.tabPage2.Controls.Add(this.lblLSend); this.tabPage2.Controls.Add(this.lblLSend);
this.tabPage2.Controls.Add(this.lblSend); this.tabPage2.Controls.Add(this.lblSend);
this.tabPage2.Controls.Add(this.lblMoveStr); this.tabPage2.Controls.Add(this.lblMoveStr);
...@@ -292,25 +294,35 @@ ...@@ -292,25 +294,35 @@
this.tabPage2.Text = " 设备状态 "; this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
// //
// btnImgSave // groupcom
// //
this.btnImgSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.groupcom.Controls.Add(this.cmbPlanName);
this.btnImgSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.groupcom.Controls.Add(this.btnFcomp);
this.btnImgSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupcom.Controls.Add(this.btnForig);
this.btnImgSave.Location = new System.Drawing.Point(278, 554); this.groupcom.Location = new System.Drawing.Point(11, 521);
this.btnImgSave.Name = "btnImgSave"; this.groupcom.Name = "groupcom";
this.btnImgSave.Size = new System.Drawing.Size(105, 38); this.groupcom.Size = new System.Drawing.Size(396, 78);
this.btnImgSave.TabIndex = 284; this.groupcom.TabIndex = 286;
this.btnImgSave.Text = "库位图片保存"; this.groupcom.TabStop = false;
this.btnImgSave.UseVisualStyleBackColor = true; this.groupcom.Text = "视觉识别";
this.btnImgSave.Click += new System.EventHandler(this.btnImgSave_Click); //
// cmbPlanName
//
this.cmbPlanName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPlanName.FormattingEnabled = true;
this.cmbPlanName.Items.AddRange(new object[] {
"仓门关闭状态",
"仓门打开状态"});
this.cmbPlanName.Location = new System.Drawing.Point(24, 28);
this.cmbPlanName.Name = "cmbPlanName";
this.cmbPlanName.Size = new System.Drawing.Size(121, 28);
this.cmbPlanName.TabIndex = 284;
// //
// btnFcomp // btnFcomp
// //
this.btnFcomp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnFcomp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFcomp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFcomp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFcomp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFcomp.Location = new System.Drawing.Point(132, 554); this.btnFcomp.Location = new System.Drawing.Point(274, 23);
this.btnFcomp.Name = "btnFcomp"; this.btnFcomp.Name = "btnFcomp";
this.btnFcomp.Size = new System.Drawing.Size(105, 38); this.btnFcomp.Size = new System.Drawing.Size(105, 38);
this.btnFcomp.TabIndex = 283; this.btnFcomp.TabIndex = 283;
...@@ -318,12 +330,23 @@ ...@@ -318,12 +330,23 @@
this.btnFcomp.UseVisualStyleBackColor = true; this.btnFcomp.UseVisualStyleBackColor = true;
this.btnFcomp.Click += new System.EventHandler(this.btnFcomp_Click); this.btnFcomp.Click += new System.EventHandler(this.btnFcomp_Click);
// //
// btnImgSave
//
this.btnImgSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnImgSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnImgSave.Location = new System.Drawing.Point(425, 544);
this.btnImgSave.Name = "btnImgSave";
this.btnImgSave.Size = new System.Drawing.Size(105, 38);
this.btnImgSave.TabIndex = 284;
this.btnImgSave.Text = "库位图片保存";
this.btnImgSave.UseVisualStyleBackColor = true;
this.btnImgSave.Click += new System.EventHandler(this.btnImgSave_Click);
//
// btnForig // btnForig
// //
this.btnForig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnForig.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnForig.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnForig.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnForig.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnForig.Location = new System.Drawing.Point(20, 554); this.btnForig.Location = new System.Drawing.Point(162, 23);
this.btnForig.Name = "btnForig"; this.btnForig.Name = "btnForig";
this.btnForig.Size = new System.Drawing.Size(105, 38); this.btnForig.Size = new System.Drawing.Size(105, 38);
this.btnForig.TabIndex = 282; this.btnForig.TabIndex = 282;
...@@ -331,13 +354,25 @@ ...@@ -331,13 +354,25 @@
this.btnForig.UseVisualStyleBackColor = true; this.btnForig.UseVisualStyleBackColor = true;
this.btnForig.Click += new System.EventHandler(this.btnForig_Click); this.btnForig.Click += new System.EventHandler(this.btnForig_Click);
// //
// chbStop
//
this.chbStop.AutoSize = true;
this.chbStop.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbStop.Location = new System.Drawing.Point(415, 20);
this.chbStop.Name = "chbStop";
this.chbStop.Size = new System.Drawing.Size(93, 25);
this.chbStop.TabIndex = 285;
this.chbStop.Text = "暂停运动";
this.chbStop.UseVisualStyleBackColor = true;
this.chbStop.CheckedChanged += new System.EventHandler(this.chbStop_CheckedChanged);
//
// lblLSend // lblLSend
// //
this.lblLSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblLSend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblLSend.AutoSize = true; this.lblLSend.AutoSize = true;
this.lblLSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblLSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLSend.ForeColor = System.Drawing.Color.Green; this.lblLSend.ForeColor = System.Drawing.Color.Green;
this.lblLSend.Location = new System.Drawing.Point(13, 497); this.lblLSend.Location = new System.Drawing.Point(13, 505);
this.lblLSend.Name = "lblLSend"; this.lblLSend.Name = "lblLSend";
this.lblLSend.Size = new System.Drawing.Size(0, 17); this.lblLSend.Size = new System.Drawing.Size(0, 17);
this.lblLSend.TabIndex = 280; this.lblLSend.TabIndex = 280;
...@@ -348,7 +383,7 @@ ...@@ -348,7 +383,7 @@
this.lblSend.AutoSize = true; this.lblSend.AutoSize = true;
this.lblSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSend.ForeColor = System.Drawing.Color.Green; this.lblSend.ForeColor = System.Drawing.Color.Green;
this.lblSend.Location = new System.Drawing.Point(13, 521); this.lblSend.Location = new System.Drawing.Point(13, 529);
this.lblSend.Name = "lblSend"; this.lblSend.Name = "lblSend";
this.lblSend.Size = new System.Drawing.Size(0, 17); this.lblSend.Size = new System.Drawing.Size(0, 17);
this.lblSend.TabIndex = 278; this.lblSend.TabIndex = 278;
...@@ -388,7 +423,7 @@ ...@@ -388,7 +423,7 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(505, 344); this.groupBox1.Location = new System.Drawing.Point(505, 352);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(476, 136); this.groupBox1.Size = new System.Drawing.Size(476, 136);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
...@@ -568,7 +603,7 @@ ...@@ -568,7 +603,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(11, 402); this.groupBox2.Location = new System.Drawing.Point(11, 393);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78); this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -1738,18 +1773,6 @@ ...@@ -1738,18 +1773,6 @@
this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 297); this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 297);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// chbStop
//
this.chbStop.AutoSize = true;
this.chbStop.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbStop.Location = new System.Drawing.Point(415, 20);
this.chbStop.Name = "chbStop";
this.chbStop.Size = new System.Drawing.Size(93, 25);
this.chbStop.TabIndex = 285;
this.chbStop.Text = "暂停运动";
this.chbStop.UseVisualStyleBackColor = true;
this.chbStop.CheckedChanged += new System.EventHandler(this.chbStop_CheckedChanged);
//
// FrmBox // FrmBox
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -1767,6 +1790,7 @@ ...@@ -1767,6 +1790,7 @@
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.tabPage2.PerformLayout(); this.tabPage2.PerformLayout();
this.groupcom.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
...@@ -1909,6 +1933,8 @@ ...@@ -1909,6 +1933,8 @@
private System.Windows.Forms.Button btnForig; private System.Windows.Forms.Button btnForig;
private System.Windows.Forms.Button btnImgSave; private System.Windows.Forms.Button btnImgSave;
private System.Windows.Forms.CheckBox chbStop; private System.Windows.Forms.CheckBox chbStop;
private System.Windows.Forms.GroupBox groupcom;
private System.Windows.Forms.ComboBox cmbPlanName;
} }
} }
source/HCSingleStore/FrmBox.cs
...@@ -44,10 +44,11 @@ namespace OnlineStore.ACSingleStore ...@@ -44,10 +44,11 @@ namespace OnlineStore.ACSingleStore
tabPage2.Text = " 设备[" + boxBean.CID + "]状态 "; tabPage2.Text = " 设备[" + boxBean.CID + "]状态 ";
this.Opacity = 1; this.Opacity = 1;
DebugStatus(false); DebugStatus(false);
cmbPlanName.SelectedIndex = 0;
bool isShow = (!String.IsNullOrEmpty(boxBean.Config.Camera_Name)); bool isShow = (!String.IsNullOrEmpty(boxBean.Config.Camera_Name));
btnFcomp.Visible = isShow; btnFcomp.Visible = isShow;
btnForig.Visible = isShow; btnForig.Visible = isShow;
groupcom.Visible = isShow;
btnImgSave.Visible = (!String.IsNullOrEmpty(boxBean.Config.PhotoCamera_Name)); btnImgSave.Visible = (!String.IsNullOrEmpty(boxBean.Config.PhotoCamera_Name));
LoadOk = true; LoadOk = true;
} }
...@@ -1144,21 +1145,31 @@ namespace OnlineStore.ACSingleStore ...@@ -1144,21 +1145,31 @@ namespace OnlineStore.ACSingleStore
private void btnForig_Click(object sender, EventArgs e) private void btnForig_Click(object sender, EventArgs e)
{ {
string planName = StoreManager.PlanName_CloseDoor;
if (cmbPlanName.SelectedIndex.Equals(1))
{
planName = StoreManager.PlanName_OpenDoor;
}
if (StoreManager.Store.vision != null) if (StoreManager.Store.vision != null)
{ {
string date = boxBean.Name+DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + "-Original"; string date = boxBean.Name+DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + "-Original-"+planName;
StoreManager.Store.vision.SaveImage(boxBean.Config.Camera_Name, Application.StartupPath + @"\image\" , date, ImageFormat.Png); StoreManager.Store.vision.SaveImage(boxBean.Config.Camera_Name, Application.StartupPath + @"\image\" , date, ImageFormat.Png);
StoreManager.Store.vision.FeatureOriginal(boxBean.Config.Camera_Name); StoreManager.Store.vision.FeatureOriginal(boxBean.Config.Camera_Name,planName);
} }
} }
private void btnFcomp_Click(object sender, EventArgs e) private void btnFcomp_Click(object sender, EventArgs e)
{ {
string planName = StoreManager.PlanName_CloseDoor;
if (cmbPlanName.SelectedIndex.Equals(1))
{
planName = StoreManager.PlanName_OpenDoor;
}
if (StoreManager.Store.vision != null) if (StoreManager.Store.vision != null)
{ {
string date = boxBean.Name+DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + "-Comp"; string date = boxBean.Name+DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + "-Comp-"+planName;
StoreManager.Store.vision.SaveImage(boxBean.Config.Camera_Name,Application.StartupPath + @"\image\" , date, ImageFormat.Png); StoreManager.Store.vision.SaveImage(boxBean.Config.Camera_Name,Application.StartupPath + @"\image\" , date, ImageFormat.Png);
bool result = boxBean.VisionComp( out Dictionary<string, bool> exist); bool result = boxBean.VisionComp(planName, out Dictionary<string, bool> exist);
string str = result ? "有料\r\n" : "无料\r\n"; string str = result ? "有料\r\n" : "无料\r\n";
if (exist != null) if (exist != null)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!