1.开始处理Step属性值； 2.增加左侧master面板；

LAPTOP-SNT8I5JK\Boounion

2025-03-03 bf55b2f3083cbfdeb83611b2fa2dd552bf5b0775

 SourceCode/Bond/Servo/ServoDlg.cpp

@@ -90,6 +90,7 @@
   m_pLogDlg = nullptr;
   m_pTerminalDisplayDlg = nullptr;
   m_pObserver = nullptr;
   m_pPanelMaster = nullptr;
}

void CServoDlg::DoDataExchange(CDataExchange* pDX)
@@ -126,6 +127,9 @@
   ON_WM_TIMER()
   ON_WM_ERASEBKGND()
   ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
   ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
   ON_NOTIFY(BYSERVOGRAPH_ITEM_CLICKED, IDC_SERVO_GRAPH1, &CServoDlg::OnGraphItemClicked)
   ON_MESSAGE(ID_MSG_PANEL_RESIZE, OnPanelResize)
END_MESSAGE_MAP()


@@ -277,6 +281,8 @@
   m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "6", "Robot");




   // Vacuum bake
   m_pGraph->AddIndicateBox(INDICATE_VACUUM_BAKE, 396, 516, 48, RGB(22, 22, 22),
      RGB(255, 127, 39), RGB(0, 176, 80));
@@ -293,6 +299,12 @@
   m_pGraph->AddIndicateBox(INDICATE_MEASUREMENT, 736, 516, 48, RGB(22, 22, 22),
      RGB(255, 127, 39), RGB(0, 176, 80));
   m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "13", "Measurement");



   m_pPanelMaster = new CPanelMaster();
   m_pPanelMaster->Create(IDD_PANEL_MASTER, this);
   m_pPanelMaster->ShowWindow(SW_SHOW);


   // 调整初始窗口位置
@@ -317,6 +329,13 @@

   // 相当于延时调用master的初始化
   theApp.m_model.m_master.init();


   // 绑定数据
   {
      SERVO::CEquipment* pEquipment = theApp.m_model.m_master.getEquipment(EQ_ID_EFEM);
      m_pGraph->SetIndicateBoxData(INDICATE_ROBOT_ARM1, pEquipment);
   }


   return TRUE;  // 除非将焦点设置到控件，否则返回 TRUE
@@ -533,6 +552,12 @@
      m_pTerminalDisplayDlg = nullptr;
   }

   if (m_pPanelMaster != nullptr) {
      m_pPanelMaster->DestroyWindow();
      delete m_pPanelMaster;
      m_pPanelMaster = nullptr;
   }

   if (m_hbrBkgnd != nullptr) {
      ::DeleteObject(m_hbrBkgnd);
   }
@@ -731,6 +756,14 @@

   x = 0;
   y = 0;
   int nPanelWidth = 0;
   if (m_pPanelMaster != nullptr) {
      nPanelWidth = m_pPanelMaster->getPanelWidth();
      m_pPanelMaster->MoveWindow(x, y, nPanelWidth, rcClient.Height());
      x += nPanelWidth;
   }


   pItem = GetDlgItem(IDC_SERVO_GRAPH1);
   pItem->GetClientRect(&rcItem);
   pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
@@ -828,3 +861,26 @@
   CAlarmDlg dlg;
   dlg.DoModal();
}

void CServoDlg::OnGraphItemClicked(NMHDR* pNMHDR, LRESULT* pResult)
{
   BYSERVOGRAPH_NMHDR* pGraphNmhdr = reinterpret_cast<BYSERVOGRAPH_NMHDR*>(pNMHDR);
   CString s; s.Format(_T("OnGraphItemClicked %d"), pGraphNmhdr->dwData);
   SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)m_pGraph->GetIndicateBoxData(pGraphNmhdr->dwData);
   if (pEquipment != nullptr) {
      AfxMessageBox(pEquipment->getName().c_str());
   }
	
	
   *pResult = 0;
}

LRESULT CServoDlg::OnPanelResize(WPARAM wParam, LPARAM lParam)
{
   int width = wParam;
   // m_pPanel->SetPanelWidth(width);
   Resize();

   return 0;
}