Merge pull request #12 from xiaoweihan/master

合并代码

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);
 }

Src/Edislab/Edislab Pro/DlgAddColumn.cpp

@@ -0,0 +1,65 @@
+// 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:  在此添加额外的初始化
+
+	InitDisplay();
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// 异常: OCX 属性页应返回 FALSE
+}
+
+void CDlgAddColumn::InitDisplay( void )
+{
+	CWnd* pWnd = GetDlgItem(IDC_TAB_POS);
+	if (nullptr != pWnd && NULL != pWnd->GetSafeHwnd())
+	{
+		pWnd->ShowWindow(SW_HIDE);
+		//获取位置
+		CRect rc;
+		pWnd->GetWindowRect(&rc);
+		ScreenToClient(&rc);
+		if (NULL == m_TabWnd)
+		{
+			if (FALSE == m_TabWnd.Create(CBCGPTabWnd::STYLE_3D,rc,this,CBaseTabWnd::s_nTabBaseID++
+				,CBCGPBaseTabWnd::LOCATION_TOP))
+			{
+				return;
+			}
+		}
+	}
+}

Src/Edislab/Edislab Pro/DlgAddColumn.h

@@ -0,0 +1,32 @@
+#pragma once
+
+
+// CDlgAddColumn 对话框
+#include "BaseDialog.h"
+#include "ConcreteTabWnd.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();
+
+
+private:
+	void InitDisplay(void);
+
+private:
+	//Tab空间
+	CConcreteTabWnd m_TabWnd;
+};

Src/Edislab/Edislab Pro/DlgColumnCommon.cpp

@@ -0,0 +1,34 @@
+// DlgColumnCommon.cpp : 实现文件
+//
+
+#include "stdafx.h"
+#include "Edislab Pro.h"
+#include "DlgColumnCommon.h"
+
+
+
+// CDlgColumnCommon 对话框
+
+IMPLEMENT_DYNAMIC(CDlgColumnCommon, CBaseDialog)
+
+CDlgColumnCommon::CDlgColumnCommon(CWnd* pParent /*=NULL*/)
+	: CBaseDialog(CDlgColumnCommon::IDD, pParent)
+{
+
+}
+
+CDlgColumnCommon::~CDlgColumnCommon()
+{
+}
+
+void CDlgColumnCommon::DoDataExchange(CDataExchange* pDX)
+{
+	CBaseDialog::DoDataExchange(pDX);
+}
+
+
+BEGIN_MESSAGE_MAP(CDlgColumnCommon, CDialog)
+END_MESSAGE_MAP()
+
+
+// CDlgColumnCommon 消息处理程序

Src/Edislab/Edislab Pro/DlgColumnCommon.h

@@ -0,0 +1,21 @@
+#pragma once
+
+
+// CDlgColumnCommon 对话框
+#include "BaseDialog.h"
+class CDlgColumnCommon : public CBaseDialog
+{
+	DECLARE_DYNAMIC(CDlgColumnCommon)
+
+public:
+	CDlgColumnCommon(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDlgColumnCommon();
+
+// 对话框数据
+	enum { IDD = IDD_DLG_COLUMN_COMMON };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	DECLARE_MESSAGE_MAP()
+};

Src/Edislab/Edislab Pro/DlgColumnDisplay.cpp

@@ -0,0 +1,34 @@
+// DlgColumnDisplay.cpp : 实现文件
+//
+
+#include "stdafx.h"
+#include "Edislab Pro.h"
+#include "DlgColumnDisplay.h"
+
+
+
+// CDlgColumnDisplay 对话框
+
+IMPLEMENT_DYNAMIC(CDlgColumnDisplay, CBaseDialog)
+
+CDlgColumnDisplay::CDlgColumnDisplay(CWnd* pParent /*=NULL*/)
+	: CBaseDialog(CDlgColumnDisplay::IDD, pParent)
+{
+
+}
+
+CDlgColumnDisplay::~CDlgColumnDisplay()
+{
+}
+
+void CDlgColumnDisplay::DoDataExchange(CDataExchange* pDX)
+{
+	CBaseDialog::DoDataExchange(pDX);
+}
+
+
+BEGIN_MESSAGE_MAP(CDlgColumnDisplay, CDialog)
+END_MESSAGE_MAP()
+
+
+// CDlgColumnDisplay 消息处理程序

Src/Edislab/Edislab Pro/DlgColumnDisplay.h

@@ -0,0 +1,21 @@
+#pragma once
+
+
+// CDlgColumnDisplay 对话框
+#include "BaseDialog.h"
+class CDlgColumnDisplay : public CBaseDialog
+{
+	DECLARE_DYNAMIC(CDlgColumnDisplay)
+
+public:
+	CDlgColumnDisplay(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDlgColumnDisplay();
+
+// 对话框数据
+	enum { IDD = IDD_DLG_COLUMN_DISPLAY };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	DECLARE_MESSAGE_MAP()
+};

Src/Edislab/Edislab Pro/DlgGridContainer.cpp

@@ -20,6 +20,7 @@
 #include "Global.h"
 #include "Utility.h"
 #include "DlgGridOpt.h"
+#include "DlgAddColumn.h"
 const int TIMER_ID = 1;
 const int TIMER_GAP = 1000;
 // CDlgGridContainer 对话框
@@ -603,6 +604,12 @@ void CDlgGridContainer::OnMenuGridLastRow()
 void CDlgGridContainer::OnMenuGridAddColumn()
 {
 	// TODO: 在此添加命令处理程序代码
+	CDlgAddColumn Dlg;
+
+	if (IDOK == Dlg.DoModal())
+	{
+
+	}
 }
 
 LRESULT CDlgGridContainer::NotifyGridOption( WPARAM wp,LPARAM lp )

Src/Edislab/Edislab Pro/Edislab Pro.vcxproj

@@ -239,8 +239,11 @@
     <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="DlgColumnCommon.h" />
+    <ClInclude Include="DlgColumnDisplay.h" />
     <ClInclude Include="DlgDataGroupProperty.h" />
     <ClInclude Include="DlgDataSetting.h" />
     <ClInclude Include="DlgDevicePanel.h" />
@@ -302,8 +305,11 @@
     <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="DlgColumnCommon.cpp" />
+    <ClCompile Include="DlgColumnDisplay.cpp" />
     <ClCompile Include="DlgDataGroupProperty.cpp" />
     <ClCompile Include="DlgDataSetting.cpp" />
     <ClCompile Include="DlgDevicePanel.cpp" />

Src/Edislab/Edislab Pro/Edislab Pro.vcxproj.filters

@@ -321,6 +321,15 @@
     <ClInclude Include="CustomTreeCtrl.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="DlgAddColumn.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="DlgColumnDisplay.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="DlgColumnCommon.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Edislab Pro.cpp">
@@ -488,6 +497,15 @@
     <ClCompile Include="CustomTreeCtrl.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="DlgAddColumn.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="DlgColumnDisplay.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="DlgColumnCommon.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Edislab Pro.rc">