From 82fa042c39528f854c40c7625a6456b62277c42b Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期三, 27 十一月 2024 17:54:05 +0800
Subject: [PATCH] 1.修复字体最大范围2.修复如果最后一页数据不足则隐藏
---
SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp b/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
index 1185f82..62a2d2c 100644
--- a/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
@@ -112,6 +112,7 @@
// 鏍规嵁鎺т欢楂樺害鍔ㄦ�佽皟鏁村瓧浣撳ぇ灏�
int fontSize = nHeight / 2;
if (fontSize < 8) fontSize = 8;
+ if (fontSize < 24) fontSize = 24;
// 鑾峰彇鎴栧垱寤哄瓧浣�
CFont* pFont = GetOrCreateFont(fontSize);
@@ -215,18 +216,40 @@
int startIndex = (m_nCurrentPage - 1) * m_nRowsPerPage;
int endIndex = min(startIndex + m_nRowsPerPage, static_cast<int>(m_displayData.size()));
- for (int i = startIndex; i < endIndex; ++i)
- {
- const auto& data = m_displayData[i];
- int row = i - startIndex;
+ for (int i = 0; i < m_nRowsPerPage; ++i) {
+ int row = i;
- m_staticControls[row * m_nCols + 0]->SetWindowText(_T("OFF"));
- m_staticControls[row * m_nCols + 1]->SetWindowText(CString(data.inputAddress.c_str()));
- m_staticControls[row * m_nCols + 2]->SetWindowText(CString(data.inputDescription.c_str()));
- m_staticControls[row * m_nCols + 3]->SetWindowText(_T("OFF"));
- m_staticControls[row * m_nCols + 4]->SetWindowText(CString(data.outputAddress.c_str()));
- m_staticControls[row * m_nCols + 5]->SetWindowText(CString(data.outputDescription.c_str()));
+ if (startIndex + i < endIndex) {
+ const auto& data = m_displayData[startIndex + i];
+
+ // 鏄剧ず鎺т欢骞惰缃唴瀹�
+ m_staticControls[row * m_nCols + 0]->SetWindowText(_T("OFF"));
+ m_staticControls[row * m_nCols + 0]->ShowWindow(SW_SHOW);
+
+ m_staticControls[row * m_nCols + 1]->SetWindowText(CString(data.inputAddress.c_str()));
+ m_staticControls[row * m_nCols + 1]->ShowWindow(SW_SHOW);
+
+ m_staticControls[row * m_nCols + 2]->SetWindowText(CString(data.inputDescription.c_str()));
+ m_staticControls[row * m_nCols + 2]->ShowWindow(SW_SHOW);
+
+ m_staticControls[row * m_nCols + 3]->SetWindowText(_T("OFF"));
+ m_staticControls[row * m_nCols + 3]->ShowWindow(SW_SHOW);
+
+ m_staticControls[row * m_nCols + 4]->SetWindowText(CString(data.outputAddress.c_str()));
+ m_staticControls[row * m_nCols + 4]->ShowWindow(SW_SHOW);
+
+ m_staticControls[row * m_nCols + 5]->SetWindowText(CString(data.outputDescription.c_str()));
+ m_staticControls[row * m_nCols + 5]->ShowWindow(SW_SHOW);
+ }
+ else {
+ // 闅愯棌杩欎竴琛岀殑鎵�鏈夋帶浠�
+ for (int col = 0; col < m_nCols; ++col)
+ {
+ m_staticControls[row * m_nCols + col]->ShowWindow(SW_HIDE);
+ }
+ }
}
+
UpdatePageInfo();
}
--
Gitblit v1.9.3