Merge branch 'clh' into liuyang

mrDarker

2025-06-16 56fd8f57fcc763ae079ae752d82e41b38d7d9e5f

 SourceCode/Bond/BondEq/CPanelProject.cpp

@@ -18,7 +18,9 @@
   m_hbrBkgnd = nullptr;
   m_nPanelWidth = int((double)GetSystemMetrics(SM_CXSCREEN) * 0.25);
   m_pAccordionWnd = nullptr;
   m_pPageRemoteEqs = nullptr;
   //m_pPageRemoteEqs = nullptr;
   m_pPageMain = nullptr;
   m_pPageComponents = nullptr;
}

CPanelProject::~CPanelProject()
@@ -70,11 +72,21 @@
   m_pAccordionWnd->Setpadding(PADDING_BOTTOM, 2);
   m_pAccordionWnd->LoadExpandIcon(strExpandIcon, strCloseIcon);
   
   m_pPageRemoteEqs = new CProjectPageRemoteEqs();
   m_pPageRemoteEqs->Create(IDD_PROJECT_PAGE_REMOTEEQS, GetDlgItem(IDC_ACCORDION_WND1));
   m_pPageRemoteEqs->ShowWindow(SW_SHOW);
   m_pAccordionWnd->AddItem("远程设备", m_pPageRemoteEqs, 0, TRUE, TRUE);
   //m_pPageRemoteEqs = new CProjectPageRemoteEqs();
   //m_pPageRemoteEqs->Create(IDD_PROJECT_PAGE_REMOTEEQS, GetDlgItem(IDC_ACCORDION_WND1));
   //m_pPageRemoteEqs->ShowWindow(SW_SHOW);
   //m_pAccordionWnd->AddItem("远程设备", m_pPageRemoteEqs, 0, TRUE, TRUE);

   m_pPageMain = new CProjectPageMain();
   m_pPageMain->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
   m_pPageMain->Create(IDD_PROJECT_PAGE_MAIN, GetDlgItem(IDC_ACCORDION_WND1));
   m_pPageMain->ShowWindow(SW_SHOW);
   m_pAccordionWnd->AddItem("主页面", m_pPageMain, 0, TRUE, TRUE);
   
   m_pPageComponents = new CProjectPageComponents();
   m_pPageComponents->Create(IDD_PROJECT_PAGE_COMPONENTS, GetDlgItem(IDC_ACCORDION_WND1));
   m_pPageComponents->ShowWindow(SW_SHOW);
   m_pAccordionWnd->AddItem("组件列表", m_pPageComponents, -1, TRUE, TRUE);

   return TRUE;  // return TRUE unless you set the focus to a control
              // 异常: OCX 属性页应返回 FALSE
@@ -110,10 +122,22 @@
      ::DeleteObject(m_hbrBkgnd);
   }

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

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

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