From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:43:40 +0800
Subject: [PATCH] 1.修复以下问题： ProceedWithCarrier 直接发 CCC_PROCESS_START：CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时，收到 ProceedWithCarrier 就调用 master.proceedWithCarrier（仅发送 Cassette Process Start，不校验 PJ/CJ 是否存在、SlotMap 是否验通过）。若 Host 流程异常（未下 PJ/CJ）或本地尚未准备好，会把设备推进加工态但无作业可跑。
---
SourceCode/Bond/Servo/ServoGraph.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoGraph.h b/SourceCode/Bond/Servo/ServoGraph.h
index 0a58675..398c638 100644
--- a/SourceCode/Bond/Servo/ServoGraph.h
+++ b/SourceCode/Bond/Servo/ServoGraph.h
@@ -94,6 +94,7 @@
this->box2BackgroundColor = RGB(0, 255, 255);;
this->box2FrameColor = RGB(255, 255, 0);;
this->bBox2Visible = FALSE;
+ this->m_pData = nullptr;
};
~INDICATEBOX() {};
@@ -110,6 +111,7 @@
COLORREF box2FrameColor;
BOOL bBox2Visible;
std::vector<void*> m_contexts;
+ void* m_pData;
};
class INDICATEBKGND
@@ -142,9 +144,11 @@
LRESULT OnTimer(WPARAM wParam, LPARAM lParam);
LRESULT OnPaint(WPARAM wParam, LPARAM lParam);
LRESULT OnMouseMove(WPARAM wParam, LPARAM lParam);
+ LRESULT OnSize(WPARAM wParam, LPARAM lParam);
LRESULT OnLButtonDown(WPARAM wParam, LPARAM lParam);
public:
+ void Invalidata();
void AddImage(int id, char* pszPath, int x, int y);
void AddIndicateBox(int id, int x, int y, int width);
void AddIndicateBox(int id, int x, int y, int width,
@@ -154,6 +158,8 @@
BOOL RemoveIndicateBoxAllContext(int id);
const std::vector<void*>& GetIndicateBoxContexts(int id);
bool IsIndicateBoxContextsEmpty(int id);
+ void SetIndicateBoxData(int id, void* pData);
+ void* GetIndicateBoxData(int id);
void ShowIndicateBoxInterior(int id, COLORREF color);
void HideIndicateBoxInterior(int id);
CServoGraph::INDICATEBOX* GetIndicateBox(int id);
@@ -170,6 +176,8 @@
void UpdateImageCoordinates(int id, int newX, int newY);
void UpdateIndicateBoxCoordinates(int id, int newX, int newY);
void UpdateImageAngle(int id, float angle);
+ void UpdateIndicateBox1Colors(int id, COLORREF newBackgroundColor, COLORREF newFrameColor1, COLORREF newFrameColor2);
+ void UpdateIndicateBox2Colors(int id, COLORREF newBackgroundColor, COLORREF newFrameColor);
private:
void DrawImage(HDC hMemDC, IMAGE& item);
--
Gitblit v1.9.3