From 1e751a5eb3c23d932b5de94456b5a8741f28c7cc Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 16 八月 2025 17:37:49 +0800
Subject: [PATCH] 1. 修复离线测试设置错误的扫描个数，应该设置的是需要扫描的个数（非相机个数）
---
EdgeInspector_App/View/ViewMain_ScanImage.h | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/EdgeInspector_App/View/ViewMain_ScanImage.h b/EdgeInspector_App/View/ViewMain_ScanImage.h
index 0eb5fe9..4532081 100644
--- a/EdgeInspector_App/View/ViewMain_ScanImage.h
+++ b/EdgeInspector_App/View/ViewMain_ScanImage.h
@@ -1,9 +1,9 @@
-#pragma once
+锘�#pragma once
//#include "FrameImg.h"
#include "EdgeImageViewer.h"
#include "afxcmn.h"
-// CViewScanImage 措拳 惑磊涝聪促.
+// CViewScanImage 鎺嫵 鎯戠娑濊仾淇�.
class CHardwareSettings;
class CGlass_Data;
@@ -12,20 +12,32 @@
DECLARE_DYNAMIC(CViewMain_ScanImage)
public:
- CViewMain_ScanImage(CWnd* pParent = NULL); // 钎霖 积己磊涝聪促.
+ CViewMain_ScanImage(CWnd* pParent = NULL); // 閽庨湒 绉繁纾婃稘鑱績.
virtual ~CViewMain_ScanImage();
-// 措拳 惑磊 单捞磐涝聪促.
+// 鎺嫵 鎯戠 鍗曟崬纾愭稘鑱績.
enum { IDD = IDD_MAIN_VIEW_SCANIMAGE };
protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 瘤盔涝聪促.
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鐦ょ洈娑濊仾淇�.
virtual BOOL OnInitDialog();
virtual BOOL PreTranslateMessage(MSG* pMsg);
afx_msg void OnPaint();
afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+ afx_msg void OnBnClickedUpdnWidth1();
+ afx_msg void OnBnClickedUpdnWidth2();
+ afx_msg void OnBnClickedUpdnWidth3();
+ afx_msg void OnBnClickedUpdnWidth4();
+ afx_msg void OnBnClickedUpdnWidth6();
+ afx_msg void OnBnClickedUpdnWidth5();
+ afx_msg void OnBnClickedUpdnWidth7();
+ afx_msg void OnBnClickedUpdnWidth8();
+ afx_msg void OnBnClickedUpdnWidth9();
+ afx_msg void OnBnClickedUpdnWidth10();
+ afx_msg void OnBnClickedUpdnWidth11();
+ afx_msg void OnBnClickedUpdnWidth12();
afx_msg void OnBnClickedBtnLoad1();
afx_msg void OnBnClickedBtnSave1();
afx_msg void OnBnClickedBtnLoad2();
@@ -34,17 +46,6 @@
afx_msg void OnBnClickedBtnSave3();
afx_msg void OnBnClickedBtnLoad4();
afx_msg void OnBnClickedBtnSave4();
- afx_msg void OnNMCustomdrawSliderZoom(NMHDR *pNMHDR, LRESULT *pResult);
- afx_msg void OnNMReleasedcaptureSliderZoom(NMHDR *pNMHDR, LRESULT *pResult);
- afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt);
- afx_msg void OnBnClickedUpdnWidth1();
- afx_msg void OnBnClickedUpdnWidth2();
- afx_msg void OnBnClickedUpdnWidth3();
- afx_msg void OnBnClickedUpdnWidth4();
- afx_msg void OnBnClickedUpdnWidth6();
- afx_msg void OnBnClickedUpdnWidth5();
- afx_msg void OnBnClickedUpdnWidth7();
- afx_msg void OnBnClickedUpdnWidth8();
afx_msg void OnBnClickedBtnLoad5();
afx_msg void OnBnClickedBtnSave5();
afx_msg void OnBnClickedBtnLoad6();
@@ -53,8 +54,17 @@
afx_msg void OnBnClickedBtnSave7();
afx_msg void OnBnClickedBtnLoad8();
afx_msg void OnBnClickedBtnSave8();
- afx_msg void OnBnClickedButton1();
- afx_msg void OnBnClickedButton2();
+ afx_msg void OnBnClickedBtnLoad9();
+ afx_msg void OnBnClickedBtnSave9();
+ afx_msg void OnBnClickedBtnLoad10();
+ afx_msg void OnBnClickedBtnSave10();
+ afx_msg void OnBnClickedBtnLoad11();
+ afx_msg void OnBnClickedBtnSave11();
+ afx_msg void OnBnClickedBtnLoad12();
+ afx_msg void OnBnClickedBtnSave12();
+ afx_msg void OnNMCustomdrawSliderZoom(NMHDR *pNMHDR, LRESULT *pResult);
+ afx_msg void OnNMReleasedcaptureSliderZoom(NMHDR *pNMHDR, LRESULT *pResult);
+ afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt);
afx_msg void OnBnClickedCheckAutoDefectView();
afx_msg void OnBnClickedBtnCommunication();
afx_msg void OnBnClickedCheckAutoView();
@@ -74,6 +84,7 @@
void ViewRefresh(PROG_MSG ProcMsg);
protected:
+ void OnBnClickedBtnImgRip();
void OnBnClickedBtnImgShort();
void OnBnClickedBtnImgLong();
void OnBnClickedBtnImgBoth();
@@ -93,7 +104,10 @@
BOOL ManualThreadStart(int nCmd,int nIndex = -1);
static UINT ManualProcessAll(LPVOID pParam);
void SaveFullImage(int nViewIndex);
- void SaveFullImageAll();
+ void SaveFullImageAll();
+ void LayoutCameraGroup(int nStartIdx, int nCount, CPoint& pt, int nImgWidth, int nImgHeight, int nInfo, int nHScroll);
+ void ShowCameraGroup(int nStartIdx, int nCount, BOOL bShow);
+ CCameraSettings* GetCameraSettingsByViewIndex(int nViewIndex);
protected:
CMFCButton m_btnLoad[MAX_PANEL_SIDE * UPDN_TYPE];
@@ -107,9 +121,9 @@
CSliderCtrl m_sliderZoom;
double m_dZoom;
- CScrollBar m_ctrlScrollV[MAX_PANEL_SIDE * UPDN_TYPE],m_ctrlScrollH[MAX_PANEL_SIDE * UPDN_TYPE];
+ CScrollBar m_ctrlScrollV[MAX_PANEL_SIDE * UPDN_TYPE];
+ CScrollBar m_ctrlScrollH[MAX_PANEL_SIDE * UPDN_TYPE];
BOOL m_bWithScroll[MAX_PANEL_SIDE * UPDN_TYPE];
- //CFrameImg m_frameImg[MAX_PANEL_SIDE * UPDN_TYPE];
CEdgeImageViewer m_frameImg[MAX_PANEL_SIDE * UPDN_TYPE];
int m_nShowSelect;
BOOL m_bInitDlg;
--
Gitblit v1.9.3