From fb8a51bc09f2648034ff661f19415c5670e57e31 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 13 十一月 2024 16:40:22 +0800
Subject: [PATCH] 1.修改文件名和类名称；
---
/dev/null | 11 -----
SourceCode/Bond/BondEq/Model.h | 6 +-
SourceCode/Bond/BondEq/Bonder.cpp | 17 ++++++++
SourceCode/Bond/BondEq/Bonder.h | 11 +++++
SourceCode/Bond/BondEq/BondEqDlg.cpp | 10 ++--
SourceCode/Bond/BondEq/Model.cpp | 4 +-
SourceCode/Bond/BondEq/BondEq.vcxproj | 4 +-
7 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index 0259e86..9f72b98 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -215,7 +215,7 @@
<ClInclude Include="Model.h" />
<ClInclude Include="CPageAlarm.h" />
<ClInclude Include="Resource.h" />
- <ClInclude Include="Servo.h" />
+ <ClInclude Include="Bonder.h" />
<ClInclude Include="SetPage1.h" />
<ClInclude Include="SetPage2.h" />
<ClInclude Include="SettingsDlg.h" />
@@ -251,7 +251,7 @@
<ClCompile Include="LogEdit.cpp" />
<ClCompile Include="Model.cpp" />
<ClCompile Include="CPageAlarm.cpp" />
- <ClCompile Include="Servo.cpp" />
+ <ClCompile Include="Bonder.cpp" />
<ClCompile Include="SetPage1.cpp" />
<ClCompile Include="SetPage2.cpp" />
<ClCompile Include="SettingsDlg.cpp" />
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 62305d3..63621f8 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -7,7 +7,7 @@
#include "BondEqDlg.h"
#include "afxdialogex.h"
#include "Common.h"
-#include "Servo.h"
+#include "Bonder.h"
#include "SettingsDlg.h"
#include "UserManager.h"
#include "LoginDlg.h"
@@ -279,8 +279,8 @@
void CBondEqDlg::OnClose()
{
// TODO: 在此添加消息处理程序代码和/或调用默认值
- CServo& servo = theApp.m_model.getServo();
- if (servo.isRunning()) {
+ CBonder& bonder = theApp.m_model.getBonder();
+ if (bonder.isRunning()) {
AfxMessageBox("程序和机器正在运行中，请先停止工作再退出程序！");
return;
}
@@ -453,7 +453,7 @@
void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
+ pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
}
void CBondEqDlg::OnMenuFileExit()
@@ -463,7 +463,7 @@
void CBondEqDlg::OnUpdateMenuFileExit(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
+ pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
}
void CBondEqDlg::OnMenuHelpAbout()
diff --git a/SourceCode/Bond/BondEq/Bonder.cpp b/SourceCode/Bond/BondEq/Bonder.cpp
new file mode 100644
index 0000000..7dd03ab
--- /dev/null
+++ b/SourceCode/Bond/BondEq/Bonder.cpp
@@ -0,0 +1,17 @@
+#include "stdafx.h"
+#include "Bonder.h"
+
+
+CBonder::CBonder()
+{
+}
+
+
+CBonder::~CBonder()
+{
+}
+
+BOOL CBonder::isRunning()
+{
+ return FALSE;
+}
\ No newline at end of file
diff --git a/SourceCode/Bond/BondEq/Bonder.h b/SourceCode/Bond/BondEq/Bonder.h
new file mode 100644
index 0000000..5dcaf5d
--- /dev/null
+++ b/SourceCode/Bond/BondEq/Bonder.h
@@ -0,0 +1,11 @@
+#pragma once
+class CBonder
+{
+public:
+ CBonder();
+ ~CBonder();
+
+public:
+ BOOL isRunning();
+};
+
diff --git a/SourceCode/Bond/BondEq/Model.cpp b/SourceCode/Bond/BondEq/Model.cpp
index 017bc5a..73e1d7e 100644
--- a/SourceCode/Bond/BondEq/Model.cpp
+++ b/SourceCode/Bond/BondEq/Model.cpp
@@ -160,9 +160,9 @@
return 0;
}
-CServo& CModel::getServo()
+CBonder& CModel::getBonder()
{
- return m_servo;
+ return m_bonder;
}
BEQ::IRemoteEquipment* CModel::getBond1()
diff --git a/SourceCode/Bond/BondEq/Model.h b/SourceCode/Bond/BondEq/Model.h
index db77ee0..9a74296 100644
--- a/SourceCode/Bond/BondEq/Model.h
+++ b/SourceCode/Bond/BondEq/Model.h
@@ -1,5 +1,5 @@
#pragma once
-#include "Servo.h"
+#include "Bonder.h"
#include "Configuration.h"
@@ -16,7 +16,7 @@
int term();
void onTimer(UINT nTimerid);
int createRemoteEqs();
- CServo& getServo();
+ CBonder& getBonder();
BEQ::IRemoteEquipment* getBond1();
public:
@@ -42,7 +42,7 @@
CString m_strDataDir;
private:
- CServo m_servo;
+ CBonder m_bonder;
BEQ::IServo* m_pServo;
BEQ::IRemoteEquipment* m_pEqBond1;
int m_nTimerID;
diff --git a/SourceCode/Bond/BondEq/Servo.cpp b/SourceCode/Bond/BondEq/Servo.cpp
deleted file mode 100644
index 20d78a2..0000000
--- a/SourceCode/Bond/BondEq/Servo.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "stdafx.h"
-#include "Servo.h"
-
-
-CServo::CServo()
-{
-}
-
-
-CServo::~CServo()
-{
-}
-
-BOOL CServo::isRunning()
-{
- return FALSE;
-}
\ No newline at end of file
diff --git a/SourceCode/Bond/BondEq/Servo.h b/SourceCode/Bond/BondEq/Servo.h
deleted file mode 100644
index 2cbc006..0000000
--- a/SourceCode/Bond/BondEq/Servo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-class CServo
-{
-public:
- CServo();
- ~CServo();
-
-public:
- BOOL isRunning();
-};
-
--
Gitblit v1.9.3