Ver Fonte

1、F5、F6显示或隐藏遥控器和执行器面板;
2、Ribbon面板添加复选框显示或隐藏遥控器和执行器面板;

scbc.sat2 há 5 anos atrás
pai
commit
7a68e39050

+ 44 - 0
SATHelper/SATHelper/MainFrm.cpp

@@ -96,6 +96,10 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWndEx)
 	ON_UPDATE_COMMAND_UI(ID_CHECK_ENABLETW, &CMainFrame::OnUpdateCheckEnabletw)
 	ON_COMMAND(ID_COMBO_TWPORT, &CMainFrame::OnComboTwport)
 	ON_UPDATE_COMMAND_UI(ID_COMBO_TWPORT, &CMainFrame::OnUpdateComboTwport)
+	ON_COMMAND(ID_CHECK_RCONTROL, &CMainFrame::OnCheckRcontrol)
+	ON_UPDATE_COMMAND_UI(ID_CHECK_RCONTROL, &CMainFrame::OnUpdateCheckRcontrol)
+	ON_COMMAND(ID_CHECK_ACTUATOR, &CMainFrame::OnCheckActuator)
+	ON_UPDATE_COMMAND_UI(ID_CHECK_ACTUATOR, &CMainFrame::OnUpdateCheckActuator)
 END_MESSAGE_MAP()
 
 // CMainFrame 构造/析构
@@ -790,6 +794,18 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg)
 			// 必须退出,否则执行2次;
 			return TRUE;
 		}
+
+		// 显示或隐藏遥控器;
+		if (pMsg->wParam == VK_F5)
+		{
+			m_wndIRControl.ShowPane(!m_wndIRControl.IsWindowVisible(), FALSE, !m_wndIRControl.IsWindowVisible());
+		}
+
+		// 显示或隐藏执行器;
+		if (pMsg->wParam == VK_F6)
+		{
+			m_wndDevices.ShowPane(!m_wndDevices.IsWindowVisible(), FALSE, !m_wndDevices.IsWindowVisible());
+		}
 	}
 
 	return CMDIFrameWndEx::PreTranslateMessage(pMsg);
@@ -1739,3 +1755,31 @@ void CMainFrame::OnTraymenuLogin()
 	{
 	}
 }
+
+
+void CMainFrame::OnCheckRcontrol()
+{
+	// TODO: 在此添加命令处理程序代码
+	m_wndIRControl.ShowPane(!m_wndIRControl.IsWindowVisible(), FALSE, !m_wndIRControl.IsWindowVisible());
+}
+
+
+void CMainFrame::OnUpdateCheckRcontrol(CCmdUI* pCmdUI)
+{
+	// TODO: 在此添加命令更新用户界面处理程序代码
+	pCmdUI->SetCheck(m_wndIRControl.IsWindowVisible());
+}
+
+
+void CMainFrame::OnCheckActuator()
+{
+	// TODO: 在此添加命令处理程序代码
+	m_wndDevices.ShowPane(!m_wndDevices.IsWindowVisible(), FALSE, !m_wndDevices.IsWindowVisible());
+}
+
+
+void CMainFrame::OnUpdateCheckActuator(CCmdUI* pCmdUI)
+{
+	// TODO: 在此添加命令更新用户界面处理程序代码
+	pCmdUI->SetCheck(m_wndDevices.IsWindowVisible());
+}

+ 4 - 0
SATHelper/SATHelper/MainFrm.h

@@ -298,6 +298,10 @@ public:
 	afx_msg void OnUpdateCheckEnabletw(CCmdUI* pCmdUI);
 	afx_msg void OnComboTwport();
 	afx_msg void OnUpdateComboTwport(CCmdUI* pCmdUI);
+	afx_msg void OnCheckRcontrol();
+	afx_msg void OnUpdateCheckRcontrol(CCmdUI* pCmdUI);
+	afx_msg void OnCheckActuator();
+	afx_msg void OnUpdateCheckActuator(CCmdUI* pCmdUI);
 };
 
 

+ 4 - 1
SATHelper/SATHelper/Resource.h

@@ -188,17 +188,20 @@
 #define ID_CHECK_SHOT_SYSTEM            32820
 #define ID_CHECK_IR_SHOT                32823
 #define ID_CHECK2                       32824
+#define ID_CHECK_RCONTROL               32824
 #define ID_TRAYMENU_LOGIN               32825
 #define ID_BUTTON2                      32827
 #define ID_CHECK_LINEIN                 32828
 #define ID_DEVICES_DEL                  32829
+#define ID_CHECK3                       32830
+#define ID_CHECK_ACTUATOR               32830
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        327
-#define _APS_NEXT_COMMAND_VALUE         32830
+#define _APS_NEXT_COMMAND_VALUE         32831
 #define _APS_NEXT_CONTROL_VALUE         1022
 #define _APS_NEXT_SYMED_VALUE           310
 #endif

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
SATHelper/SATHelper/res/ribbon.mfcribbon-ms


+ 4 - 1
SATHelper/SATHelper/resource.h

@@ -188,17 +188,20 @@
 #define ID_CHECK_SHOT_SYSTEM            32820
 #define ID_CHECK_IR_SHOT                32823
 #define ID_CHECK2                       32824
+#define ID_CHECK_RCONTROL               32824
 #define ID_TRAYMENU_LOGIN               32825
 #define ID_BUTTON2                      32827
 #define ID_CHECK_LINEIN                 32828
 #define ID_DEVICES_DEL                  32829
+#define ID_CHECK3                       32830
+#define ID_CHECK_ACTUATOR               32830
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        327
-#define _APS_NEXT_COMMAND_VALUE         32830
+#define _APS_NEXT_COMMAND_VALUE         32831
 #define _APS_NEXT_CONTROL_VALUE         1022
 #define _APS_NEXT_SYMED_VALUE           310
 #endif

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff