From 31aa10eaae103c30e02d7dc6c71ff4e50de361b3 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 12 五月 2025 15:28:32 +0800
Subject: [PATCH] 1. 修改报警的显示模式(包括日志,需要后期修复) 2. 添加Release模式编译

---
 SourceCode/Bond/Servo/ServoDlg.cpp |  358 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 190 insertions(+), 168 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 8babfd8..b0fb6cd 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -68,10 +68,10 @@
 	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
 	m_crBkgnd = APPDLG_BACKGROUND_COLOR;
 	m_hbrBkgnd = nullptr;
-	m_bShowLogWnd = FALSE;
-	m_bShowAlarmWnd = FALSE;
-	m_pLogDlg = nullptr;
-	m_pAlarmDlg = nullptr;
+	//m_bShowLogWnd = FALSE;
+	//m_bShowAlarmWnd = FALSE;
+	//m_pLogDlg = nullptr;
+	//m_pAlarmDlg = nullptr;
 	m_pTerminalDisplayDlg = nullptr;
 	m_pObserver = nullptr;
 	m_pPanelMaster = nullptr;
@@ -79,13 +79,15 @@
 	m_pPanelAttributes = nullptr;
 	m_pPageGraph1 = nullptr;
 	m_pPageGraph2 = nullptr;
+	m_pPageGraph3 = nullptr;
+	m_pPageGraph4 = nullptr;
 }
 
 void CServoDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CDialogEx::DoDataExchange(pDX);
-	DDX_Control(pDX, IDC_BUTTON_LOG, m_btnLog);
-	DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
+	//DDX_Control(pDX, IDC_BUTTON_LOG, m_btnLog);
+	//DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
 }
 
 BEGIN_MESSAGE_MAP(CServoDlg, CDialogEx)
@@ -96,11 +98,11 @@
 	ON_BN_CLICKED(IDCANCEL, &CServoDlg::OnBnClickedCancel)
 	ON_WM_CTLCOLOR()
 	ON_WM_DESTROY()
-	ON_BN_CLICKED(IDC_BUTTON_LOG, &CServoDlg::OnBnClickedButtonLog)
+	//ON_BN_CLICKED(IDC_BUTTON_LOG, &CServoDlg::OnBnClickedButtonLog)
 	ON_WM_SIZE()
 	ON_WM_CLOSE()
-	ON_MESSAGE(ID_MSG_LOGDLG_HIDE, &CServoDlg::OnLogDlgHide)
-	ON_MESSAGE(ID_MSG_ALARMDLG_HIDE, &CServoDlg::OnAlarmDlgHide)
+	//ON_MESSAGE(ID_MSG_LOGDLG_HIDE, &CServoDlg::OnLogDlgHide)
+	//ON_MESSAGE(ID_MSG_ALARMDLG_HIDE, &CServoDlg::OnAlarmDlgHide)
 	ON_WM_MOVING()
 	ON_WM_MOVE()
 	ON_COMMAND(ID_MENU_FILE_EXIT, &CServoDlg::OnMenuFileExit)
@@ -109,10 +111,10 @@
 	ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SETTINGS, &CServoDlg::OnUpdateMenuFileSettings)
 	ON_COMMAND(ID_MENU_FILE_SECSTEST, &CServoDlg::OnMenuFileSecsTest)
 	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_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_TEST_MESSAGE_SET, &CServoDlg::OnMenuTestMessageSet)
 	ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnUpdateMenuTestMessageSet)
 	ON_COMMAND(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnMenuTestMessageClear)
@@ -120,8 +122,7 @@
 	ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
 	ON_WM_INITMENUPOPUP()
 	ON_WM_TIMER()
-	ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
-	ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
+	//ON_BN_CLICKED(IDC_BUTTON_ALARM, &CServoDlg::OnBnClickedButtonAlarm)
 	ON_MESSAGE(ID_MSG_PANEL_RESIZE, OnPanelResize)
 	ON_NOTIFY(BYHMTAB_SEL_CHANGED, IDC_TAB1, &CServoDlg::OnTabSelChanged)
 END_MESSAGE_MAP()
@@ -229,13 +230,18 @@
 	m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this);
 	m_pPageGraph2 = new CPageGraph2();
 	m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
-
+	m_pPageGraph3 = new CAlarmDlg();
+	m_pPageGraph3->Create(IDD_DIALOG_ALARM, this);
+	m_pPageGraph4 = new CLogDlg();
+	m_pPageGraph4->Create(IDD_DIALOG_LOG, this);
 
 	CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
 	m_pTab->SetPaddingLeft(20);
 	m_pTab->SetItemMarginLeft(18);
 	m_pTab->AddItem("状态图", FALSE);
 	m_pTab->AddItem("连接图", TRUE);
+	m_pTab->AddItem("报警", TRUE);
+	m_pTab->AddItem("日志", TRUE);
 	m_pTab->SetCurSel(0);
 	m_pTab->SetBkgndColor(RGB(222, 222, 222));
 	ShowChildPage(0);
@@ -264,9 +270,9 @@
 
 	SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
 	InitRxWindows();
-	OnBnClickedButtonLog();
-	UpdateLogBtn();
-	UpdateAlarmBtn();
+	//OnBnClickedButtonLog();
+	//UpdateLogBtn();
+	//UpdateAlarmBtn();
 	Resize();
 
 
@@ -422,25 +428,25 @@
 	pCmdUI->Enable(TRUE);
 }
 
-void CServoDlg::OnMenuWndLog()
-{
-	OnBnClickedButtonLog();
-}
+//void CServoDlg::OnMenuWndLog()
+//{
+//	OnBnClickedButtonLog();
+//}
 
-void CServoDlg::OnUpdateMenuWndLog(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_bShowLogWnd);
-}
+//void CServoDlg::OnUpdateMenuWndLog(CCmdUI* pCmdUI)
+//{
+//	pCmdUI->SetCheck(m_bShowLogWnd);
+//}
 
-void CServoDlg::OnMenuWndAlarm()
-{
-	OnBnClickedButtonAlarm();
-}
+//void CServoDlg::OnMenuWndAlarm()
+//{
+//	OnBnClickedButtonAlarm();
+//}
 
