From 9020bfb6f86ff853d5d5b3cee882132a244232da Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 금, 24 11월 2023 15:33:29 +0900
Subject: [PATCH] Merge branch 'feature/#4528_CF_AOI_Review_Motor_Offset_기능_추가' into develop
---
Internal_Library/Include/CHCommonControls/GridCtrl.h | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Internal_Library/Include/CHCommonControls/GridCtrl.h b/Internal_Library/Include/CHCommonControls/GridCtrl.h
index bdbac1f..5d79e17 100644
--- a/Internal_Library/Include/CHCommonControls/GridCtrl.h
+++ b/Internal_Library/Include/CHCommonControls/GridCtrl.h
@@ -190,6 +190,10 @@
friend class CGridCell;
friend class CGridCellBase;
+public:
+ CCellID GetMergeCellID(CCellID cell);
+ int GetMergeCellHeight(CCellID cell);
+
// Construction
public:
CGridCtrl(int nRows = 0, int nCols = 0, int nFixedRows = 0, int nFixedCols = 0);
@@ -215,7 +219,8 @@
int GetColumnWidth(int nCol) const;
BOOL SetColumnWidth(int col, int width);
- BOOL GetCellOrigin(int nRow, int nCol, LPPOINT p);
+ BOOL GetCellOrigin(int nRow, int nCol, LPPOINT p);
+ BOOL GetCellOriginNoMerge(int nRow, int nCol, LPPOINT p);
BOOL GetCellOrigin(const CCellID& cell, LPPOINT p);
BOOL GetCellRect(int nRow, int nCol, LPRECT pRect);
BOOL GetCellRect(const CCellID& cell, LPRECT pRect);
@@ -359,7 +364,8 @@
// Grid cell Attributes
///////////////////////////////////////////////////////////////////////////////////
public:
- CGridCellBase* GetCell(int nRow, int nCol) const; // Get the actual cell!
+ CGridCellBase* GetCell(int nRow, int nCol) const; // Get the actual cell!
+ CGridCellBase* CGridCtrl::GetCell(CCellID cell);
void SetModified(BOOL bModified = TRUE, int nRow = -1, int nCol = -1);
BOOL GetModified(int nRow = -1, int nCol = -1);
@@ -817,6 +823,8 @@
bool m_AllowSelectRowInFixedCol;
public:
+ void MergeCells(int nStartRow, int nStartCol, int nEndRow, int nEndCol);
+ int GetMergeCellWidth(CCellID cell);
afx_msg void OnKillFocus(CWnd* pNewWnd);
};
@@ -888,6 +896,11 @@
return pRow->GetAt(m_arColOrder[nCol]);
}
+inline CGridCellBase * CGridCtrl::GetCell(CCellID cell)
+{
+ return GetCell(cell.row, cell.col);
+}
+
inline BOOL CGridCtrl::SetCell(int nRow, int nCol, CGridCellBase* pCell)
{
if (GetVirtualMode())
--
Gitblit v1.9.3