Merge branch 'liuyang' into clh

LAPTOP-SNT8I5JK\Boounion

2024-12-02 e5d448c95b18b46068453fa95527f1de1f7f0d45

 SourceCode/Bond/BondEq/BondEqDlg.cpp

@@ -14,6 +14,7 @@

// test
#include "AxisSettingsDlg.h"
#include "UserManagerDlg.h"


#ifdef _DEBUG
@@ -452,8 +453,14 @@

void CBondEqDlg::OnMenuFileSettings()
{
   CAxisSettingsDlg axisDlg;
   axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
   axisDlg.DoModal();

   /*
   CSettingsDlg dlg;
   dlg.DoModal();
   */
}

void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
@@ -537,14 +544,9 @@
         ShowLoginDlg();
      }
      else if (2 == menuId) {
         if (userManager.isLoggedIn()) {
            userManager.logout();
            m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
         }

         CAxisSettingsDlg axisDlg;
         axisDlg.SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
         axisDlg.DoModal();
         // test
         CUserManagerDlg dlg;
         dlg.DoModal();
      }
   }