From 1c0ac1c7924efb8a2cb6962d3eda4126533a5ac8 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 14 七月 2025 16:55:55 +0800
Subject: [PATCH] 合并代码（代提交）
---
ENRIT/View/FrameImg.cpp | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ENRIT/View/FrameImg.cpp b/ENRIT/View/FrameImg.cpp
index 4d20c3a..e8e73af 100644
--- a/ENRIT/View/FrameImg.cpp
+++ b/ENRIT/View/FrameImg.cpp
@@ -87,6 +87,8 @@
m_st_GdiItem.colorOrange = RGB(250, 150, 0);
m_bMouseLDown = FALSE;
+
+ m_nBrushGray = 5;
}
CFrameImg::~CFrameImg()
@@ -1156,11 +1158,14 @@
x = int(m_ptMouseCurrent.x / m_dZoom)+ m_ptOrg.x;
y = int(m_ptMouseCurrent.y / m_dZoom);
+ if (0 > m_nBrushGray || 255 < m_nBrushGray)
+ m_nBrushGray = 5;
+
for(k = y -20 ; k < y+20 ; k++)
{
for(l = x -8; l < x + 8 ; l++)
{
- m_pBuffer[k * m_szImg.cx + l ] = 5;
+ m_pBuffer[k * m_szImg.cx + l ] = m_nBrushGray;
}
}
}
@@ -3333,6 +3338,7 @@
CPen pen(PS_SOLID, 1, RGB(255, 0, 0));
CPen pen_SearchArea(PS_DASH, 1, RGB(255, 0, 255));
CPen pen_Line(PS_DASH, 1, RGB(0, 255, 255));
+ CPen roiPen(PS_SOLID, 1, RGB(0, 255, 255));
CBrush brush_Null;
brush_Null.CreateStockObject(NULL_BRUSH);
@@ -3363,11 +3369,16 @@
}
}
else if (1 == nType) { //矩形
- if (4 == inf.eVision) {
- dc.SelectObject(&pen);
+ if (1 == inf.showROI) {
+ dc.SelectObject(&roiPen);
}
else {
- dc.SelectObject(&pen_SearchArea);
+ if (4 == inf.eVision) {
+ dc.SelectObject(&pen);
+ }
+ else {
+ dc.SelectObject(&pen_SearchArea);
+ }
}
CPoint pt0, pt1, pt;
pt0.x = (int)((inf.rectX1 - m_ptOrg.x) * m_dZoom);
--
Gitblit v1.9.3