From 2d8047ec3451b7b411812970ee7b149bf1a9b2d6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 09:21:46 +0800
Subject: [PATCH] 1.轴参数设定,调试,合并;

---
 SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp b/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
index d72dd77..8d6d9d3 100644
--- a/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/IOMonitoringDlg.cpp
@@ -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);

--
Gitblit v1.9.3