1.修复窗口最大化时，屏幕残留黑块的问题； 2.左侧master面板，未加载时显示"Loading..."

LAPTOP-SNT8I5JK\Boounion

2025-03-11 8e14271d976826c5ef727a1c86acc2da4ecad14a

 SourceCode/Bond/Servo/ServoDlg.cpp

@@ -9,6 +9,7 @@
#include "Common.h"
#include "Log.h"
#include "SecsTestDlg.h"
#include "AlarmDlg.h"
#include <chrono>
#include <thread>
#include <cmath>
@@ -90,6 +91,9 @@
   m_pAlarmDlg = nullptr;
   m_pTerminalDisplayDlg = nullptr;
   m_pObserver = nullptr;
   m_pPanelMaster = nullptr;
   m_pPanelEquipment = nullptr;
   m_pPanelAttributes = nullptr;
}

void CServoDlg::DoDataExchange(CDataExchange* pDX)
@@ -122,11 +126,16 @@
   ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SECSTEST, &CServoDlg::OnUpdateMenuFileSecsTest)
   ON_COMMAND(ID_MENU_WND_LOG, &CServoDlg::OnMenuWndLog)
   ON_UPDATE_COMMAND_UI(ID_MENU_WND_LOG, &CServoDlg::OnUpdateMenuWndLog)
   ON_COMMAND(ID_MENU_WND_ALARM, &CServoDlg::OnMenuWndAlarm)
   ON_UPDATE_COMMAND_UI(ID_MENU_WND_ALARM, &CServoDlg::OnUpdateMenuWndAlarm)
   ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
   ON_WM_INITMENUPOPUP()
   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()


@@ -164,6 +173,35 @@
               }
            }
         }
         else if (RX_CODE_SELECT_EQUIPMENT == code) {
            SERVO::CEquipment* pEquipment = nullptr;
            if (pAny->getPtrValue("ptr", (void*&)pEquipment)) {
               ASSERT(pEquipment);
               ASSERT(m_pPanelEquipment);
               ASSERT(m_pPanelAttributes);
               m_pPanelEquipment->SetEquipment(pEquipment);
               m_pPanelAttributes->ShowWindow(SW_HIDE);
               if (!m_pPanelEquipment->IsWindowVisible()) {
                  m_pPanelEquipment->ShowWindow(SW_SHOW);
                  Resize();
               }
            }
         }
         else if (RX_CODE_SELECT_STEP == code) {
            SERVO::CStep* pStep = nullptr;
            if (pAny->getPtrValue("ptr", (void*&)pStep)) {
               ASSERT(pStep);
               ASSERT(m_pPanelEquipment);
               ASSERT(m_pPanelAttributes);
               m_pPanelEquipment->ShowWindow(SW_HIDE);
               m_pPanelAttributes->loadDataFromStep(pStep);
               if (!m_pPanelAttributes->IsWindowVisible()) {
                  m_pPanelAttributes->ShowWindow(SW_SHOW);
                  Resize();
               }
            }
         }

         pAny->release();
      }, [&]() -> void {
         // onComplete
@@ -278,6 +316,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));
@@ -294,6 +334,17 @@
   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);
   m_pPanelEquipment = new CPanelEquipment();
   m_pPanelEquipment->Create(IDD_PANEL_EQUIPMENT, this);
   m_pPanelAttributes = new CPanelAttributes();
   m_pPanelAttributes->Create(IDD_PANEL_ATTRIBUTES, this);
	


   // 调整初始窗口位置
@@ -318,6 +369,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
@@ -474,6 +532,16 @@
   pCmdUI->SetCheck(m_bShowLogWnd);
}

void CServoDlg::OnMenuWndAlarm()
{
   OnBnClickedButtonAlarm();
}

void CServoDlg::OnUpdateMenuWndAlarm(CCmdUI* pCmdUI)
{
   pCmdUI->SetCheck(m_bShowAlarmWnd);
}

void CServoDlg::OnMenuFileExit()
{
   PostMessage(WM_CLOSE);
@@ -541,6 +609,24 @@
      m_pTerminalDisplayDlg = nullptr;
   }

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

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

   if (m_pPanelAttributes != nullptr) {
      m_pPanelAttributes->DestroyWindow();
      delete m_pPanelAttributes;
      m_pPanelAttributes = nullptr;
   }
	
   if (m_hbrBkgnd != nullptr) {
      ::DeleteObject(m_hbrBkgnd);
   }
@@ -550,6 +636,35 @@
      m_pObserver = NULL;
   }

}

