去除冗余代码。

xiaoweihan · Sep 21, 2017 · 9259e10 · 9259e10
1 parent c6c60b4
commit 9259e10
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/Src/Edislab/Edislab Pro/ChartFigureDlg.cpp b/Src/Edislab/Edislab Pro/ChartFigureDlg.cpp
@@ -7,6 +7,7 @@
 #include "DlgChartSet.h"
 #include "DlgTabPanel.h"
 #include "Msg.h"
+#include "Macro.h"
 // ChartFigureDlg 对话框
 #define TIMER_CHART_EVENT (1000011)
 #define TIMER_CHART (300)
@@ -159,7 +160,7 @@ void ChartFigureDlg::OnPaint()
 			if (TRUE == m_bActiveFlag)
 			{
 				CPen BoradrPen;
-				BoradrPen.CreatePen(PS_SOLID,5,ActiveColor);
+				BoradrPen.CreatePen(PS_SOLID,5,ACTIVE_COLOR);
 				CPen* pOldPen = dc.SelectObject(&BoradrPen);
 
 				dc.MoveTo(rc.left,rc.top);
@@ -179,7 +180,7 @@ void ChartFigureDlg::OnPaint()
 			}else
 			{
 				CPen BoradrPen;
-				BoradrPen.CreatePen(PS_SOLID,5,UnActiveColor);
+				BoradrPen.CreatePen(PS_SOLID,5,INACTIVE_COLOR);
 				CPen* pOldPen = dc.SelectObject(&BoradrPen);
 				dc.MoveTo(rc.left,rc.top);
 				dc.LineTo(rc.right,rc.top);

diff --git a/Src/Edislab/Edislab Pro/ChartXY.cpp b/Src/Edislab/Edislab Pro/ChartXY.cpp
@@ -3,10 +3,8 @@
 #define _USE_CTRL_MATH_DEFINES
 #include <math.h>
 #include <boost/foreach.hpp>
-#include "Global.h"
 #include "ChartManager.h"
 #include "GridColumnGroupManager.h"
-//#include "SensorIDGenerator.h"
 #include "SensorManager.h"
 #include "SensorData.h"
 #include "SensorDataManager.h"

diff --git a/Src/Edislab/Edislab Pro/ChartXY.h b/Src/Edislab/Edislab Pro/ChartXY.h
@@ -209,7 +209,7 @@ class ChartXY
 	SENSOR_TYPE_KEY m_nXID;
 	CString m_strX;
 	CString m_strY;
-	std::vector<GROUPDATA> m_allData;
+	//std::vector<GROUPDATA> m_allData;
 	//数据值 更改时要重新计算
 	std::vector<ChartXYData> m_vecLineData;
 };

diff --git a/Src/Edislab/Edislab Pro/DlgGridContainer.cpp b/Src/Edislab/Edislab Pro/DlgGridContainer.cpp
@@ -11,14 +11,13 @@
 #include <boost/bind.hpp>
 #include "Log.h"
 #include "GridColumnGroupManager.h"
-//#include "SensorIDGenerator.h"
 #include "SensorManager.h"
 #include "SensorData.h"
 #include "SensorDataManager.h"
 #include "SensorConfig.h"
 #include "DlgTabPanel.h"
 #include "Msg.h"
-#include "Global.h"
+#include "Macro.h"
 #include "Utility.h"
 #include "DlgGridOpt.h"
 #include "DlgAddColumn.h"
