From 81df82be1f5f401b80780f65e5811685d9a8e4c4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 19 九月 2025 18:03:24 +0800
Subject: [PATCH] 1.修复打开软件加载CControlJob时，玻璃context丢失的问题；
---
SourceCode/Bond/Servo/CMaster.h | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 8536ab2..47bf8cf 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -128,11 +128,15 @@
CControlJob* getControlJob();
CLoadPort* getPortWithCarrierId(const std::string& carrierId) const;
bool saveState() const;
- bool loadState(const std::string& path);
+ bool loadState();
+ void setStateFile(const std::string& path);
int getWipGlasses(std::vector<CGlass*>& glasses);
void test();
+ bool moveGlassToBuf(int eqid, int slotNo);
+ bool moveGlassToSlot(int eqid, int slotNo);
int getPortCassetteSnSeed(int port);
void setPortCassetteSnSeed(int port, int seed);
+ CGlass* getGlass(int scrPort, int scrSlot);
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -188,7 +192,10 @@
bool checkAndUpdatePjComplete(CProcessJob* pJob);
bool checkAndUpdateCjComplete(CControlJob* pJob);
CProcessJob* getGlassProcessJob(CGlass* pGlass);
-
+ bool completeControlJob(std::string description);
+ bool canCreateControlJob();
+ bool canCompleteControlJob();
+ bool canDeleteControlJob();
private:
CRITICAL_SECTION m_criticalSection;
@@ -233,6 +240,8 @@
// 千传圈数计数
int m_nContinuousTransferCount;
int m_nContinuousTransferStep;
+ int m_nContinuousWorkingPort;
+ int m_nContinuousWorkingSlot;
// 新增已经开始处理的ProcessJob列表
std::vector<CProcessJob*> m_inProcesJobs;
@@ -249,6 +258,7 @@
std::string m_strStatePath;
int m_nTestFlag;
+ std::list<CGlass*> m_bufGlass;
};
}
--
Gitblit v1.9.3