diff --git a/LaiPuLaser/CommonFlowMgr.cpp b/LaiPuLaser/CommonFlowMgr.cpp index a41646b..cca1474 100644 --- a/LaiPuLaser/CommonFlowMgr.cpp +++ b/LaiPuLaser/CommonFlowMgr.cpp @@ -692,8 +692,8 @@ void CCommonFlowMgr::WriteWorkFileExt(vector &LabVec) LabVec.push_back(CLab(LAB_SPECIAL_ONE_OBJ_CUT_TIMES, m_SpecialOneObjMarkCnt)); LabVec.push_back(CLab(LAB_ONE_AREA_CUT_TIMES, m_AreaCycleCnt)); LabVec.push_back(CLab(LAB_ONE_CUT_SPEED, m_CutSpeed)); - LabVec.push_back(CLab(LAB_ADJUST_OFFSET_X, m_ProductOffset.x)); - LabVec.push_back(CLab(LAB_ADJUST_OFFSET_Y, m_ProductOffset.y)); + LabVec.push_back(CLab(LAB_ADJUST_OFFSET_X, m_Jig1PrtOffset.x)); + LabVec.push_back(CLab(LAB_ADJUST_OFFSET_Y, m_Jig1PrtOffset.y)); } void CCommonFlowMgr::ReadWorkFile(CLabVecRang &LabVecRang) { @@ -730,14 +730,14 @@ void CCommonFlowMgr::ReadWorkFile(CLabVecRang &LabVecRang) CLab Lab = WorkFileMgr.FindLab(LabVecRang, LAB_ADJUST_OFFSET_X); if (Lab.m_ValType != _TYPE_NULL) { - m_ProductOffset.x = Lab.m_Double; + m_Jig1PrtOffset.x = Lab.m_Double; } } { CLab Lab = WorkFileMgr.FindLab(LabVecRang, LAB_ADJUST_OFFSET_Y); if (Lab.m_ValType != _TYPE_NULL) { - m_ProductOffset.y = Lab.m_Double; + m_Jig1PrtOffset.y = Lab.m_Double; } } } @@ -1723,13 +1723,15 @@ void CCommonFlowMgr::MoveSelObjToCamera(CProduct &Product) } #endif void CCommonFlowMgr::SetAdjustOffsetAll(Dbxy Offset) -{ - m_AdjustOffsetAll.x = Offset.x + m_ProductOffset.x; - m_AdjustOffsetAll.y = Offset.y + m_ProductOffset.y; - /*m_AdjustOffsetAll.x = m_ProductOffset.x; - m_AdjustOffsetAll.y = m_ProductOffset.y;*/ +{ + auto Jigoft = m_Jig1PrtOffset; + if (gCurLockTrackType == _ETrackType_Track_2) + Jigoft = m_Jig3PrtOffset; + + m_AdjustOffsetAll = Offset + Jigoft; + } void CCommonFlowMgr::ResetProductOffset() { - m_ProductOffset.x = m_ProductOffset.y = 0; + m_Jig1PrtOffset.x = m_Jig1PrtOffset.y = 0; } diff --git a/LaiPuLaser/CommonFlowMgr.h b/LaiPuLaser/CommonFlowMgr.h index 5bb8a6e..d8d6e60 100644 --- a/LaiPuLaser/CommonFlowMgr.h +++ b/LaiPuLaser/CommonFlowMgr.h @@ -98,8 +98,9 @@ private: int m_SpecialOneObjMarkCnt;//特殊刀增加的切割次数 bool m_bCollectSpecialObj;//是否正在收集特殊对象数据 int m_CutSpeed;//切割速度 - Dbxy m_ProductOffset;//针对产品的切割偏移 + Dbxy m_Jig1PrtOffset;//针对产品&治具的切割偏移(主界面调整) + Dbxy m_Jig3PrtOffset;//针对产品&治具的切割偏移(主界面调整) bool m_bConnectObj;//是否连接多个obj 数据 bool m_bBackToProductPt;//加工完成后是否返回取料点 diff --git a/LaiPuLaser/DlgSW_XL_Flow.cpp b/LaiPuLaser/DlgSW_XL_Flow.cpp index 4963d2a..3e45fb8 100644 --- a/LaiPuLaser/DlgSW_XL_Flow.cpp +++ b/LaiPuLaser/DlgSW_XL_Flow.cpp @@ -79,7 +79,9 @@ bool bTrack2ProductFlg = false;// bool bSaveLockFlg = false; CDlgSW_XL_Flow::CDlgSW_XL_Flow(CWnd* pParent /*=NULL*/) -{ + : m_Jig3PrtOft_x(0) + , m_Jig3PrtOft_y(0) +{ m_LaserSpeed =800; m_OneObjMarkCnt = 1;//切割次数 m_SpecialOneObjMarkCnt = 1;//特殊切割次数 @@ -129,9 +131,11 @@ void CDlgSW_XL_Flow::DoDataExchange(CDataExchange* pDX) DDX_Text(pDX, IDC_CUT_CNT, m_OneObjMarkCnt); DDX_Text(pDX, IDC_SPECIAL_CUT_CNT, m_SpecialOneObjMarkCnt); DDX_Text(pDX, IDC_AREA_CUT_CNT, m_MarkAreaCutCount); - DDX_Text(pDX, IDC_CUT_OFFSET_X, m_ProductOffset.x); - DDX_Text(pDX, IDC_CUT_OFFSET_Y, m_ProductOffset.y); + DDX_Text(pDX, IDC_CUT_OFFSET_X, m_Jig1PrtOft_x); + DDX_Text(pDX, IDC_CUT_OFFSET_Y, m_Jig1PrtOft_y); DDX_Control(pDX, IDC_BOOL_SEL_MARK2, m_SetMarkPosBtn); + DDX_Text(pDX, IDC_CUT_OFFSET_X2, m_Jig3PrtOft_x); + DDX_Text(pDX, IDC_CUT_OFFSET_Y2, m_Jig3PrtOft_y); } BOOL CDlgSW_XL_Flow::OnInitDialog() @@ -510,7 +514,23 @@ void CDlgSW_XL_Flow::UpdateCutPar() m_OneObjMarkCnt = gCommonFlowMgr->m_OneObjMarkCnt;//切割次数 m_SpecialOneObjMarkCnt = gCommonFlowMgr->m_SpecialOneObjMarkCnt;//切割次数 m_MarkAreaCutCount = gCommonFlowMgr->GetAreaCycleCnt();//循环次数 - m_ProductOffset = gCommonFlowMgr->m_ProductOffset;//针对产品的切割偏移 + + m_Jig1PrtOft_x = gCommonFlowMgr->m_Jig1PrtOffset.x;//针对产品的切割偏移 + m_Jig1PrtOft_y = gCommonFlowMgr->m_Jig1PrtOffset.y;//针对产品的切割偏移 + { + CString path; + gProgram_SZ_XL->GetDxfParFilePath("pjo", path); + CSmartArchive ar(path, false); + ar + m_Jig1PrtOft_x; + ar + m_Jig1PrtOft_y; + ar + m_Jig3PrtOft_x; + ar + m_Jig3PrtOft_y; + gCommonFlowMgr->m_Jig1PrtOffset.x = m_Jig1PrtOft_x; + gCommonFlowMgr->m_Jig1PrtOffset.y = m_Jig1PrtOft_y; + gCommonFlowMgr->m_Jig3PrtOffset.x= m_Jig3PrtOft_x; + gCommonFlowMgr->m_Jig3PrtOffset.y = m_Jig3PrtOft_y; + } + UpdateData(FALSE); } @@ -526,12 +546,29 @@ void CDlgSW_XL_Flow::OnBnClickedSavePar() gCommonFlowMgr->m_OneObjMarkCnt = m_OneObjMarkCnt;//切割次数 gCommonFlowMgr->m_SpecialOneObjMarkCnt = m_SpecialOneObjMarkCnt;//切割次数 gCommonFlowMgr->m_AreaCycleCnt = (m_MarkAreaCutCount);//区域循环次数 - gCommonFlowMgr->m_ProductOffset = m_ProductOffset;//针对产品的切割偏移 - + + gCommonFlowMgr->m_Jig1PrtOffset.x = m_Jig1PrtOft_x;//针对产品的切割偏移 + gCommonFlowMgr->m_Jig1PrtOffset.y = m_Jig1PrtOft_y;//针对产品的切割偏移 + + gCommonFlowMgr->m_Jig3PrtOffset.x = m_Jig3PrtOft_x;//针对产品的切割偏移 + gCommonFlowMgr->m_Jig3PrtOffset.y = m_Jig3PrtOft_y;//针对产品的切割偏移 + + { + CString path; + gProgram_SZ_XL->GetDxfParFilePath("pjo", path); + CSmartArchive ar(path, true); + ar + m_Jig1PrtOft_x; + ar + m_Jig1PrtOft_y; + ar + m_Jig3PrtOft_x; + ar + m_Jig3PrtOft_y; + } + + //保存dxf 对应的切割参数 gProgram_SZ_XL->SaveCutPar(); //应用参数时服务端重新打开当前文件 + gClientMgr->SendCmd_OpenFile(gProgramCutMgr->GetCurOpenFileFullName()); @@ -558,6 +595,8 @@ void CDlgSW_XL_Flow::OpenWorkFile(bool bDxf) //area移动到中心 gMarkAreaMgr->MoveAllAreaToTargetPt(Dbxy(0,0)); GetCurViewPtr()->DoZoomFull(); + + } void CDlgSW_XL_Flow::OnBnClickedOpenDxf() diff --git a/LaiPuLaser/DlgSW_XL_Flow.h b/LaiPuLaser/DlgSW_XL_Flow.h index e6ed38f..7326ae5 100644 --- a/LaiPuLaser/DlgSW_XL_Flow.h +++ b/LaiPuLaser/DlgSW_XL_Flow.h @@ -64,8 +64,13 @@ private: int m_MarkAreaCutCount;//区域循环切割次数 int m_OneObjMarkCnt;//切割次数 int m_SpecialOneObjMarkCnt;//特殊切割次数 - Dbxy m_ProductOffset;//针对产品的切割偏移 - + //Dbxy m_ProductOffset;//针对产品的切割偏移 + double m_Jig1PrtOft_x=0;//针对产品的切割偏移 + double m_Jig1PrtOft_y=0;//针对产品的切割偏移 + // 治具3产品偏移x + double m_Jig3PrtOft_x; + // 治具3产品偏移y + double m_Jig3PrtOft_y; vector KnownFileNameVec;//已知的文件名集合 public: afx_msg void OnBnClickedStartBtn1(); @@ -106,4 +111,5 @@ public: afx_msg void OnBnClickedAdjustProductPos(); afx_msg void OnBnClickedDisableServer(); CMyBttom m_SetMarkPosBtn; + }; diff --git a/LaiPuLaser/HawkvisCtrl.ocx b/LaiPuLaser/HawkvisCtrl.ocx index 04da4c7..be0fb6c 100644 Binary files a/LaiPuLaser/HawkvisCtrl.ocx and b/LaiPuLaser/HawkvisCtrl.ocx differ diff --git a/LaiPuLaser/KnownFileNameVec b/LaiPuLaser/KnownFileNameVec index 873142a..31e1fe6 100644 Binary files a/LaiPuLaser/KnownFileNameVec and b/LaiPuLaser/KnownFileNameVec differ diff --git a/LaiPuLaser/LaiPuLaser.rc b/LaiPuLaser/LaiPuLaser.rc index ac87040..28225b3 100644 Binary files a/LaiPuLaser/LaiPuLaser.rc and b/LaiPuLaser/LaiPuLaser.rc differ diff --git a/LaiPuLaser/Program_SZ_XL.h b/LaiPuLaser/Program_SZ_XL.h index 4095ad4..d5ba4a0 100644 --- a/LaiPuLaser/Program_SZ_XL.h +++ b/LaiPuLaser/Program_SZ_XL.h @@ -52,8 +52,9 @@ public: Dbxy GetNPOffsetT1() { return m_NPCatchOffset1; }; //获取轨道1,新加片位置偏移 Dbxy GetNPOffsetT2() { return m_NPCatchOffset2; }; //获取轨道2,新加片位置偏移 -private: + bool GetDxfParFilePath(CString Suffix,CString &FilePath); +private: void ReadLoadPlcMsgExt(); void InitLoadDeviceCom(); void ResetLoadUnloadSignal(); @@ -108,8 +109,8 @@ private: Dbxy m_Jig1Scale=Dbxy(1,1); //治具1自定义比率(振镜) Dbxy m_Jig3Scale = Dbxy(1, 1);//治具3自定义比率(振镜) - Dbxy m_Jig1MarkOffset;//治具1的加工振镜偏移 - Dbxy m_Jig3MarkOffset;//治具3的加工振镜偏移 + Dbxy m_Jig1MarkOffset;//治具1的加工振镜偏移(属性页调整,应对硬件偏移) + Dbxy m_Jig3MarkOffset;//治具3的加工振镜偏移(属性页调整,应对硬件偏移) double m_Track1DangerCoordStart;//轨道1 的危险范围start double m_Track1DangerCoordEnd;//轨道1 的危险范围end diff --git a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.h b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.h index a606451..8340c74 100644 --- a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.h +++ b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.h @@ -135,3 +135,4 @@ public: extern CTrackWorkFlow gTrackWorkFlow1;//轨道1 的流程管理 extern CTrackWorkFlow gTrackWorkFlow2;//轨道2 的流程管理 +extern ETrackType gCurLockTrackType; diff --git a/LaiPuLaser/hawkvisctrlctrl1.cpp b/LaiPuLaser/hawkvisctrlctrl1.cpp index 0ba6843..ce7246c 100644 --- a/LaiPuLaser/hawkvisctrlctrl1.cpp +++ b/LaiPuLaser/hawkvisctrlctrl1.cpp @@ -1,6 +1,6 @@ -// 计算机生成了由 Microsoft Visual C++ 创建的 IDispatch 包装器类 +// 计算机生成了由 Microsoft Visual C++ 创建的 IDispatch 包装类 -// 注意: 不要修改此文件的内容。 如果此类由 +// 注意: 不要修改此文件的内容。如果此类由 // Microsoft Visual C++ 重新生成，您的修改将被覆盖。 diff --git a/LaiPuLaser/hawkvisctrlctrl1.h b/LaiPuLaser/hawkvisctrlctrl1.h index 372e786..d6cbc24 100644 --- a/LaiPuLaser/hawkvisctrlctrl1.h +++ b/LaiPuLaser/hawkvisctrlctrl1.h @@ -1,12 +1,12 @@ #pragma once -// 计算机生成了由 Microsoft Visual C++ 创建的 IDispatch 包装器类 +// 计算机生成了由 Microsoft Visual C++ 创建的 IDispatch 包装类 -// 注意: 不要修改此文件的内容。 如果此类由 +// 注意: 不要修改此文件的内容。如果此类由 // Microsoft Visual C++ 重新生成，您的修改将被覆盖。 ///////////////////////////////////////////////////////////////////////////// -// CHawkvisctrlctrl1 包装器类 +// CHawkvisctrlctrl1 包装类 class CHawkvisctrlctrl1 : public CWnd { @@ -247,6 +247,44 @@ public: InvokeHelper(0x42, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, in_center_x, in_center_y, in_radius, interval, startAngle, endAngle, measurePosCount, fit_position, sigma, threshold, riowidth, out_center_x, out_enter_y, out_radius); return result; } + BOOL HV_GetOneFrame() + { + BOOL result; + InvokeHelper(0x43, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); + return result; + } + BOOL HV_GetContinueFrame() + { + BOOL result; + InvokeHelper(0x44, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); + return result; + } + BOOL HV_OpenCamera() + { + BOOL result; + InvokeHelper(0x45, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); + return result; + } + BOOL HV_CloseCamera() + { + BOOL result; + InvokeHelper(0x46, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); + return result; + } + BOOL HV_SetCameraExpTime(long nExpTime) + { + BOOL result; + static BYTE parms[] = VTS_I4 ; + InvokeHelper(0x47, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nExpTime); + return result; + } + BOOL HV_GetCameraExpTimeRange(long * pnMax, long * pnMin) + { + BOOL result; + static BYTE parms[] = VTS_PI4 VTS_PI4 ; + InvokeHelper(0x48, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, pnMax, pnMin); + return result; + } BOOL CrossLineLine(long l1_point1_x, long l1_point1_y, long l1_point2_x, long l1_point2_y, long l2_point1_x, long l2_point1_y, long l2_point2_x, long l2_point2_y, double * cross_x, double * cross_y) { BOOL result; @@ -261,11 +299,11 @@ public: InvokeHelper(0x4a, DISPATCH_METHOD, VT_UI4, (void*)&result, parms, start_x, start_y, end_x, end_y, nLineColor); return result; } - BOOL DisplayCross(long CenterX, long CenterY, long Thickness, long Length, long LineColor, BOOL bFill, long nFillColor) + BOOL DisplayCross(long centre_x, long centre_y, long thickness, long lenght, long nLineColor, BOOL bFill, long nFillColor) { BOOL result; static BYTE parms[] = VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_BOOL VTS_I4 ; - InvokeHelper(0x4b, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, CenterX, CenterY, Thickness, Length, LineColor, bFill, nFillColor); + InvokeHelper(0x4b, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, centre_x, centre_y, thickness, lenght, nLineColor, bFill, nFillColor); return result; } BOOL InvalidateAndUpdateControl() @@ -405,6 +443,34 @@ public: InvokeHelper(0x60, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, elem_width, elem_height, modulus); return result; } + BOOL HV_EnumNetworkAdapters(long * adaptersCount) + { + BOOL result; + static BYTE parms[] = VTS_PI4 ; + InvokeHelper(0x61, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, adaptersCount); + return result; + } + BOOL HV_QueryDevDescribeByIdx(long adapterIdx, BSTR * describe) + { + BOOL result; + static BYTE parms[] = VTS_I4 VTS_PBSTR ; + InvokeHelper(0x62, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, adapterIdx, describe); + return result; + } + BOOL HV_SelectAdapter(LPCTSTR describe) + { + BOOL result; + static BYTE parms[] = VTS_BSTR ; + InvokeHelper(0x63, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, describe); + return result; + } + BOOL HV_SetPacketSize(long nPacketSize) + { + BOOL result; + static BYTE parms[] = VTS_I4 ; + InvokeHelper(0x64, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nPacketSize); + return result; + } void RotateLeft() { InvokeHelper(0x65, DISPATCH_METHOD, VT_EMPTY, NULL, NULL); @@ -634,219 +700,6 @@ public: InvokeHelper(0x89, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nMin, nMax); return result; } - BOOL Measure1D(long StartX, long StartY, long EndX, long EndY, long threshold, double sigma, long ROI, long Transition, long * Count, VARIANT * ResultX, VARIANT * ResultY, VARIANT * ResultAmplitude, VARIANT * ResultDistance) - { - BOOL result; - static BYTE parms[] = VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_R8 VTS_I4 VTS_I4 VTS_PI4 VTS_PVARIANT VTS_PVARIANT VTS_PVARIANT VTS_PVARIANT ; - InvokeHelper(0x8a, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, StartX, StartY, EndX, EndY, threshold, sigma, ROI, Transition, Count, ResultX, ResultY, ResultAmplitude, ResultDistance); - return result; - } - BOOL MeasureExtremum(long CenterX, long CenterY, long LongEdge, long ShortEdge, float angle, long threshold, long ROI, float sigma, long Transition, long StartEdge, long gap, float * ResultNearestX, float * ResultNearestY, float * ResultFarthestX, float * ResultFarthestY) - { - BOOL result; - static BYTE parms[] = VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_R4 VTS_I4 VTS_I4 VTS_R4 VTS_I4 VTS_I4 VTS_I4 VTS_PR4 VTS_PR4 VTS_PR4 VTS_PR4 ; - InvokeHelper(0x8b, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, CenterX, CenterY, LongEdge, ShortEdge, angle, threshold, ROI, sigma, Transition, StartEdge, gap, ResultNearestX, ResultNearestY, ResultFarthestX, ResultFarthestY); - return result; - } - void DisplayRotateRectangle(long CenterX, long CenterY, long LongEdge, long ShortEdge, float angle, long Thickness, unsigned long LineColor) - { - static BYTE parms[] = VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_R4 VTS_I4 VTS_UI4 ; - InvokeHelper(0x8c, DISPATCH_METHOD, VT_EMPTY, NULL, parms, CenterX, CenterY, LongEdge, ShortEdge, angle, Thickness, LineColor); - } - unsigned long DisplayRotateLine(long CenterX, long CenterY, float angle, long Length, long Thickness, unsigned long LineColor) - { - unsigned long result; - static BYTE parms[] = VTS_I4 VTS_I4 VTS_R4 VTS_I4 VTS_I4 VTS_UI4 ; - InvokeHelper(0x8d, DISPATCH_METHOD, VT_UI4, (void*)&result, parms, CenterX, CenterY, angle, Length, Thickness, LineColor); - return result; - } - void DisplayArrow(long StartX, long StartY, long EndX, long EndY, unsigned long Thickness, unsigned long LineColor, float ArrowHeadRate) - { - static BYTE parms[] = VTS_I4 VTS_I4 VTS_I4 VTS_I4 VTS_UI4 VTS_UI4 VTS_R4 ; - InvokeHelper(0x8e, DISPATCH_METHOD, VT_EMPTY, NULL, parms, StartX, StartY, EndX, EndY, Thickness, LineColor, ArrowHeadRate); - } - void SetZoomParams(long OrgX, long OrgY, float Scale) - { - static BYTE parms[] = VTS_I4 VTS_I4 VTS_R4 ; - InvokeHelper(0x8f, DISPATCH_METHOD, VT_EMPTY, NULL, parms, OrgX, OrgY, Scale); - } - BOOL EditDataFilter(unsigned long FilterID, unsigned short FilterType, unsigned long width, float sigma) - { - BOOL result; - static BYTE parms[] = VTS_UI4 VTS_UI2 VTS_UI4 VTS_R4 ; - InvokeHelper(0x90, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, FilterID, FilterType, width, sigma); - return result; - } - BOOL DataFiltering(unsigned long FilterID, double inData, double * outData) - { - BOOL result; - static BYTE parms[] = VTS_UI4 VTS_R8 VTS_PR8 ; - InvokeHelper(0x91, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, FilterID, inData, outData); - return result; - } - void DeleteFilter(unsigned long FilterID) - { - static BYTE parms[] = VTS_UI4 ; - InvokeHelper(0x92, DISPATCH_METHOD, VT_EMPTY, NULL, parms, FilterID); - } - void ResetFilter(unsigned long FilterID) - { - static BYTE parms[] = VTS_UI4 ; - InvokeHelper(0x93, DISPATCH_METHOD, VT_EMPTY, NULL, parms, FilterID); - } - void GetZoomParams(long * OrgX, long * OrgY, float * Scale) - { - static BYTE parms[] = VTS_PI4 VTS_PI4 VTS_PR4 ; - InvokeHelper(0x94, DISPATCH_METHOD, VT_EMPTY, NULL, parms, OrgX, OrgY, Scale); - } - BOOL AVT_APISystemStartUp() - { - BOOL result; - InvokeHelper(0x95, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); - return result; - } - BOOL AVT_APISystemShutDown() - { - BOOL result; - InvokeHelper(0x96, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); - return result; - } - BOOL AVT_EnumCameras(long * nCamerasCount) - { - BOOL result; - static BYTE parms[] = VTS_PI4 ; - InvokeHelper(0x97, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nCamerasCount); - return result; - } - BOOL AVT_QueryCameraIDByIdx(long nIndex, BSTR * CameraID) - { - BOOL result; - static BYTE parms[] = VTS_I4 VTS_PBSTR ; - InvokeHelper(0x98, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nIndex, CameraID); - return result; - } - BOOL AVT_SelectCameraDeviceByIdx(long nIndex) - { - BOOL result; - static BYTE parms[] = VTS_I4 ; - InvokeHelper(0x99, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nIndex); - return result; - } - BOOL AVT_SelectCameraDeviceByCameraID(LPCTSTR CameraID) - { - BOOL result; - static BYTE parms[] = VTS_BSTR ; - InvokeHelper(0x9a, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, CameraID); - return result; - } - BOOL AVT_OpenCamera() - { - BOOL result; - InvokeHelper(0x9b, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); - return result; - } - BOOL AVT_CloseCamera() - { - BOOL result; - InvokeHelper(0x9c, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); - return result; - } - BOOL AVT_GetOneFrame() - { - BOOL result; - InvokeHelper(0x9d, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); - return result; - } - BOOL AVT_GetContinueFrames() - { - BOOL result; - InvokeHelper(0x9e, DISPATCH_METHOD, VT_BOOL, (void*)&result, NULL); - return result; - } - BOOL AVT_SetImageReverse(BOOL bReverseXStatus, BOOL bReverseYStatus) - { - BOOL result; - static BYTE parms[] = VTS_BOOL VTS_BOOL ; - InvokeHelper(0x9f, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, bReverseXStatus, bReverseYStatus); - return result; - } - BOOL AVT_SetExposureTime(long nExpTime) - { - BOOL result; - static BYTE parms[] = VTS_I4 ; - InvokeHelper(0xa0, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nExpTime); - return result; - } - BOOL AVT_GetExposureTime(long * nExpTime) - { - BOOL result; - static BYTE parms[] = VTS_PI4 ; - InvokeHelper(0xa1, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nExpTime); - return result; - } - BOOL AVT_GetExposureTimeRange(long * nExpTimeMin, long * nExpTimeMax) - { - BOOL result; - static BYTE parms[] = VTS_PI4 VTS_PI4 ; - InvokeHelper(0xa2, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nExpTimeMin, nExpTimeMax); - return result; - } - BOOL AVT_SetGain(double dbGain) - { - BOOL result; - static BYTE parms[] = VTS_R8 ; - InvokeHelper(0xa3, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, dbGain); - return result; - } - BOOL AVT_GetGain(double * dbGain) - { - BOOL result; - static BYTE parms[] = VTS_PR8 ; - InvokeHelper(0xa4, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, dbGain); - return result; - } - BOOL AVT_GetGainRange(double * dbGainMin, double * dbGainMax) - { - BOOL result; - static BYTE parms[] = VTS_PR8 VTS_PR8 ; - InvokeHelper(0xa5, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, dbGainMin, dbGainMax); - return result; - } - BOOL AVT_SetGainAutoStatus(BOOL bStatus) - { - BOOL result; - static BYTE parms[] = VTS_BOOL ; - InvokeHelper(0xa6, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, bStatus); - return result; - } - BOOL AVT_GetGainAutoStatus(BOOL * bStatus) - { - BOOL result; - static BYTE parms[] = VTS_PBOOL ; - InvokeHelper(0xa7, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, bStatus); - return result; - } - BOOL AVT_SetGainAutoRange(double dbGainAutoMin, double dbGainAutoMax) - { - BOOL result; - static BYTE parms[] = VTS_R8 VTS_R8 ; - InvokeHelper(0xa8, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, dbGainAutoMin, dbGainAutoMax); - return result; - } - BOOL AVT_SetDSPSubregion(long nRectTop, long nRectBottom, long nRectLeft, long nRectRight) - { - BOOL result; - static BYTE parms[] = VTS_I4 VTS_I4 VTS_I4 VTS_I4 ; - InvokeHelper(0xa9, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, nRectTop, nRectBottom, nRectLeft, nRectRight); - return result; - } - BOOL RemoveGraphicObject(unsigned long ObjID) - { - BOOL result; - static BYTE parms[] = VTS_UI4 ; - InvokeHelper(0xaa, DISPATCH_METHOD, VT_BOOL, (void*)&result, parms, ObjID); - return result; - } // Properties // diff --git a/LaiPuLaser/hlp/LaiPuLaser.chm b/LaiPuLaser/hlp/LaiPuLaser.chm index 1195a89..0cb8e13 100644 Binary files a/LaiPuLaser/hlp/LaiPuLaser.chm and b/LaiPuLaser/hlp/LaiPuLaser.chm differ diff --git a/LaiPuLaser/resource.h b/LaiPuLaser/resource.h index eb653ad..f58e384 100644 Binary files a/LaiPuLaser/resource.h and b/LaiPuLaser/resource.h differ