Merge branch 'clh' into liuyang

mrDarker

2025-04-01 1bc4fecb9cc1641ed3ad0a2fda30766fc06fb13e

 SourceCode/Bond/Servo/CPageGraph2.cpp

@@ -5,6 +5,9 @@
#include "Servo.h"
#include "CPageGraph2.h"
#include "afxdialogex.h"
#include "CHMPropertyDlg.h"
#include "CEquipmentPage1.h"
#include "CEquipmentPage2.h"


// CPageGraph2 对话框
@@ -80,6 +83,20 @@
   };
   listener.onDblckEqItem = [&](EQITEM* pItem) -> bool {
      ASSERT(pItem);
      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");

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

      dlg.DoModal();
      return true;
   };
   listener.onRclickEqItem = [&](EQITEM* pItem) -> bool {
@@ -130,6 +147,19 @@
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
         pEquipment->outputGlass(1);
      }
      else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
         SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
         if (pGlass != nullptr) {
            std::string strDescription;
            SERVO::CPath* pPath = pGlass->getPath();
            while (pPath != nullptr) {
               pPath->getDescription(strDescription);
               AfxMessageBox(strDescription.c_str());
               pPath = pPath->getNext();
            }
         }
      }


      return true;