Merge branch 'clh' into liuyang

mrDarker

2025-05-06 cacea2da59a3acd73f3161d819a10e0060762616

 SourceCode/Bond/Servo/CPageGraph2.cpp

@@ -8,6 +8,8 @@
#include "CHMPropertyDlg.h"
#include "CEquipmentPage1.h"
#include "CEquipmentPage2.h"
#include "CPagePortProperty.h"
#include "CPageCassetteCtrlCmd.h"


// CPageGraph2 对话框
@@ -86,15 +88,26 @@
      SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;

      CHMPropertyDlg dlg(pEquipment->getName().c_str(), 600, 680);
      CEquipmentPage1* pPage1 = new CEquipmentPage1();
      pPage1->setEquipment(pEquipment);
      pPage1->Create(IDD_PAGE_EQUIPMENT1);
      dlg.addPage(pPage1, "test1");

      if (_strcmpi(pEquipment->getClassName(), "CLoadPort") == 0) {
         CPagePortProperty* pPage1 = new CPagePortProperty();
         pPage1->setLoadPort((SERVO::CLoadPort*)pEquipment);
         pPage1->Create(IDD_PAGE_PORT_PROPERTY);
         dlg.addPage(pPage1, "属性");
      }

      CEquipmentPage2* pPage2 = new CEquipmentPage2();
      pPage2->setEquipment(pEquipment);
      pPage2->Create(IDD_PAGE_EQUIPMENT2);
      dlg.addPage(pPage2, "Glass");

      if (pEquipment->getID() == EQ_ID_LOADPORT1
         || pEquipment->getID() == EQ_ID_LOADPORT2) {
         CPageCassetteCtrlCmd* pPage = new CPageCassetteCtrlCmd();
         pPage->setEquipment(pEquipment);
         pPage->Create(IDD_PAGE_CASSETTE_CTRL_CMD);
         dlg.addPage(pPage, "Cassette control command");
      }

      dlg.DoModal();
      return true;
@@ -149,6 +162,69 @@
      }
      else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;

         // 测试下发Cim Message
         /*
         if (pEquipment->getID() == EQ_ID_Bonder1
            || pEquipment->getID() == EQ_ID_Bonder2) {
            static int msgId = 0; msgId++;
            if (msgId % 2 == 0) {
               pEquipment->setCimMessage("Hello!", msgId, 1);
            }
            else {
               pEquipment->setCimMessage("ABC0123456789", msgId, 2);
            }
         }
         */


         // 测试清除Cim Message
         /*
         if (pEquipment->getID() == EQ_ID_Bonder1
            || pEquipment->getID() == EQ_ID_Bonder2) {
            static int msgId = 0; msgId++;
            if (msgId % 2 == 0) {
               pEquipment->clearCimMessage(msgId, 1);
            }
            else {
               pEquipment->clearCimMessage(msgId, 2);
            }
         }
         */

         // 测试设置时间
         /*
         if (pEquipment->getID() == EQ_ID_Bonder1
            || pEquipment->getID() == EQ_ID_Bonder2) {
            CTime time = CTime::GetCurrentTime();
            pEquipment->setDateTime((short)time.GetYear(),
               (short)time.GetMonth(),
               (short)time.GetDay(),
               (short)time.GetHour(),
               (short)time.GetMinute(),
               (short)time.GetSecond());
         }
         */

			
         // 测试设置cim mode
         /*
         if (pEquipment->getID() == EQ_ID_Bonder1
            || pEquipment->getID() == EQ_ID_Bonder2) {
            static int ii = 0; ii++;
            pEquipment->setCimMode(ii % 2 == 0);
         }
         */
			
         /*
         if (pEquipment->getID() == EQ_ID_Bonder1
            || pEquipment->getID() == EQ_ID_Bonder2) {
            static int ii = 0; ii++;
            pEquipment->setEqMode((ii % 5) + 1);
         }
         */

         /*
         SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
         if (pGlass != nullptr) {
            std::string strDescription;
@@ -159,6 +235,13 @@
               pPath = pPath->getNext();
            }
         }
         */


         // 请求主配方列表
         if (pEquipment != nullptr) {
            pEquipment->masterRecipeListRequest(0);
         }			
      }