void CServoDlg::OnBnClickedButtonAlarm()
{
   m_bShowAlarmWnd = !m_bShowAlarmWnd;

   // 如果要显示报警窗口，则隐藏日志窗口
   if (m_bShowLogWnd) {
      m_bShowLogWnd = false;
      if (m_pLogDlg != nullptr) {
         m_pLogDlg->ShowWindow(SW_HIDE);
         UpdateLogBtn();
      }
   }

   if (m_pAlarmDlg == nullptr) {
      m_pAlarmDlg = new CAlarmDlg();
      m_pAlarmDlg->Create(IDD_DIALOG_ALARM, this);

      CRect rcWnd;
      GetWindowRect(&rcWnd);
      int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
      if (nHeight < 280) nHeight = 280;
      m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
   }
   ASSERT(m_pAlarmDlg);
   m_pAlarmDlg->ShowWindow(m_bShowAlarmWnd ? SW_SHOW : SW_HIDE);

   UpdateAlarmBtn();
}

void CServoDlg::OnBnClickedButtonLog()
@@ -571,11 +686,13 @@

      CRect rcWnd;
      GetWindowRect(&rcWnd);
      m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
      int nHeight = GetSystemMetrics(SM_CYSCREEN) - rcWnd.bottom - 38;
      if (nHeight < 280) nHeight = 280;
      m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), nHeight);
   }
   ASSERT(m_pLogDlg);
   m_pLogDlg->ShowWindow(m_bShowLogWnd ? SW_SHOW : SW_HIDE);

	
   UpdateLogBtn();
}

@@ -738,6 +855,7 @@
   CDialogEx::OnSize(nType, cx, cy);
   if (GetDlgItem(IDC_SERVO_GRAPH1) == nullptr) return;
   Resize();
   Invalidate();
}

void CServoDlg::Resize()
@@ -749,20 +867,41 @@

   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;
   }

   if (m_pPanelEquipment != nullptr && m_pPanelEquipment->IsWindowVisible()) {
      nPanelWidth = m_pPanelEquipment->getPanelWidth();
      m_pPanelEquipment->MoveWindow(x, y, nPanelWidth, rcClient.Height());
      x += nPanelWidth;
   }

   if (m_pPanelAttributes != nullptr && m_pPanelAttributes->IsWindowVisible()) {
      nPanelWidth = m_pPanelAttributes->getPanelWidth();
      m_pPanelAttributes->MoveWindow(x, y, nPanelWidth, rcClient.Height());
      x += nPanelWidth;
   }

   pItem = GetDlgItem(IDC_SERVO_GRAPH1);
   pItem->GetClientRect(&rcItem);
   pItem->MoveWindow(x, y, rcItem.Width(), rcItem.Height());
   y += rcItem.Height();
   y += 8;

   x = 8;
   x = rcClient.right - 8;
   pItem = GetDlgItem(IDC_BUTTON_LOG);
   pItem->GetClientRect(&rcItem);
   x -= rcItem.Width();
   pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
   x -= 8;

   x = 20 + rcItem.Width();
   pItem = GetDlgItem(IDC_BUTTON_ALARM);
   pItem->GetClientRect(&rcItem);
   x -= rcItem.Width();
   pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
}

@@ -809,13 +948,13 @@
   if (m_pLogDlg != nullptr && !m_pLogDlg->IsZoomed()) {
      CRect rcWnd;
      GetWindowRect(&rcWnd);
      m_pLogDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
      m_pLogDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
   }

   if (m_pAlarmDlg != nullptr && !m_pAlarmDlg->IsZoomed()) {
      CRect rcWnd;
      GetWindowRect(&rcWnd);
      m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
      m_pAlarmDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
   }

   CDialogEx::OnMove(x, y);
@@ -854,31 +993,25 @@
   return CDialogEx::OnEraseBkgnd(pDC);
}


void CServoDlg::OnBnClickedButtonAlarm()
void CServoDlg::OnGraphItemClicked(NMHDR* pNMHDR, LRESULT* pResult)
{
   // TODO: 在此添加控件通知处理程序代码
   m_bShowAlarmWnd = !m_bShowAlarmWnd;

   // 如果要显示报警窗口，则隐藏日志窗口
   if (m_bShowAlarmWnd) {
      m_bShowLogWnd = false;
      if (m_pLogDlg != nullptr) {
         m_pLogDlg->ShowWindow(SW_HIDE);
         UpdateLogBtn();
      }
   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());
   }

   if (m_pAlarmDlg == nullptr) {
      m_pAlarmDlg = new CAlarmDlg();
      m_pAlarmDlg->Create(IDD_DIALOG_ALARM, this);

      CRect rcWnd;
      GetWindowRect(&rcWnd);
      m_pAlarmDlg->MoveWindow(rcWnd.left, rcWnd.bottom - 8, rcWnd.Width(), 200);
   }
   ASSERT(m_pAlarmDlg);
   m_pAlarmDlg->ShowWindow(m_bShowAlarmWnd ? SW_SHOW : SW_HIDE);

   UpdateAlarmBtn();
	
	
   *pResult = 0;
}

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

   return 0;
}