From 5f48cb704e22333b65732cbe22dd1b9610f6b186 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 04 一月 2025 08:55:29 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp | 2 +-
SourceCode/Bond/BondEq/CProjectPageMain.cpp | 13 -------------
2 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CProjectPageMain.cpp b/SourceCode/Bond/BondEq/CProjectPageMain.cpp
index 366c665..f5986f8 100644
--- a/SourceCode/Bond/BondEq/CProjectPageMain.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageMain.cpp
@@ -22,7 +22,6 @@
m_crBkgnd = PROPAGE_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
m_pObserver = nullptr;
-
for (int i = 0; i < BTN_MAX; i++) {
m_pBlBtns[i] = new CBlButton();
}
@@ -214,7 +213,6 @@
SetButtonBackgroundColors(m_pBlBtns[BTN_STOP], capactity == 0);
}
}
-
pAny->release();
}, [&]() -> void {
// onComplete
@@ -369,16 +367,5 @@
LRESULT CProjectPageMain::OnUpdateDataToUI(WPARAM wParam, LPARAM lParam)
{
- /*
- CString strText;
- strText.Format(_T("%d %s"), nVelocityRatio, _T("%"));
- GetDlgItem(IDC_EDIT_VELOCITY_RATIO)->SetWindowText(strText);
-
- strText.Format(_T("%.2f"), dTactTime);
- GetDlgItem(IDC_EDIT_TACT_TIME)->SetWindowText(strText);
-
- SetDlgItemInt(IDC_EDIT_DAY_SHIFT_CAPACITY, nDayShiftCapacity);
- SetDlgItemInt(IDC_EDIT_NIGHT_SHIFT_CAPACITY, nNightShiftCapacity);
- */
return 0;
}
diff --git a/SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp b/SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp
index 499536e..72a9a03 100644
--- a/SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp
@@ -288,4 +288,4 @@
errorMsg.Format(_T("鍒囨崲瑙掕壊澶辫触锛�%s"), CString(ex.what()));
AfxMessageBox(errorMsg, MB_ICONERROR);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3