From a1bf060d50da3c27b54bcc349e8b53769b39ef89 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 03 六月 2025 17:31:33 +0800
Subject: [PATCH] 1.增加Aligner --> Bonder1 | Bonder2的搬送检测逻辑； 2.优化搬送逻辑。搬送要分优先考虑的主类型和次要类型。一种情况，如果不分主次，一直搬G1, 等到Bonder1和Bonder2都放了G1, Aligner也放了G1, Bonder1和Bonder2需要的G2就过不来了（在Aligner阻塞了）。另外从生产效率上来说，也应该根据需求，尽快使其中一台Bonder的两片玻璃匹配以使其能尽快开始生产加工。
---
SourceCode/Bond/Servo/ServoGraph.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoGraph.cpp b/SourceCode/Bond/Servo/ServoGraph.cpp
index 3e815c8..8e037e1 100644
--- a/SourceCode/Bond/Servo/ServoGraph.cpp
+++ b/SourceCode/Bond/Servo/ServoGraph.cpp
@@ -125,6 +125,9 @@
case WM_LBUTTONDOWN:
return pServoGraph->OnLButtonDown(wParam, lParam);
+ case WM_SIZE:
+ return pServoGraph->OnSize(wParam, lParam);
+
case WM_GETDLGCODE:
return DLGC_WANTALLKEYS;
@@ -271,6 +274,14 @@
return ::DefWindowProc(m_hWnd, WM_LBUTTONDOWN, wParam, lParam);
+}
+
+/*
+ * WM_SIZE
+ */
+LRESULT CServoGraph::OnSize(WPARAM wParam, LPARAM lParam)
+{
+ return ::DefWindowProc(m_hWnd, WM_SIZE, wParam, lParam);
}
///////////////////////////////
@@ -634,6 +645,25 @@
}
}
+void CServoGraph::UpdateIndicateBox1Colors(int id, COLORREF newBackgroundColor, COLORREF newFrameColor1, COLORREF newFrameColor2)
+{
+ INDICATEBOX* pIndicateBox = GetIndicateBox(id);
+ if (pIndicateBox != nullptr) {
+ pIndicateBox->box1BackgroundColor = newBackgroundColor;
+ pIndicateBox->box1FrameColor[0] = newFrameColor1;
+ pIndicateBox->box1FrameColor[1] = newFrameColor2;
+ }
+}
+
+void CServoGraph::UpdateIndicateBox2Colors(int id, COLORREF newBackgroundColor, COLORREF newFrameColor)
+{
+ INDICATEBOX* pIndicateBox = GetIndicateBox(id);
+ if (pIndicateBox != nullptr) {
+ pIndicateBox->box2BackgroundColor = newBackgroundColor;
+ pIndicateBox->box2FrameColor = newFrameColor;
+ }
+}
+
void CServoGraph::DrawImage(HDC hMemDC, IMAGE& item)
{
// 载入BMP
@@ -674,4 +704,22 @@
graphics.DrawImage(&bitmap, item.x, item.y);
graphics.ResetTransform();
}
+}
+
+void CServoGraph::SetIndicateBoxData(int id, void* pData)
+{
+ INDICATEBOX* pib = GetIndicateBox(id);
+ if (pib != nullptr) {
+ pib->m_pData = pData;
+ }
+}
+
+void* CServoGraph::GetIndicateBoxData(int id)
+{
+ INDICATEBOX* pib = GetIndicateBox(id);
+ if (pib != nullptr) {
+ return pib->m_pData;
+ }
+
+ return nullptr;
}
\ No newline at end of file
--
Gitblit v1.9.3