From 5aaf802c95f1e31a4cd4abac43e21e112f393dff Mon Sep 17 00:00:00 2001
From: "ENVISION\\xiaowei.han" <xiaowei_han@yeah.net>
Date: Wed, 28 Jun 2017 17:02:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Edislab/Edislab Pro/ConcreteTabWnd.cpp    |   7 ---
 Src/Edislab/Edislab Pro/DlgAddColumn.cpp      |  42 ++++++++++++++++++
 Src/Edislab/Edislab Pro/DlgAddColumn.h        |  23 ++++++++++
 Src/Edislab/Edislab Pro/Edislab Pro.rc        | Bin 57652 -> 58350 bytes
 Src/Edislab/Edislab Pro/Edislab Pro.vcxproj   |   2 +
 .../Edislab Pro/Edislab Pro.vcxproj.filters   |   6 +++
 Src/Edislab/Edislab Pro/resource.h            | Bin 14328 -> 14508 bytes
 7 files changed, 73 insertions(+), 7 deletions(-)
 create mode 100644 Src/Edislab/Edislab Pro/DlgAddColumn.cpp
 create mode 100644 Src/Edislab/Edislab Pro/DlgAddColumn.h

diff --git a/Src/Edislab/Edislab Pro/ConcreteTabWnd.cpp b/Src/Edislab/Edislab Pro/ConcreteTabWnd.cpp
index c12d6e8..aa3c944 100644
--- a/Src/Edislab/Edislab Pro/ConcreteTabWnd.cpp	
+++ b/Src/Edislab/Edislab Pro/ConcreteTabWnd.cpp	
@@ -27,12 +27,5 @@ void CConcreteTabWnd::OnSize(UINT nType, int cx, int cy)
 void CConcreteTabWnd::OnLButtonDown(UINT nFlags, CPoint point)
 {
 	// TODO: 在此添加消息处理程序代码和/或调用默认值
-
-	//CWnd* pWnd = AfxGetMainWnd();
-
-	//if (NULL != pWnd)
-	//{
-	//	pWnd->PostMessage(WM_NOTIFY_ACTIVE_WND_TYPE,2,0);
-	//}
 	CBaseTabWnd::OnLButtonDown(nFlags, point);
 }
