From 331f447bb0e5eccf0b3161ab287c1372b14b8480 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 08 八月 2025 11:53:58 +0800
Subject: [PATCH] 1.增加千传计数,保存计数,重启软件时恢复; 2.千传测试模式,打印相关日志,方便后期提取,用于统计; 3.千传模式时烘烤两腔体都要进入; 4.千传模式时,Fliper到Bonder修改为用手臂2取料; 5.修复千传模式不计运行时的问题; 6.千传模式,最后收料强制放入第一层; 6.修复Buf, 当任务未生成(在符合条件后仍有1秒间隙)而机器单元发送FetchOutJob时,数据检验失败的问题,增加Sleep, 缩小间隙;
---
SourceCode/Bond/BoounionPLC/CMainContainer.cpp | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/CMainContainer.cpp b/SourceCode/Bond/BoounionPLC/CMainContainer.cpp
index 66365e6..861cc08 100644
--- a/SourceCode/Bond/BoounionPLC/CMainContainer.cpp
+++ b/SourceCode/Bond/BoounionPLC/CMainContainer.cpp
@@ -17,6 +17,8 @@
{
m_crBkgnd = MAIN_CONTAINER_BACKGROUND;
m_hbrBkgnd = nullptr;
+ m_pBottomWnd = nullptr;
+ m_nBottomWndHeight = 0;
}
CMainContainer::~CMainContainer()
@@ -38,6 +40,12 @@
// CMainContainer 娑堟伅澶勭悊绋嬪簭
+
+void CMainContainer::SetBottomWnd(CWnd* pWnd, int nHeight)
+{
+ m_pBottomWnd = pWnd;
+ m_nBottomWndHeight = nHeight;
+}
BOOL CMainContainer::OnInitDialog()
{
@@ -84,8 +92,12 @@
void CMainContainer::Resize()
{
- CRect rcClient;
+ CRect rcClient, rcChild;
GetClientRect(&rcClient);
+ rcChild = rcClient;
+ if (m_pBottomWnd != nullptr && m_nBottomWndHeight > 0) {
+ rcChild.bottom -= m_nBottomWndHeight;
+ }
// 鍏堝彇寰楀瓙绐楀彛鏁伴噺
int count = 0;
@@ -97,7 +109,13 @@
pClild = FindWindowEx(m_hWnd, NULL, NULL, NULL);
while (pClild != nullptr) {
- pClild->MoveWindow(&rcClient);
+ if (pClild != m_pBottomWnd) {
+ pClild->MoveWindow(&rcChild);
+ }
+ else if (m_pBottomWnd != nullptr) {
+ m_pBottomWnd->MoveWindow(0, rcChild.bottom, rcClient.Width(), rcClient.bottom - rcChild.bottom);
+ }
+
if (::GetProp(pClild->GetSafeHwnd(), "Home") == (HANDLE)1) {
pClild->ShowWindow(count == 1 ? SW_SHOW : SW_HIDE);
}
--
Gitblit v1.9.3