Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp

@@ -8,8 +8,15 @@
#include "afxdialogex.h"
#include "Common.h"
#include "PlcView.h"
#include "AlarmMonitor.h"
#include "Log.h"
#include "InputDialog.h"
#include "AddPLCInfo.h"
#include "AxisManager.h"
#include "IOManager.h"

// 测试
#include "AxisSettingsDlg.h"
#include "IOMonitoringDlg.h"


#ifdef _DEBUG
@@ -113,27 +120,45 @@
         if (RX_CODE_SELECT_PLC == code) {
            CPLC* pPlc;
            if (pAny->getPtrValue("ptr", (void*&)pPlc)) {
               ASSERT(m_pMainContainer != nullptr);
               if (m_pActiveView == nullptr) {
                  m_pActiveView = (CPlcView*)CreatePlcView(pPlc);
               if (pPlc != nullptr) {
                  ASSERT(m_pMainContainer != nullptr);
                  if (m_pActiveView == nullptr) {
                     m_pActiveView = (CPlcView*)CreatePlcView(pPlc);
                  }
                  ASSERT(m_pActiveView);
                  if (m_pActiveView->GetContext() != (void*)pPlc) {
                     CString strTitle;
                     strTitle.Format(_T("%s[%s:%d]"), pPlc->getName().c_str(), pPlc->getIp().c_str(),
                        pPlc->getPort());
                     m_pActiveView->SetWindowText(strTitle);
                     m_pActiveView->SetContext(pPlc);
                     m_pActiveView->SendMessage(WM_NCPAINT, 0, 0);
                  }
               } else {
                  CloseView(m_pActiveView);
               }
               ASSERT(m_pActiveView);
               if (m_pActiveView->GetContext() != (void*)pPlc) {
                  m_pActiveView->SetWindowText(pPlc->getName().c_str());
                  m_pActiveView->SetContext(pPlc);
                  m_pActiveView->SendMessage(WM_NCPAINT, 0, 0);
               }

               theApp.m_model.setCurrentPlc(pPlc);
            }
         }
         else if (RX_PLC_STATE_CHANGED == code) {

         }
         else if (code == RX_CODE_ALARM_ON) {
            AlarmOn();
            // CAlarmMonitor* pComponent = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
            // m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
            CPLC* pPlc;
            if (pAny->getPtrValue("ptr", (void*&)pPlc) && pPlc == theApp.m_model.getCurrentPlc()) {
               AlarmOn(pPlc);
               CAlarmMonitor* pComponent = (CAlarmMonitor*)pPlc->getComponent(ALARM_MONITOR);
               m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
            }
         }
         else if (code == RX_CODE_ALARM_OFF) {
            AlarmOff();
            // CAlarmMonitor* pComponent = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
            // m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
            CPLC* pPlc;
            if (pAny->getPtrValue("ptr", (void*&)pPlc) && pPlc == theApp.m_model.getCurrentPlc()) {
               AlarmOff(pPlc);
               CAlarmMonitor* pComponent = (CAlarmMonitor*)pPlc->getComponent(ALARM_MONITOR);
               m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
            }
         }
         pAny->release();
      }, [&]() -> void {
@@ -358,6 +383,12 @@
      m_pPagePlcList = nullptr;
   }
   
   if (m_pPageLogcat != nullptr) {
      m_pPageLogcat->DestroyWindow();
      delete m_pPageLogcat;
      m_pPageLogcat = nullptr;
   }

   if (m_pMainContainer != nullptr) {
      m_pMainContainer->DestroyWindow();
      delete m_pMainContainer;
@@ -447,14 +478,12 @@
   m_bShowLogWnd = !m_bShowLogWnd;

   if (m_bShowLogWnd) {
      LOGD("显示日志窗口");
      m_pPageLogcat->ShowWindow(SW_SHOW);
      m_pPageLogcat->SetParent(m_pMainContainer);
      m_pMainContainer->SetBottomWnd(m_pPageLogcat, LOG_WND_HEIGHT);
      m_pMainContainer->Resize();
   }
   else {
      LOGD("隐藏日志窗口");
      m_pPageLogcat->ShowWindow(SW_HIDE);
      m_pPageLogcat->SetParent(this);
      m_pMainContainer->SetBottomWnd(nullptr, 0);
@@ -477,20 +506,43 @@
{
   int id = (int)lParam;
   if (id == IDC_BUTTON_ADD) {
      static int i = 0;
      char szName[256];
      sprintf_s(szName, 256, "PLC%d", ++i);
      theApp.m_model.addPlc(szName, "192.168.1.188", 1001);
      CAddPLCInfo dlgAddPLCInfo;
      if (dlgAddPLCInfo.DoModal() != IDOK) {
         return 0;
      }

      CString strPLCName = dlgAddPLCInfo.GetPLCName();
      CString strIP = dlgAddPLCInfo.GetIP();
      CString strPort = dlgAddPLCInfo.GetPort();

      if (!strPLCName.IsEmpty() && !strIP.IsEmpty() && !strPort.IsEmpty()) {
         theApp.m_model.addPlc((LPTSTR)(LPCTSTR)strPLCName, (LPTSTR)(LPCTSTR)strIP, std::stoi((LPTSTR)(LPCTSTR)strPort));

         // 新建轴文件
         AxisManager axisManager;
         axisManager.SaveAxis((LPTSTR)(LPCTSTR)strPLCName);

         // 新建IO文件
         IOManager ioManager;
         ioManager.SaveToFile((LPTSTR)(LPCTSTR)strPLCName);
      }
   }
   else if (id == IDC_BUTTON_DELETE) {
      static int i = 0;
      i += 1;
      char szName[256];
      sprintf_s(szName, 256, "PLC%d", i);
      theApp.m_model.removePlc(szName);
      CPLC* pPlc = theApp.m_model.getCurrentPlc();
      if (pPlc != nullptr) {
         theApp.m_model.removePlc(pPlc->getName().c_str());
      }
   }
   else if (id == IDC_BUTTON_SETTINGS) {
      // 测试 IO模块
      CPLC* pPLC = theApp.m_model.getCurrentPlc();
      if (pPLC != nullptr) {
         //CIOMonitoringDlg dlg;
         //dlg.DoModal();

         CAxisSettingsDlg dlg;
         dlg.DoModal();
      }
   }
   else if (id == IDC_BUTTON_OPERATOR) {
      /*
@@ -607,22 +659,22 @@
   m_pMainContainer->Resize();
}

void CBoounionPLCDlg::AlarmOn()
void CBoounionPLCDlg::AlarmOn(CPLC* pPlc)
{
   if (m_pAlarmWnd == nullptr) {
      m_pAlarmWnd = new CAlarmPopupDlg();
      //m_pAlarmWnd->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
      m_pAlarmWnd->SetPLC(pPlc);
      m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
      m_pAlarmWnd->CenterWindow();
   }
   m_pAlarmWnd->AlarmOn();
}

void CBoounionPLCDlg::AlarmOff()
void CBoounionPLCDlg::AlarmOff(CPLC* pPlc)
{
   if (m_pAlarmWnd == nullptr) {
      m_pAlarmWnd = new CAlarmPopupDlg();
      //m_pAlarmWnd->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
      m_pAlarmWnd->SetPLC(pPlc);
      m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
      m_pAlarmWnd->CenterWindow();
   }