-void CServoDlg::OnUpdateMenuWndAlarm(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_bShowAlarmWnd);
-}
+//void CServoDlg::OnUpdateMenuWndAlarm(CCmdUI* pCmdUI)
+//{
+//	pCmdUI->SetCheck(m_bShowAlarmWnd);
+//}
 
 void CServoDlg::OnMenuFileExit()
 {
@@ -519,17 +525,17 @@
 {
 	CDialogEx::OnDestroy();
 
-	if (m_pLogDlg != nullptr) {
-		m_pLogDlg->DestroyWindow();
-		delete m_pLogDlg;
-		m_pLogDlg = nullptr;
-	}
+	//if (m_pLogDlg != nullptr) {
+	//	m_pLogDlg->DestroyWindow();
+	//	delete m_pLogDlg;
+	//	m_pLogDlg = nullptr;
+	//}
 
-	if (m_pAlarmDlg != nullptr) {
-		m_pAlarmDlg->DestroyWindow();
-		delete m_pAlarmDlg;
-		m_pAlarmDlg = nullptr;
-	}
+	//if (m_pAlarmDlg != nullptr) {
+	//	m_pAlarmDlg->DestroyWindow();
+	//	delete m_pAlarmDlg;
+	//	m_pAlarmDlg = nullptr;
+	//}
 
 	if (m_pTerminalDisplayDlg != nullptr) {
 		m_pTerminalDisplayDlg->DestroyWindow();
@@ -567,6 +573,18 @@
 		m_pPageGraph2 = nullptr;
 	}
 
+	if (m_pPageGraph3 != nullptr) {
+		m_pPageGraph3->DestroyWindow();
+		delete m_pPageGraph3;
+		m_pPageGraph3 = nullptr;
+	}
+
+	if (m_pPageGraph4 != nullptr) {
+		m_pPageGraph4->DestroyWindow();
+		delete m_pPageGraph4;
+		m_pPageGraph4 = nullptr;
+	}
+
 	if (m_hbrBkgnd != nullptr) {
 		::DeleteObject(m_hbrBkgnd);
 	}
@@ -578,85 +596,85 @@
 
 }
 
-void CServoDlg::OnBnClickedButtonAlarm()
-{
-	m_bShowAlarmWnd = !m_bShowAlarmWnd;
+//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();
+//}
 
-	// 如果要显示报警窗口,则隐藏日志窗口
-	if (m_bShowLogWnd) {
-		m_bShowLogWnd = false;
-		if (m_pLogDlg != nullptr) {
-			m_pLogDlg->ShowWindow(SW_HIDE);
-			UpdateLogBtn();
-		}
-	}
+//void CServoDlg::OnBnClickedButtonLog()
+//{
+//	m_bShowLogWnd = !m_bShowLogWnd;
+//
+//	// 如果要显示日志窗口,则隐藏报警窗口
+//	if (m_bShowLogWnd) {
+//		m_bShowAlarmWnd = false;
+//		if (m_pAlarmDlg != nullptr) {
+//			m_pAlarmDlg->ShowWindow(SW_HIDE);
+//			UpdateAlarmBtn();
+//		}
+//	}
+//
+//	if (m_pLogDlg == nullptr) {
+//		m_pLogDlg = new CLogDlg();
+//		m_pLogDlg->Create(IDD_DIALOG_LOG, this);
+//
+//		CRect rcWnd;
+//		GetWindowRect(&rcWnd);
+//		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();
+//}
 
-	if (m_pAlarmDlg == nullptr) {
-		m_pAlarmDlg = new CAlarmDlg();
-		m_pAlarmDlg->Create(IDD_DIALOG_ALARM, this);
+//void CServoDlg::UpdateLogBtn()
+//{
+//	m_btnLog.SetFrameColor(BS_NORMAL, BTN_LOG_FRAME_NORMAL);
+//	m_btnLog.SetFrameColor(BS_HOVER, BTN_LOG_FRAME_HOVER);
+//	m_btnLog.SetFrameColor(BS_PRESS, BTN_LOG_FRAME_PRESS);
+//	m_btnLog.SetBkgndColor(BS_NORMAL, m_bShowLogWnd ? BTN_LOG_BKGND_PRESS : BTN_LOG_BKGND_NORMAL);
+//	m_btnLog.SetBkgndColor(BS_HOVER, BTN_LOG_BKGND_HOVER);
+//	m_btnLog.SetBkgndColor(BS_PRESS, BTN_LOG_BKGND_PRESS);
+//	m_btnLog.Invalidate();
+//}
 
-		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()
-{
-	m_bShowLogWnd = !m_bShowLogWnd;
-
-	// 如果要显示日志窗口,则隐藏报警窗口
-	if (m_bShowLogWnd) {
-		m_bShowAlarmWnd = false;
-		if (m_pAlarmDlg != nullptr) {
-			m_pAlarmDlg->ShowWindow(SW_HIDE);
-			UpdateAlarmBtn();
-		}
-	}
-
-	if (m_pLogDlg == nullptr) {
-		m_pLogDlg = new CLogDlg();
-		m_pLogDlg->Create(IDD_DIALOG_LOG, this);
-
-		CRect rcWnd;
-		GetWindowRect(&rcWnd);
-		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();
-}
-
-void CServoDlg::UpdateLogBtn()
-{
-	m_btnLog.SetFrameColor(BS_NORMAL, BTN_LOG_FRAME_NORMAL);
-	m_btnLog.SetFrameColor(BS_HOVER, BTN_LOG_FRAME_HOVER);
-	m_btnLog.SetFrameColor(BS_PRESS, BTN_LOG_FRAME_PRESS);
-	m_btnLog.SetBkgndColor(BS_NORMAL, m_bShowLogWnd ? BTN_LOG_BKGND_PRESS : BTN_LOG_BKGND_NORMAL);
-	m_btnLog.SetBkgndColor(BS_HOVER, BTN_LOG_BKGND_HOVER);
-	m_btnLog.SetBkgndColor(BS_PRESS, BTN_LOG_BKGND_PRESS);
-	m_btnLog.Invalidate();
-}
-
-void CServoDlg::UpdateAlarmBtn()
-{
-	m_btnAlarm.SetFrameColor(BS_NORMAL, BTN_ALARM_FRAME_NORMAL);
-	m_btnAlarm.SetFrameColor(BS_HOVER, BTN_ALARM_FRAME_HOVER);
-	m_btnAlarm.SetFrameColor(BS_PRESS, BTN_ALARM_FRAME_PRESS);
-	m_btnAlarm.SetBkgndColor(BS_NORMAL, m_bShowAlarmWnd ? BTN_ALARM_BKGND_PRESS : BTN_ALARM_BKGND_NORMAL);
-	m_btnAlarm.SetBkgndColor(BS_HOVER, BTN_ALARM_BKGND_HOVER);
-	m_btnAlarm.SetBkgndColor(BS_PRESS, BTN_ALARM_BKGND_PRESS);
-	m_btnAlarm.Invalidate();
-}
+//void CServoDlg::UpdateAlarmBtn()
+//{
+//	m_btnAlarm.SetFrameColor(BS_NORMAL, BTN_ALARM_FRAME_NORMAL);
+//	m_btnAlarm.SetFrameColor(BS_HOVER, BTN_ALARM_FRAME_HOVER);
+//	m_btnAlarm.SetFrameColor(BS_PRESS, BTN_ALARM_FRAME_PRESS);
+//	m_btnAlarm.SetBkgndColor(BS_NORMAL, m_bShowAlarmWnd ? BTN_ALARM_BKGND_PRESS : BTN_ALARM_BKGND_NORMAL);
+//	m_btnAlarm.SetBkgndColor(BS_HOVER, BTN_ALARM_BKGND_HOVER);
+//	m_btnAlarm.SetBkgndColor(BS_PRESS, BTN_ALARM_BKGND_PRESS);
+//	m_btnAlarm.Invalidate();
+//}
 
 void CServoDlg::OnSize(UINT nType, int cx, int cy)
 {
@@ -664,6 +682,8 @@
 	if (GetDlgItem(IDC_TAB1) == nullptr) return;
 	if (m_pPageGraph1 == nullptr) return;
 	if (m_pPageGraph2 == nullptr) return;
+	if (m_pPageGraph3 == nullptr) return;
+	if (m_pPageGraph4 == nullptr) return;
 	
 	Resize();
 	Invalidate();
@@ -706,19 +726,21 @@
 
 	m_pPageGraph1->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
 	m_pPageGraph2->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
+	m_pPageGraph3->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
+	m_pPageGraph4->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height());
 
 
-	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 = 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;
 
-	pItem = GetDlgItem(IDC_BUTTON_ALARM);
-	pItem->GetClientRect(&rcItem);
-	x -= rcItem.Width();
-	pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+	//pItem = GetDlgItem(IDC_BUTTON_ALARM);
+	//pItem->GetClientRect(&rcItem);
+	//x -= rcItem.Width();
+	//pItem->MoveWindow(x, rcClient.bottom - 8 - rcItem.Height(), rcItem.Width(), rcItem.Height());
 }
 
 void CServoDlg::OnClose()
@@ -728,31 +750,31 @@
 	CDialogEx::OnClose();
 }
 
-LRESULT CServoDlg::OnLogDlgHide(WPARAM wParam, LPARAM lParam)
-{
-	m_bShowLogWnd = FALSE;
-	UpdateLogBtn();
-	LOGE("OnLogDlgHide");
+//LRESULT CServoDlg::OnLogDlgHide(WPARAM wParam, LPARAM lParam)
+//{
+//	m_bShowLogWnd = FALSE;
+//	UpdateLogBtn();
+//	LOGE("OnLogDlgHide");
+//
+//	unsigned int DATAID, RPTID;
+//	DATAID = 111;
+//	RPTID = 1001;
+//	std::vector<std::string> v;
+//	v.push_back("abc");
+//	v.push_back("def");
+//	theApp.m_model.m_hsmsPassive.requestEventReportSend(DATAID, RPTID, v);
+//
+//	return 0;
+//}
 
-	unsigned int DATAID, RPTID;
-	DATAID = 111;
-	RPTID = 1001;
-	std::vector<std::string> v;
-	v.push_back("abc");
-	v.push_back("def");
-	theApp.m_model.m_hsmsPassive.requestEventReportSend(DATAID, RPTID, v);
-
-	return 0;
-}
-
-LRESULT CServoDlg::OnAlarmDlgHide(WPARAM wParam, LPARAM lParam)
-{
-	m_bShowAlarmWnd = FALSE;
-	UpdateAlarmBtn();
-	LOGE("OnAlarmDlgHide");
-
-	return 0;
-}
+//LRESULT CServoDlg::OnAlarmDlgHide(WPARAM wParam, LPARAM lParam)
+//{
+//	m_bShowAlarmWnd = FALSE;
+//	UpdateAlarmBtn();
+//	LOGE("OnAlarmDlgHide");
+//
+//	return 0;
+//}
 
 void CServoDlg::OnMoving(UINT fwSide, LPRECT pRect)
 {
@@ -761,17 +783,17 @@
 
 void CServoDlg::OnMove(int x, int y)
 {
-	if (m_pLogDlg != nullptr && !m_pLogDlg->IsZoomed()) {
-		CRect rcWnd;
-		GetWindowRect(&rcWnd);
-		m_pLogDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
-	}
+	//if (m_pLogDlg != nullptr && !m_pLogDlg->IsZoomed()) {
+	//	CRect rcWnd;
+	//	GetWindowRect(&rcWnd);
+	//	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->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
-	}
+	//if (m_pAlarmDlg != nullptr && !m_pAlarmDlg->IsZoomed()) {
+	//	CRect rcWnd;
+	//	GetWindowRect(&rcWnd);
+	//	m_pAlarmDlg->SetWindowPos(nullptr, rcWnd.left, rcWnd.bottom - 8, 0, 0, SWP_NOSIZE);
+	//}
 
 	CDialogEx::OnMove(x, y);
 }
@@ -816,9 +838,9 @@
 
 void CServoDlg::ShowChildPage(int index)
 {
-	ASSERT(0 <= index && index < 3);
-	static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2 };
-	for (int i = 0; i < 2; i++) {
+	ASSERT(0 <= index && index < 4);
+	static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageGraph3, m_pPageGraph4 };
+	for (int i = 0; i < 3; i++) {
 		pPages[i]->ShowWindow(i == index ? SW_SHOW : SW_HIDE);
 	}
 }

--
Gitblit v1.9.3