From c220de6f70051797e9d8b371830d06def9dc9cbd Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 30 6월 2022 11:02:23 +0900
Subject: [PATCH] 검사기 RawMessenger 동기화
---
ReviewHistory/ReveiwHistory/akImageView.cpp | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/ReviewHistory/ReveiwHistory/akImageView.cpp b/ReviewHistory/ReveiwHistory/akImageView.cpp
index d8f6e8f..fda76d2 100644
--- a/ReviewHistory/ReveiwHistory/akImageView.cpp
+++ b/ReviewHistory/ReveiwHistory/akImageView.cpp
@@ -183,8 +183,13 @@
pOldBitmap = BitmapDC.SelectObject(&pImageData->m_Bitmap);
- double dOnePixelX = (double)m_rectData.Width() / m_AxisX.GetRangeValue();
- double dOnePixelY = (double)m_rectData.Height() / m_AxisY.GetRangeValue();
+ /*< LYW 20211018 - #3684 MOD Start >*/
+ m_dOnePixelX = m_AxisX.GetRangeValue() / (double)m_rectData.Width();
+ m_dOnePixelY = m_AxisY.GetRangeValue() / (double)m_rectData.Height();
+ /*< LYW 20211018 - #3684 MOD End >*/
+ /*< Origin Code >*/
+ //double dOnePixelX = (double)m_rectData.Width() / m_AxisX.GetRangeValue();
+ //double dOnePixelY = (double)m_rectData.Height() / m_AxisY.GetRangeValue();
if (1)//dOnePixelX > 2 && dOnePixelY > 2)
{
@@ -263,8 +268,11 @@
//글라스 외각선 그리기 태현[2016/3/23]
{
pOldBrush = (CBrush*)pDC->SelectObject(&BrushGlass);
- CPen pen;
+ CPen pen, CenterLinePen;
pen.CreatePen(PS_SOLID, 1, RGB(64, 191, 79));
+ /*< LYW 20211029 - #3684 ADD Start >*/
+ CenterLinePen.CreatePen(PS_DOT, 1, RGB(255, 0, 0));
+ /*< LYW 20211029 - #3684 ADD End >*/
pDC->SelectObject(&pen);
pDC->MoveTo(GetWindowPosX(rectGlass.left), GetWindowPosY(rectGlass.top));
@@ -273,7 +281,16 @@
pDC->LineTo(GetWindowPosX(rectGlass.left), GetWindowPosY(rectGlass.bottom));
pDC->LineTo(GetWindowPosX(rectGlass.left), GetWindowPosY(rectGlass.top));
+ /*< LYW 20211029 - #3684 ADD Start >*/
+ pDC->SelectObject(&CenterLinePen);
+ pDC->MoveTo(GetWindowPosX((rectGlass.left + rectGlass.right) / 2), GetWindowPosY(rectGlass.top));
+ pDC->LineTo(GetWindowPosX((rectGlass.left + rectGlass.right) / 2), GetWindowPosY(rectGlass.bottom));
+ pDC->MoveTo(GetWindowPosX(rectGlass.left), GetWindowPosY((rectGlass.top + rectGlass.bottom) / 2));
+ pDC->LineTo(GetWindowPosX(rectGlass.right), GetWindowPosY((rectGlass.top + rectGlass.bottom) / 2));
+ /*< LYW 20211029 - #3684 ADD End >*/
+
pDC->SelectObject(&pOldBrush);
+
}
}
pDC->SelectClipRgn(NULL);
@@ -312,9 +329,19 @@
CRect rect;
this->GetClientRect(rect);
+
+ /*< LYW 20211018 - #3684 ADD Start >*/
+ CPoint Center;
+ Center.x = rect.Width() / 2;
+ Center.y = rect.Height() / 2;
+ /*< LYW 20211018 - #3684 ADD End >*/
- point.x += m_nHScroll;
- point.y += m_nVScroll;
+ /*< LYW 20211018 - #3684 MOD Start >*/
+ point.x = (point.x - Center.x) * m_dOnePixelX;
+ point.y = (point.y - Center.y) * m_dOnePixelY;
+ /*< LYW 20211018 - #3684 MOD End >*/
+ /*< Origin Code >*/
+ GetParent()->PostMessage(UM_FORMMAP_IMAGEMOUSECLICK, static_cast<WPARAM>(0), MAKELPARAM(point.x, point.y));
/*m_pParentWnd->SendMessage(WM_LBUTTONDOWN, static_cast<WPARAM>(nFlags), MAKELPARAM(point.x, point.y));*/
}
break;
--
Gitblit v1.9.3