日志Page界面处理。

Source/OGCAssistTool/OGCAssistTool/OGCAssistTool.rc

@@ -118,27 +118,27 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_STATICEDGE
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    GROUPBOX        "参数",IDC_STATIC,7,7,717,31
+    GROUPBOX        "参数",IDC_STATIC,7,7,714,31
     EDITTEXT        EDIT_LINE,37,18,52,14,ES_AUTOHSCROLL | ES_READONLY
     LTEXT           "线体:",IDC_STATIC,15,21,20,8
-    EDITTEXT        EDIT_BATCH_NUMBER,119,18,96,14,ES_AUTOHSCROLL
-    LTEXT           "BOM:",IDC_STATIC,98,21,18,8
+    EDITTEXT        EDIT_BATCH_NUMBER,127,18,88,14,ES_AUTOHSCROLL
+    LTEXT           "批次号:",IDC_STATIC,98,21,28,8
     CONTROL         "锁定",CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,457,20,32,10,WS_EX_TRANSPARENT
     LTEXT           "▲E标准值:",IDC_STATIC,355,21,38,8
     LTEXT           "▲E类型:",IDC_STATIC,266,21,30,8
     COMBOBOX        COMBO_ETYPE,301,18,48,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT        EDIT_EVALUE,394,18,48,14,ES_AUTOHSCROLL
     CONTROL         "",SPIN_EVALUE,"msctls_updown32",UDS_ARROWKEYS,443,18,11,14
-    EDITTEXT        EDIT_SN,514,18,154,14,ES_AUTOHSCROLL
-    LTEXT           "SN:",IDC_STATIC,500,21,11,8
-    CONTROL         "",LIST_DEBUG_DATA,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,41,717,242
-    GROUPBOX        "结果：",IDC_STATIC,7,284,717,31
+    EDITTEXT        EDIT_SN,511,18,154,14,ES_AUTOHSCROLL
+    LTEXT           "SN:",IDC_STATIC,497,21,11,8
+    CONTROL         "",LIST_DEBUG_DATA,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,41,714,242
+    GROUPBOX        "结果：",IDC_STATIC,7,284,714,31
     LTEXT           "▲E平均值：",IDC_STATIC,15,298,43,8
     EDITTEXT        EDIT_ARG_EVALUE,64,295,73,14,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "显示窗口",BTN_SHOW_WND,557,295,50,14
-    CONTROL         "劫持窗口",CHECK_HIJACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,669,297,48,10
-    PUSHBUTTON      "测试",BTN_TEST,669,18,50,14
-    PUSHBUTTON      "连接设备",BTN_CONNECT,612,295,50,14
+    PUSHBUTTON      "显示窗口",BTN_SHOW_WND,555,295,50,14
+    CONTROL         "劫持窗口",CHECK_HIJACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,667,297,48,10
+    PUSHBUTTON      "测试",BTN_TEST,666,18,50,14
+    PUSHBUTTON      "连接设备",BTN_CONNECT,610,295,50,14
     PUSHBUTTON      "加载数据",BTN_LOAD_DATA,216,18,40,14
     CTEXT           "",LABLE_RESULT,146,294,59,15
 END
@@ -148,6 +148,19 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_STATICEDGE
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
+    GROUPBOX        "设置",IDC_STATIC,7,7,715,36
+    CONTROL         "调试时间",CHECK_TEST_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,22,48,10
+    CONTROL         "",IDC_DATETIMEPICKER1,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,67,20,76,15
+    CONTROL         "调试结果",CHECK_TEST_RESULT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,494,22,43,10
+    CONTROL         "批次号",CHECK_BATCH_NUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,243,22,33,10
+    CONTROL         "SN",CHECK_SN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,367,22,19,10
+    EDITTEXT        EDIT_BATCH_NUM,280,20,78,14,ES_AUTOHSCROLL
+    EDITTEXT        EDIT_SN,389,20,98,14,ES_AUTOHSCROLL
+    CONTROL         "",IDC_DATETIMEPICKER2,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,156,20,76,15
+    PUSHBUTTON      "查询",BTN_QUERY,662,20,50,14
+    LTEXT           "至",IDC_STATIC,146,23,9,8
+    COMBOBOX        IDC_COMBO1,539,20,48,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,47,715,270
 END
 
 PAGE_STATISTICS DIALOGEX 0, 0, 732, 322
@@ -239,7 +252,7 @@ BEGIN
     PAGE_DEBUG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 724
+        RIGHTMARGIN, 721
         TOPMARGIN, 7
         BOTTOMMARGIN, 315
     END
@@ -247,9 +260,9 @@ BEGIN
     PAGE_LOG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 493
+        RIGHTMARGIN, 722
         TOPMARGIN, 7
-        BOTTOMMARGIN, 236
+        BOTTOMMARGIN, 317
     END
 
     PAGE_STATISTICS, DIALOG
@@ -295,6 +308,15 @@ BEGIN
     0
 END
 
+PAGE_LOG DLGINIT
+BEGIN
+    IDC_COMBO1, 0x403, 5, 0
+0xc9b3, 0xa6b9, "\000" 
+    IDC_COMBO1, 0x403, 5, 0
+0xa7ca, 0xdcb0, "\000" 
+    0
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //

Source/OGCAssistTool/OGCAssistTool/PageDebug.cpp

@@ -353,6 +353,8 @@ DWORD CPageDebug::ThreadGoProc(LPVOID lpParam)
 				GLOBAL::g_procWndInfo.bConnectStatus = !msg_info.byResult;
 				m_pDlg->SetDlgItemText(BTN_CONNECT, msg_info.byResult ? _T("Á¬½ÓÉ豸") : _T("¶Ï¿ªÁ¬½Ó"));
 				m_pDlg->m_btnConnect.SetFaceColor(msg_info.byResult ? COLOR_RED : COLOR_GREED);
+				m_pDlg->GetDlgItem(BTN_TEST)->EnableWindow(TRUE);
+				m_pDlg->GetDlgItem(EDIT_SN)->EnableWindow(TRUE);
 			}
 			break;
 		case C2S_GO:
@@ -499,6 +501,7 @@ DWORD CPageDebug::ThreadGoProc(LPVOID lpParam)
 				}
 
 				m_pDlg->GetDlgItem(BTN_TEST)->EnableWindow(TRUE);
+				m_pDlg->GetDlgItem(EDIT_SN)->EnableWindow(TRUE);
 			}
 			break;
 		default:
@@ -629,6 +632,7 @@ void CPageDebug::OnBnClickedTest()
 		}
 
 		GetDlgItem(BTN_TEST)->EnableWindow(FALSE);
+		GetDlgItem(EDIT_SN)->EnableWindow(FALSE);
 		//SetTimer(1, 500, NULL);
 	}
 	else

Source/OGCAssistTool/OGCAssistTool/PageLog.cpp

@@ -23,10 +23,14 @@ CPageLog::~CPageLog()
 void CPageLog::DoDataExchange(CDataExchange* pDX)
 {
 	CDialogEx::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_DATETIMEPICKER1, m_dtStartTime);
+	DDX_Control(pDX, IDC_DATETIMEPICKER2, m_dtEndTime);
+	DDX_Control(pDX, IDC_LIST1, m_ctrlList);
 }
 
 
 BEGIN_MESSAGE_MAP(CPageLog, CDialogEx)
+	ON_WM_CTLCOLOR()
 END_MESSAGE_MAP()
 
 
@@ -37,7 +41,58 @@ BOOL CPageLog::OnInitDialog()
 	CDialogEx::OnInitDialog();
 
 	// TODO:  在此添加额外的初始化
-	SetBackgroundColor(RGB(255,255,255));
+	SetBackgroundColor(RGB(200,200,200));
+
+	m_dtStartTime.SetFormat(_T("MM/dd HH:mm:ss"));
+	m_dtEndTime.SetFormat(_T("MM/dd HH:mm:ss"));
+
+	m_ctrlList.SetListFont(_T("新宋体"), 11, TRUE);
+	m_ctrlList.SetHeadings(
+		_T("批次号,90"),
+		_T("SN,90"),
+		_T("调试时间,90"),
+		_T("调试耗时,90"),
+		_T("▲E实际值,90"),
+		_T("▲E标准值,90"),
+		_T("32组RGB▲E值,190"),
+		NULL
+		);	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	// 异常: OCX 属性页应返回 FALSE
 }
+
+HBRUSH CPageLog::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+{
+	HBRUSH hbr = CDialogEx::OnCtlColor(pDC, pWnd, nCtlColor);
+
+	// TODO:  在此更改 DC 的任何属性
+	// TODO:  在此更改 DC 的任何属性
+	switch ( pWnd->GetDlgCtrlID() ) 
+	{
+	case CHECK_TEST_TIME:
+	case CHECK_TEST_RESULT:
+	case CHECK_SN:
+	case CHECK_BATCH_NUM:
+		{
+#if 1 // 透明控件处理;
+			pDC->SetBkMode(TRANSPARENT);
+
+			CRect rc;
+			pWnd->GetWindowRect(&rc);
+			ScreenToClient(&rc);
+
+			CDC* dc = GetDC();
+			pDC->BitBlt(0,0,rc.Width(),rc.Height(),dc,rc.left,rc.top,SRCCOPY);  //把父窗口背景图片先画到按钮上
+
+			ReleaseDC(dc);
+			hbr = (HBRUSH) ::GetStockObject(NULL_BRUSH);
+#endif
+		}
+		break;
+	default:
+		break; 
+	}
+	// TODO:  如果默认的不是所需画笔，则返回另一个画笔
+	return hbr;
+}

Source/OGCAssistTool/OGCAssistTool/PageLog.h

@@ -1,5 +1,8 @@
 #pragma once
-
+#include "afxdtctl.h"
+#include "afxcmn.h"
+#include "SortHeaderCtrl.h"
+#include "ListSortCtrl.h"
 
 // CDlgLog ¶Ô»°¿ò
 
@@ -20,4 +23,8 @@ protected:
 	DECLARE_MESSAGE_MAP()
 public:
 	virtual BOOL OnInitDialog();
+	CDateTimeCtrl m_dtStartTime;
+	CDateTimeCtrl m_dtEndTime;
+	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+	CListSortCtrl m_ctrlList;
 };

Source/OGCAssistTool/OGCAssistTool/resource.h

@@ -18,13 +18,16 @@
 #define IDC_TAB                         1000
 #define EDIT_PASSWORD                   1001
 #define IDC_BUTTON1                     1001
+#define BTN_QUERY                       1001
 #define EDIT_LINE                       1002
 #define IDC_EDIT1                       1002
+#define EDIT_BATCH_NUM                  1002
 #define CHECK_OFFLINE                   1003
 #define IDC_EDIT2                       1003
 #define EDIT_BATCH_NUMBER               1003
 #define IDC_CHECK1                      1004
 #define CHECK_LOCK                      1004
+#define CHECK_TEST_TIME                 1004
 #define IDC_COMBO1                      1005
 #define COMBO_ETYPE                     1005
 #define IDC_EDIT3                       1006
@@ -41,14 +44,20 @@
 #define BTN_CONNECT                     1016
 #define BTN_LOAD_DATA                   1017
 #define LABLE_RESULT                    1018
+#define IDC_DATETIMEPICKER1             1019
+#define CHECK_TEST_RESULT               1020
+#define CHECK_BATCH_NUM                 1021
+#define CHECK_SN                        1022
+#define IDC_DATETIMEPICKER2             1023
+#define IDC_LIST1                       1024
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        134
+#define _APS_NEXT_RESOURCE_VALUE        135
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1019
+#define _APS_NEXT_CONTROL_VALUE         1025
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif