1.将CPanel修改为CGlass

LAPTOP-SNT8I5JK\Boounion

2025-03-24 6cd9f24e01c7ecbb7ad47137677590d1d4ae2f04

1.将CPanel修改为CGlass

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -201,7 +201,7 @@
                std::to_string((int)item->getType()).c_str(), ""));
        }

        for (auto item : m_panelList) {
        for (auto item : m_glassList) {
            attrubutes.addAttribute(new CAttribute("Panel",
                item->getID().c_str(), ""));
        }
@@ -492,12 +492,12 @@

        // ç‰©æ–™
        if (code == FLOW_MOVE_MATERIAL) {
            CPanel* pPanel = (CPanel*)pIntent->getContext();
            ASSERT(pPanel);
            if (!glassWillArrive(pPanel)) {
            CGlass* pGlass = (CGlass*)pIntent->getContext();
            ASSERT(pGlass);
            if (!glassWillArrive(pGlass)) {
                return FLOW_REJECT;
            }
            return glassArrived(pPanel);
            return glassArrived(pGlass);
        }


@@ -524,7 +524,7 @@

        // æ¨¡æ‹Ÿå–出第一张Panel,传送到下一环节
        Lock();
        CPanel* pContext = m_panelList.front();
        CGlass* pContext = m_glassList.front();
        pContext->addRef();

        CIntent intent(FLOW_MOVE_MATERIAL, "", pContext);
@@ -533,7 +533,7 @@
            LOGE("<CEquipment>对方拒绝接收Intent.");
        }
        else if (nRet == FLOW_ACCEPT) {
            m_panelList.pop_front();
            m_glassList.pop_front();
            pContext->release();        // æ·»åŠ åˆ°åˆ—队时addRef, å–出时release
        }

@@ -543,27 +543,27 @@
        return 0;
    }

    BOOL CEquipment::glassWillArrive(CPanel* pPanel)
    BOOL CEquipment::glassWillArrive(CGlass* pGlass)
    {
        return TRUE;
    }

    int CEquipment::glassArrived(CPanel* pPanel)
    int CEquipment::glassArrived(CGlass* pGlass)
    {
        Lock();
        pPanel->addRef();
        m_panelList.push_back(pPanel);
        pGlass->addRef();
        m_glassList.push_back(pGlass);
        Unlock();
        return FLOW_ACCEPT;
    }

    void CEquipment::addPanelToList(CPanel* pPanel)
    void CEquipment::addGlassToList(CGlass* pGlass)
    {
        ASSERT(pPanel);
        ASSERT(pGlass);

        Lock();
        pPanel->addRef();
        m_panelList.push_back(pPanel);
        pGlass->addRef();
        m_glassList.push_back(pGlass);
        Unlock();
    }
}

 SourceCode/Bond/Servo/CEquipment.h

@@ -16,7 +16,7 @@
#include <vector>
#include <map>
#include <list>
#include "CPanel.h"
#include "CGlass.h"


namespace SERVO {
@@ -89,9 +89,9 @@
        std::vector<CPin*>& CEquipment::getInputPins();
        std::vector<CPin*>& CEquipment::getOutputPins();
        virtual int recvIntent(CPin* pPin, CIntent* pIntent);
        virtual BOOL glassWillArrive(CPanel* pPanel);
        virtual BOOL glassWillArrive(CGlass* pGlass);
        virtual int outputGlass(int port);
        virtual int glassArrived(CPanel* pPanel);
        virtual int glassArrived(CGlass* pGlass);

    // ä»¥ä¸‹ä¸ºä»ŽCC-Link读取到的Bit标志位检测函数
    public:
@@ -111,7 +111,7 @@
    protected:
        inline void Lock() { EnterCriticalSection(&m_criticalSection); }
        inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
        void addPanelToList(CPanel* pPanel);
        void addGlassToList(CGlass* pGlass);

    protected:
        EquipmentListener m_listener;
@@ -124,7 +124,7 @@
        MemoryBlock m_blockWriteBit;
        std::vector<CPin*> m_inputPins;
        std::vector<CPin*> m_outputPins;
        std::list<CPanel*> m_panelList;
        std::list<CGlass*> m_glassList;


        // ä»¥ä¸‹ä¸ºä»ŽCC-Link读取到的Bit标志位

 SourceCode/Bond/Servo/CGlass.cpp

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
#include "stdafx.h"
#include "CGlass.h"


namespace SERVO {
    CGlass::CGlass()
    {

    }

    CGlass::~CGlass()
    {

    }

    std::string& CGlass::getClassName()
    {
        static std::string strName = "CGlass";
        return strName;
    }

    std::string CGlass::toString()
    {
        std::string strText;
        strText += "CGlass[";
        strText += ("ID:" + m_strID + ";");
        strText += "]";

        return strText;
    }

    void CGlass::setID(const char* pszID)
    {
        m_strID = pszID;
    }

    std::string& CGlass::getID()
    {
        return m_strID;
    }
}

 SourceCode/Bond/Servo/CGlass.h

ÎļþÃû´Ó SourceCode/Bond/Servo/CPanel.h ÐÞ¸Ä
@@ -4,11 +4,11 @@


namespace SERVO {
    class CPanel : public CContext
    class CGlass : public CContext
    {
    public:
        CPanel();
        virtual ~CPanel();
        CGlass();
        virtual ~CGlass();

    public:
        virtual std::string& getClassName();

 SourceCode/Bond/Servo/CLoadPort.cpp

@@ -62,15 +62,15 @@
    int CLoadPort::outputGlass(int port)
    {
        // å¦‚果列表中没有Panel,模拟生成10å¼ 
        if (m_panelList.empty()) {
        if (m_glassList.empty()) {
            static int ii = 0;
            char szBuffer[64];
            LOGI("<CLoadPort>模拟生成10å¼ PANEL");
            for (int i = 0; i < 10; i++) {
                sprintf_s(szBuffer, "P20250320A1A%d", ++ii);
                CPanel* pPanel = new CPanel();
                pPanel->setID(szBuffer);
                addPanelToList(pPanel);
                CGlass* pGlass = new CGlass();
                pGlass->setID(szBuffer);
                addGlassToList(pGlass);
            }
        }


 SourceCode/Bond/Servo/CPanel.cpp

ÎļþÒÑɾ³ý

 SourceCode/Bond/Servo/Servo.vcxproj

@@ -217,12 +217,12 @@
    <ClInclude Include="CEqStatusStep.h" />
    <ClInclude Include="CEqVCREnableStep.h" />
    <ClInclude Include="CFliper.h" />
    <ClInclude Include="CGlass.h" />
    <ClInclude Include="CLoadPort.h" />
    <ClInclude Include="CMeasurement.h" />
    <ClInclude Include="ColorTransfer.h" />
    <ClInclude Include="CPageGraph1.h" />
    <ClInclude Include="CPageGraph2.h" />
    <ClInclude Include="CPanel.h" />
    <ClInclude Include="CPanelAttributes.h" />
    <ClInclude Include="CPanelEquipment.h" />
    <ClInclude Include="CPanelMaster.h" />
@@ -285,12 +285,12 @@
    <ClCompile Include="CEqStatusStep.cpp" />
    <ClCompile Include="CEqVCREnableStep.cpp" />
    <ClCompile Include="CFliper.cpp" />
    <ClCompile Include="CGlass.cpp" />
    <ClCompile Include="CLoadPort.cpp" />
    <ClCompile Include="CMeasurement.cpp" />
    <ClCompile Include="ColorTransfer.cpp" />
    <ClCompile Include="CPageGraph1.cpp" />
    <ClCompile Include="CPageGraph2.cpp" />
    <ClCompile Include="CPanel.cpp" />
    <ClCompile Include="CPanelAttributes.cpp" />
    <ClCompile Include="CPanelEquipment.cpp" />
    <ClCompile Include="CPanelMaster.cpp" />

 SourceCode/Bond/Servo/Servo.vcxproj.filters

@@ -67,13 +67,13 @@
    <ClCompile Include="CBakeCooling.cpp" />
    <ClCompile Include="CVacuumBake.cpp" />
    <ClCompile Include="Intent.cpp" />
    <ClCompile Include="CPanel.cpp" />
    <ClCompile Include="EqsGraphWnd.cpp" />
    <ClCompile Include="ColorTransfer.cpp" />
    <ClCompile Include="MapPosWnd.cpp" />
    <ClCompile Include="HmTab.cpp" />
    <ClCompile Include="CPageGraph1.cpp" />
    <ClCompile Include="CPageGraph2.cpp" />
    <ClCompile Include="CGlass.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="AlarmManager.h" />
@@ -139,13 +139,13 @@
    <ClInclude Include="CBakeCooling.h" />
    <ClInclude Include="CVacuumBake.h" />
    <ClInclude Include="Intent.h" />
    <ClInclude Include="CPanel.h" />
    <ClInclude Include="EqsGraphWnd.h" />
    <ClInclude Include="ColorTransfer.h" />
    <ClInclude Include="MapPosWnd.h" />
    <ClInclude Include="HmTab.h" />
    <ClInclude Include="CPageGraph1.h" />
    <ClInclude Include="CPageGraph2.h" />
    <ClInclude Include="CGlass.h" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="Servo.rc" />