From ff08319b0ed77427b202076742b475dc9aa3ba06 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 09 二月 2026 13:50:02 +0800
Subject: [PATCH] 1.修复连接图LoadPort的小格子不刷新的问题。
---
SourceCode/Bond/Servo/CPageGraph1.cpp | 488 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 428 insertions(+), 60 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph1.cpp b/SourceCode/Bond/Servo/CPageGraph1.cpp
index 60f2ac4..b2d932a 100644
--- a/SourceCode/Bond/Servo/CPageGraph1.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph1.cpp
@@ -6,6 +6,29 @@
#include "CPageGraph1.h"
#include "afxdialogex.h"
#include "Common.h"
+#include "CEquipment.h"
+#include "CGlass.h"
+#include "CServoUtilsTool.h"
+
+namespace {
+ const UINT kSlotTableId = 60001;
+
+ bool ParseHexColor(const char* psz, COLORREF& outColor)
+ {
+ if (psz == nullptr || *psz == '\0') return false;
+ while (*psz == ' ' || *psz == '\t') ++psz;
+ if (*psz == '#') ++psz;
+ if (psz[0] == '0' && (psz[1] == 'x' || psz[1] == 'X')) psz += 2;
+ char* endPtr = nullptr;
+ unsigned long value = strtoul(psz, &endPtr, 16);
+ if (endPtr == psz) return false;
+ BYTE r = (BYTE)((value >> 16) & 0xFF);
+ BYTE g = (BYTE)((value >> 8) & 0xFF);
+ BYTE b = (BYTE)(value & 0xFF);
+ outColor = RGB(r, g, b);
+ return true;
+ }
+}
const std::map<SERVO::ROBOT_POSITION, RobotPositionMapping> g_positionMap = {
{ SERVO::ROBOT_POSITION::Port1, { SERVO::ROBOT_POSITION::Port1, 1.00f, 0.00f } },
@@ -23,6 +46,7 @@
// Image
#define IMAGE_ROBOT 2
+#define IMAGE_LEGEND 3
#define INDICATE_BONDER1 1
#define INDICATE_BONDER2 2
@@ -55,6 +79,13 @@
m_pObserver = nullptr; // 瑙傚療鑰呭璞★紙鍙兘鏄簨浠惰瀵熻�咃級
m_crBkgnd = PAGE_GRPAH1_BACKGROUND_COLOR; // 鑳屾櫙棰滆壊
m_hbrBkgnd = nullptr; // 鑳屾櫙鍒峰彞鏌�
+ m_slotBarTestMode = 0; // 0=off,1=has,2=processing
+ m_pSelectedEquipment = nullptr;
+ m_slotTableRowCount = 1;
+ m_slotTableRowHeight = 20;
+ m_slotTablePadding = 8;
+ m_slotTableHeaderHeight = 22;
+ m_slotTableTitleHeight = 20;
// ===== 鏈哄櫒浜哄姩鐢荤姸鎬佸垵濮嬪寲 =====
m_bIsRobotMoving = FALSE; // 褰撳墠鏄惁姝ｅ湪鍔ㄧ敾绉诲姩
@@ -108,6 +139,172 @@
std::string configDir = exePath.substr(0, exePath.find_last_of("\\/")) + "\\Config";
CreateDirectoryA(configDir.c_str(), NULL);
return configDir + "\\robot_offset.ini";
+}
+
+void CPageGraph1::UpdateLegendPosition()
+{
+ if (!m_pGraph) return;
+ auto* pImage = m_pGraph->GetImage(IMAGE_LEGEND);
+ if (!pImage) return;
+
+ RECT rc = { 0 };
+ ::GetClientRect(m_pGraph->GetSafeWnd(), &rc);
+ std::string iniPath = GetConfigPath();
+ int cfgX = GetPrivateProfileIntA("Graph1", "LegendX", -1, iniPath.c_str());
+ int cfgY = GetPrivateProfileIntA("Graph1", "LegendY", -1, iniPath.c_str());
+
+ int x = (cfgX >= 0) ? cfgX : (rc.right - pImage->bmWidth - 8);
+ int y = (cfgY >= 0) ? cfgY : 6;
+ if (x < 0) x = 0;
+ if (y < 0) y = 0;
+ if (x > rc.right - pImage->bmWidth) x = rc.right - pImage->bmWidth;
+ if (y > rc.bottom - pImage->bmHeight) y = rc.bottom - pImage->bmHeight;
+ m_pGraph->UpdateImageCoordinates(IMAGE_LEGEND, x, y);
+ m_pGraph->Invalidata();
+}
+
+void CPageGraph1::LayoutSlotTable()
+{
+ if (GetSafeHwnd() == nullptr) return;
+
+ std::string iniPath = GetConfigPath();
+ m_slotTableRowHeight = GetPrivateProfileIntA("Graph1", "SlotTableRowHeight", 20, iniPath.c_str());
+ m_slotTablePadding = GetPrivateProfileIntA("Graph1", "SlotTablePadding", 8, iniPath.c_str());
+ m_slotTableHeaderHeight = GetPrivateProfileIntA("Graph1", "SlotTableHeaderHeight", 22, iniPath.c_str());
+ m_slotTableTitleHeight = GetPrivateProfileIntA("Graph1", "SlotTableTitleHeight", 20, iniPath.c_str());
+ char colorBuf[32] = { 0 };
+ COLORREF lineColor = RGB(230, 230, 230);
+ COLORREF headerBgColor = RGB(245, 245, 245);
+ GetPrivateProfileStringA("Graph1", "SlotTableLineColor", "", colorBuf, sizeof(colorBuf), iniPath.c_str());
+ if (!ParseHexColor(colorBuf, lineColor)) {
+ lineColor = RGB(230, 230, 230);
+ }
+ GetPrivateProfileStringA("Graph1", "SlotTableHeaderBgColor", "", colorBuf, sizeof(colorBuf), iniPath.c_str());
+ if (!ParseHexColor(colorBuf, headerBgColor)) {
+ headerBgColor = RGB(245, 245, 245);
+ }
+ if (m_slotTableRowHeight < 14) m_slotTableRowHeight = 14;
+ if (m_slotTableRowHeight > 40) m_slotTableRowHeight = 40;
+ if (m_slotTablePadding < 2) m_slotTablePadding = 2;
+ if (m_slotTablePadding > 16) m_slotTablePadding = 16;
+ if (m_slotTableHeaderHeight < 16) m_slotTableHeaderHeight = 16;
+ if (m_slotTableHeaderHeight > 40) m_slotTableHeaderHeight = 40;
+ if (m_slotTableTitleHeight < 16) m_slotTableTitleHeight = 16;
+ if (m_slotTableTitleHeight > 40) m_slotTableTitleHeight = 40;
+ int cfgX = GetPrivateProfileIntA("Graph1", "SlotTableX", -1, iniPath.c_str());
+ int cfgY = GetPrivateProfileIntA("Graph1", "SlotTableY", -1, iniPath.c_str());
+
+ CRect rcClient;
+ GetClientRect(&rcClient);
+
+ int cfgW = max(160, rcClient.Width() / 3);
+ if (cfgW > 280) cfgW = 280;
+
+ const int titleHeight = m_slotTableTitleHeight;
+ const int headerHeight = m_slotTableHeaderHeight;
+ const int rowHeight = m_slotTableRowHeight;
+ int rows = m_slotTableRowCount;
+ if (rows < 1) rows = 1;
+ if (rows > 8) rows = 8;
+ int cfgH = titleHeight + headerHeight + rowHeight * rows + 6;
+
+ if (cfgW > rcClient.Width() - 6) cfgW = max(160, rcClient.Width() - 6);
+ if (cfgH > rcClient.Height() - 6) cfgH = max(80, rcClient.Height() - 6);
+
+ int x = (cfgX >= 0) ? cfgX : (rcClient.right - cfgW - 6);
+ int y = (cfgY >= 0) ? cfgY : 12;
+
+ if (x < 0) x = 0;
+ if (y < 0) y = 0;
+// if (x + cfgW > rcClient.right) x = max(0, rcClient.right - cfgW);
+// if (y + cfgH > rcClient.bottom) y = max(0, rcClient.bottom - cfgH);
+
+ CRect rcTable(x, y, x + cfgW, y + cfgH);
+ if (m_slotTable.GetSafeHwnd() == nullptr) {
+ BOOL created = m_slotTable.Create(this, rcTable, kSlotTableId);
+ m_slotTable.SetTitle(_T("Slot Info"));
+ m_slotTable.SetRowHeight(m_slotTableRowHeight);
+ m_slotTable.SetPadding(m_slotTablePadding);
+ m_slotTable.SetHeaderHeight(m_slotTableHeaderHeight);
+ m_slotTable.SetTitleHeight(m_slotTableTitleHeight);
+ m_slotTable.SetLineColor(lineColor);
+ m_slotTable.SetHeaderBgColor(headerBgColor);
+ LOGI("[Graph1] SlotTable create ret=%d hwnd=%p err=%lu rc=(%d,%d)-(%d,%d)",
+ created, m_slotTable.GetSafeHwnd(), GetLastError(),
+ rcTable.left, rcTable.top, rcTable.right, rcTable.bottom);
+ }
+ else {
+ m_slotTable.MoveWindow(&rcTable);
+ m_slotTable.SetRowHeight(m_slotTableRowHeight);
+ m_slotTable.SetPadding(m_slotTablePadding);
+ m_slotTable.SetHeaderHeight(m_slotTableHeaderHeight);
+ m_slotTable.SetTitleHeight(m_slotTableTitleHeight);
+ m_slotTable.SetLineColor(lineColor);
+ m_slotTable.SetHeaderBgColor(headerBgColor);
+ LOGI("[Graph1] SlotTable moved rc=(%d,%d)-(%d,%d)", rcTable.left, rcTable.top, rcTable.right, rcTable.bottom);
+ }
+
+ // 濡傛灉瓒呭嚭鍙鍖哄煙锛屽己鍒剁Щ鍒板乏涓婅浣滀负鍏滃簳
+ CRect rcWnd;
+ m_slotTable.GetWindowRect(&rcWnd);
+ ScreenToClient(&rcWnd);
+ LOGI("[Graph1] SlotTable wnd rc=(%d,%d)-(%d,%d) client=(%d,%d)",
+ rcWnd.left, rcWnd.top, rcWnd.right, rcWnd.bottom, rcClient.right, rcClient.bottom);
+ if (rcWnd.right <= 0 || rcWnd.bottom <= 0 ||
+ rcWnd.left >= rcClient.right || rcWnd.top >= rcClient.bottom) {
+ CRect rcFallback(10, 10, 10 + cfgW, 10 + cfgH);
+ m_slotTable.MoveWindow(&rcFallback);
+ LOGI("[Graph1] SlotTable fallback rc=(%d,%d)-(%d,%d)", rcFallback.left, rcFallback.top, rcFallback.right, rcFallback.bottom);
+ }
+ m_slotTable.SetWindowPos(&CWnd::wndTop, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
+
+ if (auto* pGraphWnd = GetDlgItem(IDC_SERVO_GRAPH1)) {
+ pGraphWnd->SetWindowPos(&CWnd::wndBottom, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+ }
+ m_slotTable.BringWindowToTop();
+}
+
+void CPageGraph1::UpdateSlotTable(SERVO::CEquipment* pEquipment)
+{
+ if (m_slotTable.GetSafeHwnd() == nullptr) return;
+
+ std::vector<CSlotTableCtrl::Row> rows;
+ if (pEquipment != nullptr) {
+ LOGI("[Graph1] UpdateSlotTable eq=%s(%p)", pEquipment->getName().c_str(), pEquipment);
+ for (int i = 0; i < SLOT_MAX && rows.size() < 8; ++i) {
+ SERVO::CSlot* pSlot = pEquipment->getSlot(i);
+ if (pSlot == nullptr || !pSlot->isEnable()) continue;
+
+ CSlotTableCtrl::Row row;
+ row.slot.Format(_T("%d"), pSlot->getNo());
+
+ CContext* pCtx = pSlot->getContext();
+ if (pCtx == nullptr) {
+ pCtx = pSlot->getTempContext();
+ }
+ SERVO::CGlass* pGlass = dynamic_cast<SERVO::CGlass*>(pCtx);
+ if (pGlass != nullptr) {
+ row.glassId = pGlass->getID().c_str();
+ row.type = SERVO::CServoUtilsTool::getMaterialsTypeText(pGlass->getType()).c_str();
+ }
+
+ rows.push_back(row);
+ }
+ }
+ LOGI("[Graph1] SlotTable rows=%zu", rows.size());
+
+ m_slotTableRowCount = static_cast<int>(rows.size());
+ if (m_slotTableRowCount < 1) m_slotTableRowCount = 1;
+ if (m_slotTableRowCount > 8) m_slotTableRowCount = 8;
+ LayoutSlotTable();
+
+ if (pEquipment != nullptr) {
+ m_slotTable.SetTitle(CString(pEquipment->getName().c_str()));
+ }
+ else {
+ m_slotTable.SetTitle(_T("Slot Info"));
+ }
+ m_slotTable.SetRows(rows);
}
void CPageGraph1::InitRxWindows()
@@ -179,12 +376,16 @@
BOOL CPageGraph1::OnInitDialog()
{
CDialogEx::OnInitDialog();
+ ModifyStyle(0, WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
InitRxWindows();
- SetTimer(TIMER_ID_DEVICE_STATUS, 3000, nullptr);
+ SetTimer(TIMER_ID_DEVICE_STATUS, 800, nullptr);
SetTimer(TIMER_ID_ROBOT_STATUS, 1000, nullptr); // 姣� 1000ms 鏇存柊涓�娆＄姸鎬�
// 鍥剧ず
m_pGraph = CServoGraph::Hook(GetDlgItem(IDC_SERVO_GRAPH1)->GetSafeHwnd());
+ if (auto* pGraphWnd = GetDlgItem(IDC_SERVO_GRAPH1)) {
+ pGraphWnd->ModifyStyle(0, WS_CLIPSIBLINGS);
+ }
CString strPath;
strPath.Format(_T("%s\\res\\Servo001.bmp"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
m_pGraph->AddImage(1, (LPTSTR)(LPCTSTR)strPath, 0, 0);
@@ -192,78 +393,144 @@
strPath.Format(_T("%s\\res\\Robot001.bmp"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
m_pGraph->AddImage(IMAGE_ROBOT, (LPTSTR)(LPCTSTR)strPath, 170, 270);
+ // Legend
+ strPath.Format(_T("%s\\res\\GraphLegend.bmp"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ m_pGraph->AddImage(IMAGE_LEGEND, (LPTSTR)(LPCTSTR)strPath, 0, 0);
+ UpdateLegendPosition();
+ LayoutSlotTable();
+ m_slotTable.ShowWindow(SW_SHOW);
+
// 娣诲姞鎸囩ず鍣�
// Bonder
- m_pGraph->AddIndicateBox(INDICATE_BONDER1, 220, 172, 48, RGB(22, 22, 22),
+ // size config
+ std::string iniPath = GetConfigPath();
+ int boxSize = GetPrivateProfileIntA("Graph1", "BoxSize", 56, iniPath.c_str());
+ if (boxSize < 40) boxSize = 40;
+ if (boxSize > 80) boxSize = 80;
+ int slotSizeDefault = GetPrivateProfileIntA("Graph1", "SlotSize", 6, iniPath.c_str());
+ int slotSize8 = GetPrivateProfileIntA("Graph1", "SlotSize8", slotSizeDefault, iniPath.c_str());
+ int slotSizeOther = GetPrivateProfileIntA("Graph1", "SlotSizeOther", slotSizeDefault, iniPath.c_str());
+ if (slotSize8 < 2) slotSize8 = 2;
+ if (slotSize8 > 12) slotSize8 = 12;
+ if (slotSizeOther < 2) slotSizeOther = 2;
+ if (slotSizeOther > 12) slotSizeOther = 12;
+ m_pGraph->SetSlotBarSizeByCount(slotSize8, slotSizeOther);
+ int armBoxSize = GetPrivateProfileIntA("Graph1", "ArmBoxSize", boxSize, iniPath.c_str());
+ if (armBoxSize < 30) armBoxSize = 30;
+ if (armBoxSize > 80) armBoxSize = 80;
+
+ // ArmSpacing = edge-to-edge gap between the two robot arm boxes.
+ int armGap = GetPrivateProfileIntA("Graph1", "ArmSpacing", 6, iniPath.c_str());
+ if (armGap < 0) armGap = 0;
+ if (armGap > 100) armGap = 100;
+
+ int arm1X = 190;
+ int arm2X = 243;
+ int armY = 294;
+ int minArmSpacing = armBoxSize + armGap;
+ if (minArmSpacing > 0) {
+ int mid = (m_arm1Offset.x + m_arm2Offset.x) / 2;
+ int half = minArmSpacing / 2;
+ if (m_arm1Offset.x <= m_arm2Offset.x) {
+ m_arm1Offset.x = mid - half;
+ m_arm2Offset.x = mid + half;
+ } else {
+ m_arm2Offset.x = mid - half;
+ m_arm1Offset.x = mid + half;
+ }
+ }
+ {
+ int baseMid = (arm1X + arm2X) / 2;
+ int half = minArmSpacing / 2;
+ arm1X = baseMid - half;
+ arm2X = baseMid + half;
+ }
+
+ m_pGraph->AddIndicateBox(INDICATE_BONDER1, 220, 172, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_BONDER1, "10", "Bonder 1");
- m_pGraph->AddIndicateBox(INDICATE_BONDER2, 220, 516, 48, RGB(22, 22, 22),
+ m_pGraph->SetBoxText(INDICATE_BONDER1, "", "Bonder 1");
+ m_pGraph->AddIndicateBox(INDICATE_BONDER2, 220, 516, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_BONDER2, "11", "Bonder 2");
+ m_pGraph->SetBoxText(INDICATE_BONDER2, "", "Bonder 2");
// 缈昏浆
- m_pGraph->AddIndicateBox(INDICATE_FLIPER, 338, 172, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_FLIPER, 338, 172, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_FLIPER, "8", "Fliper");
+ m_pGraph->SetBoxText(INDICATE_FLIPER, "", "Fliper");
// 瀵逛綅
- m_pGraph->AddIndicateBox(INDICATE_ALIGNER, 428, 172, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_ALIGNER, 428, 172, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_ALIGNER, "7", "Aligner");
+ m_pGraph->SetBoxText(INDICATE_ALIGNER, "", "Aligner");
// Load port 4
- m_pGraph->AddIndicateBox(INDICATE_LPORT4, 518, 172, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_LPORT4, 518, 172, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT4, "4", "LPort4");
+ m_pGraph->SetBoxText(INDICATE_LPORT4, "", "LPort4");
// Load port 3
- m_pGraph->AddIndicateBox(INDICATE_LPORT3, 606, 172, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_LPORT3, 606, 172, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT3, "3", "LPort3");
+ m_pGraph->SetBoxText(INDICATE_LPORT3, "", "LPort3");
// Load port 2
- m_pGraph->AddIndicateBox(INDICATE_LPORT2, 690, 172, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_LPORT2, 690, 172, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT2, "2", "LPort2");
+ m_pGraph->SetBoxText(INDICATE_LPORT2, "", "LPort2");
// Load port 1
- m_pGraph->AddIndicateBox(INDICATE_LPORT1, 774, 172, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_LPORT1, 774, 172, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT1, "1", "LPort1");
+ m_pGraph->SetBoxText(INDICATE_LPORT1, "", "LPort1");
// Robot
- m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM1, 190, 294, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM1, arm1X, armY, armBoxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_ROBOT_ARM1, "5", "Robot");
- m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM2, 243, 294, 48, RGB(22, 22, 22),
+ m_pGraph->SetBoxText(INDICATE_ROBOT_ARM1, "", "Robot");
+ m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM2, arm2X, armY, armBoxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "6", "Robot");
+ m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "", "Robot");
// Vacuum bake
- m_pGraph->AddIndicateBox(INDICATE_VACUUM_BAKE, 396, 516, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_VACUUM_BAKE, 396, 516, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_VACUUM_BAKE, "9", "Vacuum bake");
+ m_pGraph->SetBoxText(INDICATE_VACUUM_BAKE, "", "Vacuum bake");
// Bake cooling
- m_pGraph->AddIndicateBox(INDICATE_BAKE_COOLING, 566, 516, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_BAKE_COOLING, 566, 516, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_BAKE_COOLING, "12", "Bake cooling");
+ m_pGraph->SetBoxText(INDICATE_BAKE_COOLING, "", "Bake cooling");
// 绮惧害妫�
- m_pGraph->AddIndicateBox(INDICATE_MEASUREMENT, 737, 516, 48, RGB(22, 22, 22),
+ m_pGraph->AddIndicateBox(INDICATE_MEASUREMENT, 737, 516, boxSize, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "13", "Measurement");
+ m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "", "Measurement");
+ // slot bar positions (top row / bottom row)
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_BONDER1, SlotBarPos::Top);
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_FLIPER, SlotBarPos::Top);
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_ALIGNER, SlotBarPos::Top);
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_LPORT4, SlotBarPos::Top);
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_LPORT3, SlotBarPos::Top);
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_LPORT2, SlotBarPos::Top);
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_LPORT1, SlotBarPos::Top);
+
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_BONDER2, SlotBarPos::Bottom);
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_VACUUM_BAKE, SlotBarPos::Bottom);
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_BAKE_COOLING, SlotBarPos::Bottom);
+ m_pGraph->SetIndicateBoxSlotBarPosition(INDICATE_MEASUREMENT, SlotBarPos::Bottom);
+
+ UpdateSlotBars();
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -360,6 +627,9 @@
CRect rcClient;
GetClientRect(&rcClient);
GetDlgItem(IDC_SERVO_GRAPH1)->MoveWindow(0, 0, rcClient.Width(), rcClient.Height());
+ UpdateLegendPosition();
+ LayoutSlotTable();
+ m_slotTable.ShowWindow(SW_SHOW);
}
void CPageGraph1::UpdateRobotPosition(float percentage)
@@ -467,8 +737,8 @@
};
static const EquipmentBindInfo EQUIPMENT_BIND_LIST[] = {
- { EQ_ID_EFEM, INDICATE_ROBOT_ARM1 },
- { EQ_ID_EFEM, INDICATE_ROBOT_ARM2 },
+ { EQ_ID_ARM_TRAY1, INDICATE_ROBOT_ARM1 },
+ { EQ_ID_ARM_TRAY2, INDICATE_ROBOT_ARM2 },
{ EQ_ID_Bonder1, INDICATE_BONDER1 },
{ EQ_ID_Bonder2, INDICATE_BONDER2 },
{ EQ_ID_LOADPORT1, INDICATE_LPORT1 },
@@ -478,7 +748,8 @@
{ EQ_ID_FLIPER, INDICATE_FLIPER },
{ EQ_ID_VACUUMBAKE, INDICATE_VACUUM_BAKE },
{ EQ_ID_ALIGNER, INDICATE_ALIGNER },
- { EQ_ID_BAKE_COOLING, INDICATE_BAKE_COOLING }
+ { EQ_ID_BAKE_COOLING, INDICATE_BAKE_COOLING },
+ { EQ_ID_MEASUREMENT, INDICATE_MEASUREMENT }
};
for (const auto& stBindInfo : EQUIPMENT_BIND_LIST)
@@ -542,6 +813,111 @@
return pt;
}
+
+void CPageGraph1::UpdateSlotBars()
+{
+ if (m_pGraph == nullptr) return;
+
+ if (m_slotBarTestMode != 0) {
+ ApplySlotBarTestPattern(m_slotBarTestMode);
+ return;
+ }
+
+ struct SlotBarBind {
+ int eqId;
+ int indicateId;
+ };
+ static const SlotBarBind kSlotBars[] = {
+ { EQ_ID_Bonder1, INDICATE_BONDER1 },
+ { EQ_ID_FLIPER, INDICATE_FLIPER },
+ { EQ_ID_ALIGNER, INDICATE_ALIGNER },
+ { EQ_ID_LOADPORT4, INDICATE_LPORT4 },
+ { EQ_ID_LOADPORT3, INDICATE_LPORT3 },
+ { EQ_ID_LOADPORT2, INDICATE_LPORT2 },
+ { EQ_ID_LOADPORT1, INDICATE_LPORT1 },
+ { EQ_ID_Bonder2, INDICATE_BONDER2 },
+ { EQ_ID_VACUUMBAKE, INDICATE_VACUUM_BAKE },
+ { EQ_ID_BAKE_COOLING, INDICATE_BAKE_COOLING },
+ { EQ_ID_MEASUREMENT, INDICATE_MEASUREMENT },
+ };
+
+ for (const auto& item : kSlotBars) {
+ SERVO::CEquipment* pEq = theApp.m_model.m_master.getEquipment(item.eqId);
+ std::vector<COLORREF> colors;
+ BuildSlotColors(pEq, colors);
+ m_pGraph->SetIndicateBoxSlotColors(item.indicateId, colors);
+ }
+}
+
+void CPageGraph1::BuildSlotColors(SERVO::CEquipment* pEq, std::vector<COLORREF>& colors)
+{
+ colors.clear();
+ if (pEq == nullptr) return;
+
+ for (int i = 0; i < SLOT_MAX; ++i) {
+ SERVO::CSlot* pSlot = pEq->getSlot(i);
+ if (pSlot == nullptr || !pSlot->isEnable()) continue;
+ SERVO::CGlass* pGlass = (SERVO::CGlass*)pSlot->getContext();
+ BOOL isProcessing = FALSE;
+ if (pGlass != nullptr) {
+ const auto st = pEq->getProcessState(i + 1);
+ isProcessing = (st == SERVO::PROCESS_STATE::Processing);
+ }
+ colors.push_back(GetSlotColor(pGlass, isProcessing));
+ }
+}
+
+COLORREF CPageGraph1::GetSlotColor(SERVO::CGlass* pGlass, BOOL isProcessing)
+{
+ if (pGlass == nullptr) {
+ return EQ_SLOT_EMPTY;
+ }
+ const auto type = pGlass->getType();
+ const bool isG2 = (type == SERVO::MaterialsType::G2 || type == SERVO::MaterialsType::G1G2);
+ if (isProcessing) {
+ return isG2 ? EQ_SLOT_PROC_G2 : EQ_SLOT_PROC_G1;
+ }
+ return isG2 ? EQ_SLOT_G2 : EQ_SLOT_G1;
+}
+
+void CPageGraph1::ApplySlotBarTestPattern(int mode)
+{
+ if (m_pGraph == nullptr) return;
+
+ std::vector<COLORREF> colors;
+ colors.reserve(SLOT_MAX);
+ for (int i = 0; i < SLOT_MAX; ++i) {
+ if (mode == 2) {
+ colors.push_back((i % 2 == 0) ? EQ_SLOT_PROC_G1 : EQ_SLOT_PROC_G2);
+ } else if (mode == 1) {
+ colors.push_back((i % 2 == 0) ? EQ_SLOT_G1 : EQ_SLOT_G2);
+ } else {
+ colors.push_back(EQ_SLOT_EMPTY);
+ }
+ }
+
+ struct SlotBarBind {
+ int indicateId;
+ };
+ static const SlotBarBind kSlotBars[] = {
+ { INDICATE_BONDER1 },
+ { INDICATE_FLIPER },
+ { INDICATE_ALIGNER },
+ { INDICATE_LPORT4 },
+ { INDICATE_LPORT3 },
+ { INDICATE_LPORT2 },
+ { INDICATE_LPORT1 },
+ { INDICATE_BONDER2 },
+ { INDICATE_VACUUM_BAKE },
+ { INDICATE_BAKE_COOLING },
+ { INDICATE_MEASUREMENT },
+ };
+
+ for (const auto& item : kSlotBars) {
+ m_pGraph->SetIndicateBoxSlotColors(item.indicateId, colors);
+ }
+}
+
void CPageGraph1::SaveArmOffset(const std::string& armName, const POINT& pt)
{
std::string iniPath = GetConfigPath();
@@ -558,46 +934,35 @@
{
BYSERVOGRAPH_NMHDR* pGraphNmhdr = reinterpret_cast<BYSERVOGRAPH_NMHDR*>(pNMHDR);
+ if (GetKeyState(VK_SHIFT) & 0x8000) {
+ // m_slotBarTestMode = (m_slotBarTestMode + 1) % 3;
+ UpdateSlotBars();
+ *pResult = 0;
+ return;
+ }
+
// 绉诲姩鍒版寚瀹氫綅缃� (娴嬭瘯浣跨敤)
if (pGraphNmhdr->dwData == INDICATE_LPORT1) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Port1);
+
}
- else if (pGraphNmhdr->dwData == INDICATE_LPORT2) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Port2);
+
+ if (m_pGraph != nullptr) {
+ LayoutSlotTable();
+ LOGI("[Graph1] item clicked id=%u", (unsigned)pGraphNmhdr->dwData);
+ auto* pEq = (SERVO::CEquipment*)m_pGraph->GetIndicateBoxData((int)pGraphNmhdr->dwData);
+ m_pSelectedEquipment = pEq;
+ UpdateSlotTable(pEq);
}
- else if (pGraphNmhdr->dwData == INDICATE_LPORT3) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Port3);
- }
- else if (pGraphNmhdr->dwData == INDICATE_LPORT4) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Port4);
- }
- else if (pGraphNmhdr->dwData == INDICATE_ALIGNER) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Aligner);
- }
- else if (pGraphNmhdr->dwData == INDICATE_FLIPER) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Fliper);
- }
- else if (pGraphNmhdr->dwData == INDICATE_BONDER1) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Bonder1);
- }
- else if (pGraphNmhdr->dwData == INDICATE_BONDER2) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Bonder2);
- }
- else if (pGraphNmhdr->dwData == INDICATE_VACUUM_BAKE) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Bake);
- }
- else if (pGraphNmhdr->dwData == INDICATE_BAKE_COOLING) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Cooling);
- }
- else if (pGraphNmhdr->dwData == INDICATE_MEASUREMENT) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Measurement);
- }
+ m_slotTable.ShowWindow(SW_SHOW);
+ m_slotTable.BringWindowToTop();
*pResult = 0;
}
void CPageGraph1::OnTimer(UINT_PTR nIDEvent)
{
+ UpdateLegendPosition();
+
if (TIMER_ID_DEVICE_STATUS == nIDEvent) {
KillTimer(TIMER_ID_DEVICE_STATUS);
@@ -654,6 +1019,7 @@
else if (nIDEvent == TIMER_ID_ROBOT_STATUS) {
SERVO::CEFEM* pEFEM = (SERVO::CEFEM*)theApp.m_model.m_master.getEquipment(EQ_ID_EFEM);
if (!pEFEM || !pEFEM->isAlive()) {
+ UpdateSlotBars();
return;
}
@@ -677,6 +1043,8 @@
if (robotData.position != m_lastRobotPosition) {
StartRobotMoveToPosition(robotData.position);
}
+
+ UpdateSlotBars();
}
else if (nIDEvent == TIMER_ID_ROBOT_ANIMATION) {
if (!m_bIsRobotMoving) {
--
Gitblit v1.9.3