~liuyang/MiniLED_ADM.git

			@@ -1,4 +1,4 @@
			#pragma once
			#pragma once
			#include <bitset>
			#include "Global_Define.h"
			#include "cv.h"
			@@ -130,6 +130,7 @@
			void UpdateView_MeasureSideDimensionResult(CDC* memDC);
			void UpdateView_Frame(CDC* memDC);
			void UpdateView_MousePoint(CDC* memDC);
			void UpdateView_SideRipThickness(CDC* memDC);

			public:
			CRect GetManualMeasureRect();
			@@ -168,6 +169,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 +183,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 +214,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 +230,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;