添加常规和显示2个对话框资源。

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/Edislab Pro.vcxproj

@@ -242,6 +242,8 @@
     <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" />
@@ -306,6 +308,8 @@
     <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

@@ -324,6 +324,12 @@
     <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">
@@ -494,6 +500,12 @@
     <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">