From 43cd50ae5629f8e18c349fe5e9a58aac298df9f2 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 06 二月 2026 16:58:32 +0800
Subject: [PATCH] 1.修复一个判断逻辑问题；
---
SourceCode/Bond/Servo/CPageGraph1.cpp | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 201 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph1.cpp b/SourceCode/Bond/Servo/CPageGraph1.cpp
index 30d0811..b2d932a 100644
--- a/SourceCode/Bond/Servo/CPageGraph1.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph1.cpp
@@ -8,6 +8,27 @@
#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 } },
@@ -59,6 +80,12 @@
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; // 褰撳墠鏄惁姝ｅ湪鍔ㄧ敾绉诲姩
@@ -136,6 +163,150 @@
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()
{
/* code */
@@ -205,12 +376,16 @@
BOOL CPageGraph1::OnInitDialog()
{
CDialogEx::OnInitDialog();
+ ModifyStyle(0, WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
InitRxWindows();
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);
@@ -222,6 +397,8 @@
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
@@ -230,10 +407,14 @@
int boxSize = GetPrivateProfileIntA("Graph1", "BoxSize", 56, iniPath.c_str());
if (boxSize < 40) boxSize = 40;
if (boxSize > 80) boxSize = 80;
- int slotSize = GetPrivateProfileIntA("Graph1", "SlotSize", 6, iniPath.c_str());
- if (slotSize < 2) slotSize = 2;
- if (slotSize > 12) slotSize = 12;
- m_pGraph->SetSlotBarSize(slotSize);
+ 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;
@@ -447,6 +628,8 @@
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)
@@ -554,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 },
@@ -565,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)
@@ -761,6 +945,16 @@
if (pGraphNmhdr->dwData == INDICATE_LPORT1) {
}
+
+ 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);
+ }
+ m_slotTable.ShowWindow(SW_SHOW);
+ m_slotTable.BringWindowToTop();
*pResult = 0;
}
--
Gitblit v1.9.3