完成Tab标签功能，调整窗口大小。

Source/OGCAssistTool/OGCAssistTool/OGCAssistTool.rc

@@ -113,17 +113,32 @@ BEGIN
     LTEXT           "线体：",IDC_STATIC,70,71,25,8
 END
 
-PAGE_DEBUG DIALOGEX 0, 0, 500, 243
+PAGE_DEBUG DIALOGEX 0, 0, 732, 322
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_STATICEDGE
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "确定",IDOK,388,222,50,14
-    PUSHBUTTON      "取消",IDCANCEL,443,222,50,14
-    PUSHBUTTON      "调试",IDC_BUTTON1,95,86,50,14
+    DEFPUSHBUTTON   "确定",IDOK,388,301,50,14
+    PUSHBUTTON      "取消",IDCANCEL,674,301,50,14
+    PUSHBUTTON      "调试",IDC_BUTTON1,7,301,50,14
+    GROUPBOX        "参数",IDC_STATIC,7,7,717,33
+    EDITTEXT        IDC_EDIT1,50,18,96,14,ES_AUTOHSCROLL
+    LTEXT           "线体：",IDC_STATIC,24,21,25,8
+    EDITTEXT        IDC_EDIT2,187,18,96,14,ES_AUTOHSCROLL
+    LTEXT           "BOM：",IDC_STATIC,159,21,24,8
+    CONTROL         "锁定",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,285,20,32,10
+    LTEXT           "?E标准值：",IDC_STATIC,425,20,42,8
+    LTEXT           "?E类型：",IDC_STATIC,330,21,34,8
+    COMBOBOX        IDC_COMBO1,364,18,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_EDIT3,463,17,50,14,ES_AUTOHSCROLL
+    CONTROL         "",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,513,17,11,14
+    EDITTEXT        IDC_EDIT4,570,18,96,14,ES_AUTOHSCROLL
+    LTEXT           "SN：",IDC_STATIC,542,21,18,8
 END
 
-PAGE_LOG DIALOGEX 0, 0, 500, 243
+PAGE_LOG DIALOGEX 0, 0, 732, 322
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_STATICEDGE
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "确定",IDOK,388,222,50,14
@@ -131,8 +146,9 @@ BEGIN
     PUSHBUTTON      "日志",IDC_BUTTON1,95,86,50,14
 END
 
-PAGE_STATISTICS DIALOGEX 0, 0, 500, 243
+PAGE_STATISTICS DIALOGEX 0, 0, 732, 322
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_STATICEDGE
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "确定",IDOK,388,222,50,14
@@ -140,8 +156,9 @@ BEGIN
     PUSHBUTTON      "统计",IDC_BUTTON1,95,86,50,14
 END
 
-PAGE_CONFIG DIALOGEX 0, 0, 500, 243
+PAGE_CONFIG DIALOGEX 0, 0, 732, 322
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_STATICEDGE
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "确定",IDOK,388,222,50,14
@@ -224,9 +241,9 @@ BEGIN
     PAGE_DEBUG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 493
+        RIGHTMARGIN, 724
         TOPMARGIN, 7
-        BOTTOMMARGIN, 236
+        BOTTOMMARGIN, 315
     END
 
     PAGE_LOG, DIALOG

Source/OGCAssistTool/OGCAssistTool/OGCAssistTool.vcproj

@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\..\..\..\bin\$(SolutionName)"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			CharacterSet="1"
@@ -96,8 +96,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\..\..\..\bin\$(SolutionName)"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			CharacterSet="1"
@@ -285,10 +285,6 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
-			<File
-				RelativePath=".\res\bitmap1.bmp"
-				>
-			</File>
 			<File
 				RelativePath=".\res\logo.bmp"
 				>

Source/OGCAssistTool/OGCAssistTool/OGCAssistToolDlg.cpp

@@ -104,6 +104,8 @@ BOOL COGCAssistToolDlg::OnInitDialog()
 	SetIcon(m_hIcon, FALSE);		// 设置小图标
 
 	// TODO: 在此添加额外的初始化代码
+	//SetBackgroundImage(IDB_LOGO);
+	//SetBackgroundColor(RGB(255,255,255));
 	InitTabCtrl();
 
 	return TRUE;  // 除非将焦点设置到控件，否则返回 TRUE
@@ -241,3 +243,14 @@ void COGCAssistToolDlg::OnTcnSelchangeTab(NMHDR *pNMHDR, LRESULT *pResult)
 
 	*pResult = 0;
 }