diff --git a/Src/Edislab/Edislab Pro/DlgAddColumn.cpp b/Src/Edislab/Edislab Pro/DlgAddColumn.cpp
new file mode 100644
index 0000000..6c42f1f
--- /dev/null
+++ b/Src/Edislab/Edislab Pro/DlgAddColumn.cpp	
@@ -0,0 +1,42 @@
+// DlgAddColumn.cpp : 实现文件
+//
+
+#include "stdafx.h"
+#include "Edislab Pro.h"
+#include "DlgAddColumn.h"
+// CDlgAddColumn 对话框
+
+IMPLEMENT_DYNAMIC(CDlgAddColumn, CBaseDialog)
+
+CDlgAddColumn::CDlgAddColumn(CWnd* pParent /*=NULL*/)
+	: CBaseDialog(CDlgAddColumn::IDD, pParent)
+{
+
+}
+
+CDlgAddColumn::~CDlgAddColumn()
+{
+}
+
+void CDlgAddColumn::DoDataExchange(CDataExchange* pDX)
+{
+	CBaseDialog::DoDataExchange(pDX);
+}
+
+
+BEGIN_MESSAGE_MAP(CDlgAddColumn, CBaseDialog)
+END_MESSAGE_MAP()
+
+
+// CDlgAddColumn 消息处理程序
+
+
+BOOL CDlgAddColumn::OnInitDialog()
+{
+	CBaseDialog::OnInitDialog();
+
+	// TODO:  在此添加额外的初始化
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// 异常: OCX 属性页应返回 FALSE
+}
diff --git a/Src/Edislab/Edislab Pro/DlgAddColumn.h b/Src/Edislab/Edislab Pro/DlgAddColumn.h
new file mode 100644
index 0000000..337a59b
--- /dev/null
+++ b/Src/Edislab/Edislab Pro/DlgAddColumn.h	
@@ -0,0 +1,23 @@
+#pragma once
+
+
+// CDlgAddColumn 对话框
+#include "BaseDialog.h"
+class CDlgAddColumn : public CBaseDialog
+{
+	DECLARE_DYNAMIC(CDlgAddColumn)
+
+public:
+	CDlgAddColumn(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDlgAddColumn();
+
+// 对话框数据
+	enum { IDD = IDD_DLG_ADD_COLUMN };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	DECLARE_MESSAGE_MAP()
+public:
+	virtual BOOL OnInitDialog();
+};
diff --git a/Src/Edislab/Edislab Pro/Edislab Pro.rc b/Src/Edislab/Edislab Pro/Edislab Pro.rc
index 67405ec408b3e229ff2bff87f9a26f0d93bb2618..a8af46a5745c1abfbaa3abe7bc4b135412910aa8 100644
GIT binary patch
delta 117
zcmdmTi22=d<_#C-PAU`-c4Tk?!gvN}27d-0hEN7y2EWM*gO#~08O#`T7!(+c7)&N_
z3^SfA;6H(DL+ZSUg4DcZ@u0~CnQ@bAg84RIn0rfpvfNq~ZWR41S{W@Szu%q6XgvAj
MPRY%y_I4=)0E2)h>i_@%

delta 22
ecmaENoO#P3<_#C-PIB9@nQMWT{N|JcUCIE75(@zU

diff --git a/Src/Edislab/Edislab Pro/Edislab Pro.vcxproj b/Src/Edislab/Edislab Pro/Edislab Pro.vcxproj
index 04eb0a4..0c73059 100644
--- a/Src/Edislab/Edislab Pro/Edislab Pro.vcxproj	
+++ b/Src/Edislab/Edislab Pro/Edislab Pro.vcxproj	
@@ -239,6 +239,7 @@
     <ClInclude Include="CustomTreeCtrl.h" />
     <ClInclude Include="DataDefine.h" />
     <ClInclude Include="DlgAcquirationPara.h" />
+    <ClInclude Include="DlgAddColumn.h" />
     <ClInclude Include="DlgAddPage.h" />
     <ClInclude Include="DlgChartSet.h" />
     <ClInclude Include="DlgDataGroupProperty.h" />
@@ -302,6 +303,7 @@
     <ClCompile Include="CustomGrid.cpp" />
     <ClCompile Include="CustomTreeCtrl.cpp" />
     <ClCompile Include="DlgAcquirationPara.cpp" />
+    <ClCompile Include="DlgAddColumn.cpp" />
     <ClCompile Include="DlgAddPage.cpp" />
     <ClCompile Include="DlgChartSet.cpp" />
     <ClCompile Include="DlgDataGroupProperty.cpp" />
diff --git a/Src/Edislab/Edislab Pro/Edislab Pro.vcxproj.filters b/Src/Edislab/Edislab Pro/Edislab Pro.vcxproj.filters
index 7028722..e30263f 100644
--- a/Src/Edislab/Edislab Pro/Edislab Pro.vcxproj.filters	
+++ b/Src/Edislab/Edislab Pro/Edislab Pro.vcxproj.filters	
@@ -321,6 +321,9 @@
     <ClInclude Include="CustomTreeCtrl.h">
       <Filter>澶存枃浠�</Filter>
     </ClInclude>
+    <ClInclude Include="DlgAddColumn.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Edislab Pro.cpp">
@@ -488,6 +491,9 @@
     <ClCompile Include="CustomTreeCtrl.cpp">
       <Filter>婧愭枃浠�</Filter>
     </ClCompile>
+    <ClCompile Include="DlgAddColumn.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Edislab Pro.rc">
diff --git a/Src/Edislab/Edislab Pro/resource.h b/Src/Edislab/Edislab Pro/resource.h
index d7cdd64aec20782197f9dea6ab149bbd442f10d1..9f2a425b47060c345dd8cffce4ebfef676569524 100644
GIT binary patch
delta 67
zcmV-J0KEVBZ>({!#1WHl3kC^E06_pu08ao%lK}!Ple#t<lOPNblS~c>lm0LslYlM^
Zle{(<v%nGlB$GlF7L$%Q6tn0y5CQh07IXjr

delta 29
lcmZ2e_#=PA5y8n0vTU2{gubXujuR4_tY<E=d5*aNBLKoQ3l{(Y