From 3bf6df412c3b681e8901d6dcddd803a9c3235484 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 09 十二月 2024 08:52:34 +0800
Subject: [PATCH] 1.代码合并、消除警告；
---
SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp b/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
index d72dd77..cd900d3 100644
--- a/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
@@ -25,7 +25,7 @@
{
m_nCurrentPage = 1;
m_nTotalPages = 1;
- m_nRowsPerPage = 10;
+ m_nRowsPerPage = 16;
m_nCols = 6;
}
@@ -59,7 +59,7 @@
// 璁＄畻椤垫暟
m_nCurrentPage = 1;
- m_nTotalPages = (m_displayData.size() + m_nRowsPerPage - 1) / m_nRowsPerPage;
+ m_nTotalPages = ((int)m_displayData.size() + m_nRowsPerPage - 1) / m_nRowsPerPage;
}
void CIOMonitoringDlg::SetPLC(CPLC* pPLC)
@@ -161,7 +161,7 @@
ScreenToClient(&nextButtonRect);
int buttonHeight = prevButtonRect.Height(); // 鎸夐挳鐨勯珮搴�
- int topMargin = rect.Height() * 0.05; // 椤堕儴淇濈暀 5% 鐨勯珮搴�
+ int topMargin = int(rect.Height() * 0.05); // 椤堕儴淇濈暀 5% 鐨勯珮搴�
int bottomMargin = buttonHeight + topMargin; // 搴曢儴淇濈暀鎸夐挳楂樺害鍔犻棿璺�
int sideMargin = topMargin; // 宸﹀彸闂磋窛涓庨《閮ㄩ棿璺濈浉鍚�
int groupSpacing = 20; // 涓ょ粍涔嬮棿鐨勯棿璺�
@@ -490,7 +490,7 @@
MC::SOFT_COMPONENT enComponent;
if (ParsePLCAddress(CString(data.inputAddress.c_str()), enComponent, nAddress)) {
int nOffset = nAddress - inputStartAddr;
- if (nOffset >= 0 && nOffset < nDataSize) {
+ if (nOffset >= 0 && nOffset < (int)nDataSize) {
int byteIndex = nOffset / 8;
int bitIndex = nOffset % 8;
data.bInputStates = CToolUnits::getBit(pData[byteIndex], bitIndex);
@@ -511,7 +511,7 @@
MC::SOFT_COMPONENT enComponent;
if (ParsePLCAddress(CString(data.outputAddress.c_str()), enComponent, nAddress)) {
int nOffset = nAddress - outputStartAddr;
- if (nOffset >= 0 && nOffset < nDataSize) {
+ if (nOffset >= 0 && nOffset < (int)nDataSize) {
int byteIndex = nOffset / 8;
int bitIndex = nOffset % 8;
data.bOutputStates = CToolUnits::getBit(pData[byteIndex], bitIndex);
@@ -604,8 +604,8 @@
}
GetWindowRect(&dlgRect);
- int dlgWidth = dlgRect.Width() * 2;
- int dlgHeight = dlgRect.Height() * 2;
+ int dlgWidth = dlgRect.Width() * 3;
+ int dlgHeight = dlgRect.Height() * 3;
if (dlgWidth > screenRect.Width()) {
dlgWidth = screenRect.Width();
--
Gitblit v1.9.3