From 06548959f857ca6a9eabaa695ab84dfa0ff73849 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期日, 10 八月 2025 14:03:11 +0800
Subject: [PATCH] 1. 添加侧面检的执行和报警参数 2. 修复配方界面分组按钮的显示异常问题
---
EdgeInspector_App/View/EdgeImageViewer.h | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/EdgeInspector_App/View/EdgeImageViewer.h b/EdgeInspector_App/View/EdgeImageViewer.h
index 476d73a..36e96c2 100644
--- a/EdgeInspector_App/View/EdgeImageViewer.h
+++ b/EdgeInspector_App/View/EdgeImageViewer.h
@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
#include <bitset>
#include "Global_Define.h"
#include "cv.h"
@@ -168,6 +168,7 @@
void SetHardwareSetting(CHardwareSettings* pHWSetting) {m_pHardware = pHWSetting;}
void SetRecipe(CGlassRecipe* pRecipe) {m_pRecipe = pRecipe;}
void SetPixelSize(double dPixelSizeX, double dPixelSizeY) {m_dPixelSizeX = dPixelSizeX, m_dPixelSizeY = dPixelSizeY;}
+ void SetImageSize(int nWidth, int nHeight, int nFrameCount) {m_nFrameWidth = nWidth; m_nFrameHeight = nHeight; m_nFrameCount = nFrameCount;}
private:
CRect m_rtWnd;
@@ -181,12 +182,12 @@
double m_dPixelSizeY; // Resolution Y
double m_dZoom;
- bitset<MAX_DISPLAY_SET> m_MenuStatus; // 拳搁 葛靛 惑怕
- EdgeViewer_ManualMeasure m_ManualMeasureStatus; // 荐悼 螟沥 惑怕
+ bitset<MAX_DISPLAY_SET> m_MenuStatus; // 鎷虫悂 钁涢潧 鎯戞��
+ EdgeViewer_ManualMeasure m_ManualMeasureStatus; // 鑽愭偧 铻熸播 鎯戞��
- CPoint m_ptDisplayStart_pxl; // View狼 0,0 狼 Pxl 困摹
- CPoint m_ptMousePos_Wnd; // Wnd狼 付快胶 困摹
- CPoint m_ptMousePos_Pxl; // Pixel狼 付快胶 困摹
+ CPoint m_ptDisplayStart_pxl; // View鐙� 0,0 鐙� Pxl 鍥版懝
+ CPoint m_ptMousePos_Wnd; // Wnd鐙� 浠樺揩鑳� 鍥版懝
+ CPoint m_ptMousePos_Pxl; // Pixel鐙� 浠樺揩鑳� 鍥版懝
public:
@@ -212,11 +213,11 @@
SIZE m_szImg;
SIZE m_szMark;
MANUAL_MEASURE m_ManualMeausre;
- CPoint m_ptMouseSaved; // Profile Save 扁瓷矫 荤侩
+ CPoint m_ptMouseSaved; // Profile Save 鎵佺摲鐭� 鑽や京
IViewInterface2Parent *m_pI2M;
- CRect m_rcROI; // 泅力 焊咯瘤绊 乐绰 康开
+ CRect m_rcROI; // 娉呭姏 鐒婂挴鐦ょ粖 涔愮话 搴峰紑
CFont m_sideFont;
CImage m_ImageMagnify;
EXECPTION_AREA m_refMark;
@@ -228,10 +229,10 @@
CGlassRecipe* m_pRecipe;
public:
- CPoint m_ptMouseCurrent; // 泅犁 付快胶 谅钎
+ CPoint m_ptMouseCurrent; // 娉呯妬 浠樺揩鑳� 璋呴拵
EXECPTION_AREA *m_pTracker;
CRect m_WndRect;
- POINT m_ptOrg; // 傈眉 捞固瘤俊辑 Display 矫累 谅钎
+ POINT m_ptOrg; // 鍌堢湁 鎹炲浐鐦や繆杈� Display 鐭疮 璋呴拵
int m_nModeTrackerVCR;
CPoint m_ptOldMouseVCR;
--
Gitblit v1.9.3