+
+BOOL COGCAssistToolDlg::DestroyWindow()
+{
+	// TODO: 在此添加专用代码和/或调用基类
+	for ( int i = 0; i < 4; i++ )
+	{
+		delete m_pDialog[i];
+		m_pDialog[i] = NULL;
+	}
+	return CDialogEx::DestroyWindow();
+}

Source/OGCAssistTool/OGCAssistTool/OGCAssistToolDlg.h

@@ -37,4 +37,5 @@ public:
 	CImageList  m_ImageList;
 	void InitTabCtrl();
 	afx_msg void OnTcnSelchangeTab(NMHDR *pNMHDR, LRESULT *pResult);
+	virtual BOOL DestroyWindow();
 };

Source/OGCAssistTool/OGCAssistTool/PageConfig.cpp

@@ -31,3 +31,13 @@ END_MESSAGE_MAP()
 
 
 // CDlgDebug 消息处理程序
+
+BOOL CPageConfig::OnInitDialog()
+{
+	CDialogEx::OnInitDialog();
+
+	// TODO:  在此添加额外的初始化
+	SetBackgroundColor(RGB(255,255,255));
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// 异常: OCX 属性页应返回 FALSE
+}

Source/OGCAssistTool/OGCAssistTool/PageConfig.h

@@ -18,4 +18,6 @@ protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV Ö§³Ö
 
 	DECLARE_MESSAGE_MAP()
+public:
+	virtual BOOL OnInitDialog();
 };

Source/OGCAssistTool/OGCAssistTool/PageDebug.cpp

@@ -31,3 +31,13 @@ END_MESSAGE_MAP()
 
 
 // CDlgDebug 消息处理程序
+
+BOOL CPageDebug::OnInitDialog()
+{
+	CDialogEx::OnInitDialog();
+
+	// TODO:  在此添加额外的初始化
+	SetBackgroundColor(RGB(255,255,255));
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// 异常: OCX 属性页应返回 FALSE
+}

Source/OGCAssistTool/OGCAssistTool/PageDebug.h

@@ -18,4 +18,6 @@ protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV Ö§³Ö
 
 	DECLARE_MESSAGE_MAP()
+public:
+	virtual BOOL OnInitDialog();
 };

Source/OGCAssistTool/OGCAssistTool/PageLog.cpp

@@ -31,3 +31,13 @@ END_MESSAGE_MAP()
 
 
 // CDlgDebug 消息处理程序
+
+BOOL CPageLog::OnInitDialog()
+{
+	CDialogEx::OnInitDialog();
+
+	// TODO:  在此添加额外的初始化
+	SetBackgroundColor(RGB(255,255,255));
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// 异常: OCX 属性页应返回 FALSE
+}

Source/OGCAssistTool/OGCAssistTool/PageLog.h

@@ -18,4 +18,6 @@ protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV Ö§³Ö
 
 	DECLARE_MESSAGE_MAP()
+public:
+	virtual BOOL OnInitDialog();
 };

Source/OGCAssistTool/OGCAssistTool/PageStatistics.cpp

@@ -31,3 +31,13 @@ END_MESSAGE_MAP()
 
 
 // CDlgDebug 消息处理程序
+
+BOOL CPageStatistics::OnInitDialog()
+{
+	CDialogEx::OnInitDialog();
+
+	// TODO:  在此添加额外的初始化
+	SetBackgroundColor(RGB(255,255,255));
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// 异常: OCX 属性页应返回 FALSE
+}

Source/OGCAssistTool/OGCAssistTool/PageStatistics.h

@@ -18,4 +18,6 @@ protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV Ö§³Ö
 
 	DECLARE_MESSAGE_MAP()
+public:
+	virtual BOOL OnInitDialog();
 };

Source/OGCAssistTool/OGCAssistTool/resource.h

@@ -9,7 +9,6 @@
 #define IDR_MAINFRAME                   128
 #define PAGE_DEBUG                      129
 #define IDB_LOGO                        130
-#define IDB_BITMAP1                     132
 #define IDB_TAB                         132
 #define DLG_LOGIN                       310
 #define PAGE_LOG                        311
@@ -20,7 +19,14 @@
 #define EDIT_PASSWORD                   1001
 #define IDC_BUTTON1                     1001
 #define EDIT_LINE                       1002
+#define IDC_EDIT1                       1002
 #define CHECK_OFFLINE                   1003
+#define IDC_EDIT2                       1003
+#define IDC_CHECK1                      1004
+#define IDC_COMBO1                      1005
+#define IDC_EDIT3                       1006
+#define IDC_SPIN1                       1007
+#define IDC_EDIT4                       1008
 
 // Next default values for new objects
 // 
@@ -28,7 +34,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        133
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1002
+#define _APS_NEXT_CONTROL_VALUE         1008
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif