From 444ad650bc8d00e38a85a6e671278adf658fe08b Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 13 五月 2025 16:44:54 +0800
Subject: [PATCH] 1. 删除之前的报警和日志按钮 2. 完善PPID和RecipeNo的数据库操作
---
SourceCode/Bond/Servo/ServoDlg.cpp | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 29e60d0..eeba9a2 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -9,7 +9,6 @@
#include "Common.h"
#include "Log.h"
#include "SecsTestDlg.h"
-#include "AlarmDlg.h"
#include <chrono>
#include <thread>
#include <cmath>
@@ -61,7 +60,6 @@
// CServoDlg 对话框
-
CServoDlg::CServoDlg(CWnd* pParent /*=NULL*/)
: CDialogEx(IDD_SERVO_DIALOG, pParent)
{
@@ -82,8 +80,6 @@
void CServoDlg::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
- DDX_Control(pDX, IDC_BUTTON_LOG, m_btnLog);
- DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
}
BEGIN_MESSAGE_MAP(CServoDlg, CDialogEx)
@@ -218,9 +214,9 @@
m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this);
m_pPageGraph2 = new CPageGraph2();
m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
- m_pPageAlarm = new CAlarmDlg();
+ m_pPageAlarm = new CPageAlarm();
m_pPageAlarm->Create(IDD_DIALOG_ALARM, this);
- m_pPageLog = new CLogDlg();
+ m_pPageLog = new CPageLog();
m_pPageLog->Create(IDD_DIALOG_LOG, this);
CHmTab* m_pTab = CHmTab::Hook(GetDlgItem(IDC_TAB1)->m_hWnd);
@@ -645,7 +641,7 @@
LRESULT CServoDlg::OnPanelResize(WPARAM wParam, LPARAM lParam)
{
- int width = wParam;
+ int width = (int)wParam;
// m_pPanel->SetPanelWidth(width);
Resize();
@@ -667,6 +663,4 @@
for (int i = 0; i < 4; i++) {
pPages[i]->ShowWindow(i == index ? SW_SHOW : SW_HIDE);
}
-}
-
-
+}
\ No newline at end of file
--
Gitblit v1.9.3