From 63a4a159a2dd300eafcb5b62124923fa21544217 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 05 九月 2025 18:01:15 +0800
Subject: [PATCH] 1.Glass工艺履历准备工作。

---
 SourceCode/Bond/Servo/ServoDlg.cpp |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 573a713..646641d 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -94,6 +94,7 @@
 	m_pPanelAttributes = nullptr;
 	m_pPageGraph1 = nullptr;
 	m_pPageGraph2 = nullptr;
+	m_pPageGlassList = nullptr;
 	m_pPageAlarm = nullptr;
 	m_pPageLog = nullptr;
 	m_pPageTransferLog = nullptr;
@@ -365,6 +366,8 @@
 	m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this);
 	m_pPageGraph2 = new CPageGraph2();
 	m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
+	m_pPageGlassList = new CPageGlassList();
+	m_pPageGlassList->Create(IDD_PAGE_GLASS_LIST, this);
 	m_pPageRecipe = new CPageRecipe();
 	m_pPageRecipe->Create(IDD_PAGE_RECIPE, this);
 	m_pPageAlarm = new CPageAlarm();
@@ -379,10 +382,11 @@
 	m_pTab->SetItemMarginLeft(18);
 	m_pTab->AddItem("状态图", FALSE);
 	m_pTab->AddItem("连接图", TRUE);
+	m_pTab->AddItem("Glass", TRUE);
 	m_pTab->AddItem("配方", TRUE);
 	m_pTab->AddItem("报警", TRUE);
 	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);
@@ -733,6 +737,12 @@
 		m_pPageGraph2 = nullptr;
 	}
 
+	if (m_pPageGlassList != nullptr) {
+		m_pPageGlassList->DestroyWindow();
+		delete m_pPageGlassList;
+		m_pPageGlassList = nullptr;
+	}
+
 	if (m_pPageRecipe != nullptr) {
 		m_pPageRecipe->DestroyWindow();
 		delete m_pPageRecipe;
@@ -774,6 +784,7 @@
 	if (GetDlgItem(IDC_TAB1) == nullptr) return;
 	if (m_pPageGraph1 == nullptr) return;
 	if (m_pPageGraph2 == nullptr) return;
+	if (m_pPageGlassList == nullptr) return;
 	if (m_pPageRecipe == nullptr) return;
 	if (m_pPageAlarm == nullptr) return;
 	if (m_pPageLog == nullptr) return;
@@ -829,6 +840,7 @@
 
 	m_pPageGraph1->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
 	m_pPageGraph2->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
+	m_pPageGlassList->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
 	m_pPageRecipe->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
 	m_pPageAlarm->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
 	m_pPageLog->MoveWindow(x, y, rcClient.Width() - x, y2 - y);
@@ -914,9 +926,11 @@
 
 void CServoDlg::ShowChildPage(int index)
 {
-	ASSERT(0 <= index && index < 6);
-	static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageRecipe, m_pPageAlarm, m_pPageLog, m_pPageTransferLog };
-	for (int i = 0; i < 6; i++) {
+	static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageGlassList, 
+		m_pPageRecipe, m_pPageAlarm, m_pPageLog, m_pPageTransferLog };
+	ASSERT(0 <= index && index < sizeof(pPages) / sizeof(CWnd*));
+
+	for (int i = 0; i < sizeof(pPages) / sizeof(CWnd*); i++) {
 		pPages[i]->ShowWindow(i == index ? SW_SHOW : SW_HIDE);
 	}
 }

--
Gitblit v1.9.3