1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示

chenluhua1980

6 天以前 bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb

 SourceCode/Bond/BondEq/CComponentPLCDlg.cpp

@@ -38,6 +38,7 @@
   ON_WM_SIZE()
   ON_BN_CLICKED(IDC_BUTTON_PLC_AXIS_SETTINGS, &CComponentPLCDlg::OnBnClickedButtonAxisSetting)
   ON_BN_CLICKED(IDC_BUTTON_PLC_IO, &CComponentPLCDlg::OnBnClickedButtonIO)
   ON_WM_TIMER()
END_MESSAGE_MAP()


@@ -53,8 +54,19 @@
         // onNext
         pAny->addRef();
         int code = pAny->getCode();
         if (RX_CODE_ALARM_EVENT == code) {

         if (RX_CODE_PLC1_CONNECTTD == code) {
            CComponent* pComponent;
            if (pAny->getPtrValue("ptr", (void*&)pComponent)
               && pComponent == m_pContext) {
               EnableGroup1(TRUE);
            }
         }
         else if (RX_CODE_PLC1_DISCONNECTTD == code) {
            CComponent* pComponent;
            if (pAny->getPtrValue("ptr", (void*&)pComponent)
               && pComponent == m_pContext) {
               EnableGroup1(FALSE);
            }
         }
         pAny->release();
         }, [&]() -> void {
@@ -72,12 +84,24 @@
BOOL CComponentPLCDlg::OnInitDialog()
{
   CComponentDlg::OnInitDialog();

   SetTimer(1, 200, NULL);

   return TRUE;  // return TRUE unless you set the focus to a control
              // 异常: OCX 属性页应返回 FALSE
}

void CComponentPLCDlg::OnTimer(UINT_PTR nIDEvent)
{
   // TODO: 在此添加消息处理程序代码和/或调用默认值
   if (1 == nIDEvent) {
      KillTimer(1);
      InitRxWindows();
      CPLC* pPLC = (CPLC*)m_pContext;
      EnableGroup1(pPLC->isConnected());
   }

   CComponentDlg::OnTimer(nIDEvent);
}

HBRUSH CComponentPLCDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
{
@@ -128,9 +152,14 @@

void CComponentPLCDlg::OnBnClickedButtonAxisSetting()
{
   std::string strName = RecipeManager::getInstance().getCurrentRecipeName();
   if (strName.empty()) {
      AfxMessageBox("未选择配方！", MB_ICONERROR);
   }

   CAxisSettingsDlg axisDlg;
   axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
   axisDlg.SetRecipeName(_T("Default"));
   axisDlg.SetPLC((CPLC*)m_pContext);
   axisDlg.SetRecipeName(strName.c_str());
   axisDlg.DoModal();
}

@@ -142,3 +171,9 @@
   dlg.DoModal();
}

void CComponentPLCDlg::EnableGroup1(BOOL bEnable)
{
   GetDlgItem(IDC_BUTTON_PLC_AXIS_SETTINGS)->EnableWindow(bEnable);
   GetDlgItem(IDC_BUTTON_PLC_IO)->EnableWindow(bEnable);
}