@@ -425,7 +424,7 @@ void CDlgGridContainer::OnPaint()
 			if (TRUE == m_bActiveFlag)
 			{
 				CPen BoradrPen;
-				BoradrPen.CreatePen(PS_SOLID,5,ActiveColor);
+				BoradrPen.CreatePen(PS_SOLID,5,ACTIVE_COLOR);
 				CPen* pOldPen = dc.SelectObject(&BoradrPen);
 
 				dc.MoveTo(rc.left,rc.top);
@@ -446,7 +445,7 @@ void CDlgGridContainer::OnPaint()
 			else
 			{
 				CPen BoradrPen;
-				BoradrPen.CreatePen(PS_SOLID,5,UnActiveColor);
+				BoradrPen.CreatePen(PS_SOLID,5,INACTIVE_COLOR);
 				CPen* pOldPen = dc.SelectObject(&BoradrPen);
 				dc.MoveTo(rc.left,rc.top);
 				dc.LineTo(rc.right,rc.top);

diff --git a/Src/Edislab/Edislab Pro/GaugeDlg.cpp b/Src/Edislab/Edislab Pro/GaugeDlg.cpp
@@ -4,14 +4,12 @@
 #include "stdafx.h"
 #include "Edislab Pro.h"
 #include "GaugeDlg.h"
+#include <math.h>
 #include "DlgDeviceSet.h"
-#include "math.h"
-//#include "GlobalDataManager.h"
-#include "Global.h"
+#include "Macro.h"
 #include "DlgTabPanel.h"
 #include "Msg.h"
 #include "GridColumnGroupManager.h"
-//#include "SensorIDGenerator.h"
 #include "SensorData.h"
 #include "SensorDataManager.h"
 #include "SensorManager.h"
@@ -361,7 +359,7 @@ void GaugeDlg::OnPaint()
 			if (TRUE == m_bActiveFlag)
 			{
 				CPen BoradrPen;
-				BoradrPen.CreatePen(PS_SOLID,5,ActiveColor);
+				BoradrPen.CreatePen(PS_SOLID,5,ACTIVE_COLOR);
 				CPen* pOldPen = dc.SelectObject(&BoradrPen);
 
 				dc.MoveTo(rc.left,rc.top);
@@ -382,7 +380,7 @@ void GaugeDlg::OnPaint()
 			else
 			{
 				CPen BoradrPen;
-				BoradrPen.CreatePen(PS_SOLID,5,UnActiveColor);
+				BoradrPen.CreatePen(PS_SOLID,5,INACTIVE_COLOR);
 				CPen* pOldPen = dc.SelectObject(&BoradrPen);
 				dc.MoveTo(rc.left,rc.top);
 				dc.LineTo(rc.right,rc.top);

diff --git a/Src/Edislab/Edislab Pro/Global.h b/Src/Edislab/Edislab Pro/Global.h
@@ -8,7 +8,7 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-#if 1
+#if 0
 #include <set>
 #include <vector>
 
@@ -18,8 +18,6 @@
 ///************************************************************************/
 //Grid常量定义
 ///************************************************************************/
-const COLORREF UnActiveColor = RGB(200,200,200);
-const COLORREF ActiveColor = RGB(0,0,25);
 #define		DEFUALT_COLUMN_NAME_X	_T("X")
 #define		DEFUALT_COLUMN_NAME_Y	_T("Y")
 #define		CURRENT_GROUP			_T("当前组")
@@ -40,6 +38,7 @@ const COLORREF ActiveColor = RGB(0,0,25);
 #define MAX_COLUMN_NUM			20	//每组最多支持20组
 #define LAB_MAX_COUNT			6
 #define MAX_WIDGET_NUM			9
+
 /******************************************************************************/
 /////////////////////////////////实验数据定义区//////////////////////////////////
 /******************************************************************************/

diff --git a/Src/Edislab/Edislab Pro/Macro.h b/Src/Edislab/Edislab Pro/Macro.h
@@ -4,4 +4,9 @@
 
 //默认的页名称
 #define  DEFAULT_PAGE_NAME  (_T("实验页"))
+
+//未激活时对话框的边框颜色
+#define  INACTIVE_COLOR    (RGB(200,200,200))
+//激活时对话框的边框颜色
+#define  ACTIVE_COLOR      (RGB(0,0,25))
 #endif