a

GeomativeStudio/h/logging/CDialogLoggingCreateTaskWnd.h

@@ -0,0 +1,33 @@
+#ifndef INCLUDE_C_DIALOG_LOGGING_CREATE_TASK_WND_H_20191210
+#define INCLUDE_C_DIALOG_LOGGING_CREATE_TASK_WND_H_20191210
+#include "afxwin.h"
+#pragma once
+
+
+// CDialogLoggingCreateTaskWnd 对话框
+
+class CDialogLoggingCreateTaskWnd : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogLoggingCreateTaskWnd)
+
+public:
+	CDialogLoggingCreateTaskWnd(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDialogLoggingCreateTaskWnd();
+
+// 对话框数据
+	enum { IDD = IDD_DIALOG_LOGGING_CREATE_TASK };
+	virtual BOOL OnInitDialog();
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	DECLARE_MESSAGE_MAP()
+	afx_msg void OnBnClickedOk();
+	afx_msg void OnBnClickedCancel();
+
+private:	
+	CComboBox m_comWaveform;
+	CComboBox m_comLoggingDirection;
+};
+
+#endif

GeomativeStudio/h/logging/CDialogLoggingEditSymbolBoard.h

@@ -0,0 +1,47 @@
+#ifndef C_DIALOG_LOGGING_EDIT_SYMBOL_BOARD_H_20190826
+#define C_DIALOG_LOGGING_EDIT_SYMBOL_BOARD_H_20190826
+
+#pragma once
+
+#define				GRID_SIZE					(7)		//定义网格大小
+// CDialogLoggingEditSymbolBoard 对话框
+
+class CDialogLoggingEditSymbolBoard : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogLoggingEditSymbolBoard)
+
+public:
+	static CDialogLoggingEditSymbolBoard* GetInstance();
+
+// 对话框数据
+	enum { IDD = IDD_DIALOG_LOGGING_EDIT_SYMBOL_BOARD };
+
+	virtual BOOL OnInitDialog();
+	afx_msg void OnPaint();
+	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
+	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
+
+	//保存岩性图片
+	CString SaveLithologyBitmap(CString strLithologyType, CString strLithologyName);
+	//删除岩性图片
+	BOOL DeleteLithologyBitmap(CString strLithologyType, CString strLithologyPicPath);
+	//加载岩性图片
+	BOOL LoadLithologyBitmap(CString strBmpFile);
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	//截图
+	CString CaptureScreen(LPRECT lpRect, CString strLithologyType);
+	
+	BOOL SaveBmp(HBITMAP hBitmap, const TCHAR* FileName);	
+
+	DECLARE_MESSAGE_MAP()
+private:
+	CDialogLoggingEditSymbolBoard(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDialogLoggingEditSymbolBoard();
+
+	//记录平面所有单元格的状态
+	map<int, map<int, bool>>			m_mapPointStatus;//第一个int行，第二个int列，bool是否绘制1：绘制
+	BOOL								m_bSaveBmp;
+};
+#endif

GeomativeStudio/h/logging/CDialogLoggingLithologicWnd.h

@@ -0,0 +1,67 @@
+#ifndef C_DIALOG_LOGGING_LITHOLOGIC_WND_H_20190821
+#define C_DIALOG_LOGGING_LITHOLOGIC_WND_H_20190821
+#include "afxcmn.h"
+#include "logging\CLoggingDataOper.h"
+#pragma once
+
+typedef struct ST_LITHOLOGY_PROFILE
+{
+	char	szLithologyName[MAX_LENGHT_LITHOLOGY_NAME];		//岩性名称
+	char	szLithologyPic[MAX_LENGHT_LITHOLOGY_PICTURE];	//岩性图片
+	UINT	fLithologyType;									//岩性类型
+	float	fStartDepth;									//起始深度
+	float	fEndDepth;										//终止深度
+	ST_LITHOLOGY_PROFILE()
+	{
+		memset(this, 0, sizeof(ST_LITHOLOGY_PROFILE));
+	}
+}STLithologyProfile;
+// CDialogLoggingLithologicWnd 对话框
+
+class CDialogLoggingLithologicWnd : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogLoggingLithologicWnd)
+
+public:
+	CDialogLoggingLithologicWnd(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDialogLoggingLithologicWnd();
+
+	void SetStartEndDepth(float fStartDepth, float fEndDepth);
+	void SetProfileList(std::vector<STLithologyProfile> vecProfileList);
+	std::vector<STLithologyProfile> GetProfileList();
+
+	virtual BOOL OnInitDialog();
+	afx_msg void OnBnClickedBtnLithologyEditor();
+	afx_msg void OnBnClickedBtnAddProfile();
+	afx_msg void OnBnClickedBtnDeleteProfile();
+	afx_msg void OnBnClickedOk();
+	afx_msg void OnBnClickedCancel();
+	afx_msg void OnCbnSelchangeComboLithologyName();
+	afx_msg void OnPaint();
+	afx_msg void OnDestroy();
+// 对话框数据
+	enum { IDD = IDD_DIALOG_LOGGING_LITHOLOGIC_WINDOW };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+	void QueryLithologyNameFromDB();
+	void ReleaseComboBox();
+	DECLARE_MESSAGE_MAP()
+private:
+	// 剖面列表
+	CListCtrl							m_listProfile;
+
+	//岩性名称
+	CComboBox							m_comLithologyName;
+
+	//列表显示
+	vector<STLithologyProfile>			m_vecProfileList;
+	float								m_fStartDepth;
+	float								m_fEndDepth;
+
+	//保存ComboBox岩性名称对应的图片路径,避免频繁操作数据库
+	map<CString, STLoggingLithologyInfo> m_mapLithologyInfo;
+	CString								m_strCurPicPath;
+};
+
+#endif

GeomativeStudio/h/logging/CDialogLoggingParameterSetting.h

@@ -0,0 +1,40 @@
+#ifndef AFX_INCLUDE_C_DIALOG_LOGGING_PARAMETER_SETTING_H_20191214
+#define AFX_INCLUDE_C_DIALOG_LOGGING_PARAMETER_SETTING_H_20191214
+#include "afxwin.h"
+#include "logging\CLoggingDataOper.h"
+#pragma once
+
+
+// CDialogLoggingParameterSetting 对话框
+
+class CDialogLoggingParameterSetting : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogLoggingParameterSetting)
+
+public:
+	CDialogLoggingParameterSetting(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDialogLoggingParameterSetting();
+
+// 对话框数据
+	enum { IDD = IDD_DIALOG_LOGGING_PARAMETER_SETTING };
+
+	virtual BOOL OnInitDialog();
+	afx_msg void OnCbnSelchangeComboTaskNameList();
+	afx_msg void OnBnClickedOk();
+	afx_msg void OnBnClickedCancel();
+
+	STLoggingParamSettingReq GetLogParamSetting();
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	DECLARE_MESSAGE_MAP()
+	
+private:
+	map<CString, STLoggingTaskInfo> m_mapTaskList;
+	CComboBox						m_comTaskList;
+	CComboBox						m_comWaveform;
+	CComboBox						m_comLoggingDirection;
+	STLoggingParamSettingReq		m_stLoggingParam;
+};
+
+#endif

GeomativeStudio/h/logging/CDialogLoggingSelectComPortWnd.h

@@ -0,0 +1,42 @@
+#ifndef INCLUDE_AFX_CDIALOG_LOGGING_SELECT_COM_PORT_WND_H_20191212
+#define INCLUDE_AFX_CDIALOG_LOGGING_SELECT_COM_PORT_WND_H_20191212
+
+#pragma once
+#include "afxwin.h"
+
+#define			GEOMATIVE_ADDRESS					0xEEEEEEEE//Geomative地址
+#define			UNDER_MACHINE_ADDRESS				0xDDDDDDDD//下位机地址
+/*#define			MSG_RECEIVE_LOGIN			(0xC0)
+#define			MODULE_NAME					_T("CDialogLoggingSelectComPortWnd")*/
+#define			RECV_DATA_FAILED_ATTEMPTS_TIMES		3		//接收数据失败尝试次数
+// CDialogLoggingSelectComPortWnd 对话框
+
+class CDialogLoggingSelectComPortWnd : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogLoggingSelectComPortWnd)
+
+public:
+	CDialogLoggingSelectComPortWnd(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDialogLoggingSelectComPortWnd();
+
+	CComboBox		m_comComNameList;
+// 对话框数据
+	enum { IDD = IDD_DIALOG_LOGGING_SELECT_COM_PORT };
+
+	virtual BOOL OnInitDialog();
+	afx_msg void OnBnClickedOk();
+	afx_msg void OnBnClickedCancel();
+
+	CString GetSelectComm();
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	DECLARE_MESSAGE_MAP()
+
+private:	
+	CSComPort		m_SComPort;
+	CString			m_strComName;
+	int				m_iSeriNo;
+};
+
+#endif

GeomativeStudio/h/logging/CDialogLoggingSymbolEditor.h

@@ -0,0 +1,34 @@
+#ifndef C_DIALOG_LOGGING_SYMBOL_EDITOR_H_20190823
+#define C_DIALOG_LOGGING_SYMBOL_EDITOR_H_20190823
+#include "afxcmn.h"
+
+#pragma once
+// CDialogLoggingSymbolEditor 对话框
+
+class CDialogLoggingSymbolEditor : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogLoggingSymbolEditor)
+
+public:
+	CDialogLoggingSymbolEditor(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDialogLoggingSymbolEditor();
+
+	virtual BOOL OnInitDialog();
+	afx_msg void OnBnClickedBtnUpdate();
+	afx_msg void OnBnClickedBtnAdd();
+	afx_msg void OnBnClickedBtnDelete();
+	afx_msg void OnBnClickedCancel();
+	afx_msg void OnNMClickListLithologyName(NMHDR *pNMHDR, LRESULT *pResult);
+
+// 对话框数据
+	enum { IDD = IDD_DIALOG_LOGGING_SYMBOL_EDITOR };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+	void QueryLithologyNameFromDB();
+	DECLARE_MESSAGE_MAP()
+private:
+	CListCtrl				m_listLithologyName;
+};
+
+#endif

GeomativeStudio/h/logging/CDialogLoggingTestMainWnd.h

@@ -0,0 +1,55 @@
+#ifndef AFX_DIALOG_LOGGING_TEST_MAIN_WND_H_20190807
+#define AFX_DIALOG_LOGGING_TEST_MAIN_WND_H_20190807
+#include "afxwin.h"
+#pragma once
+
+#define			DRAW_BOARDING_TO_BOTTOM_DISTANCE			(100) //子窗口（CStatic）到底部窗口的距离
+
+#define			WM_MSG_LOGGING_MEASURING_POINT_DATA			(WM_USER+1000) //接受测井数据0xC6指令消息
+
+class CDialogLoggingTestMainWnd : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogLoggingTestMainWnd)
+
+public:
+	CDialogLoggingTestMainWnd(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDialogLoggingTestMainWnd();
+
+// 对话框数据
+	enum { IDD = IDD_DIALOG_LOGGING_TEST_MAIN_WND };
+
+	virtual BOOL OnInitDialog();
+	afx_msg void OnPaint();
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	DECLARE_MESSAGE_MAP()
+	afx_msg void OnMenuFileOpen();
+	afx_msg void OnMenuFileClose();
+	afx_msg void OnMenuFileSave();
+	afx_msg void OnMenuFileSaveAs();
+	afx_msg void OnMenuExit();
+	afx_msg void OnMenuComSetting();
+	afx_msg void OnMenuCreateTask();
+	afx_msg void OnMenuMeasureParamSetting();
+	afx_msg void OnMenuStartLogging();
+	afx_msg void OnMenuPauseLogging();
+	afx_msg void OnMenuContinueLogging();
+	afx_msg void OnMenuEndLogging();
+	afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnDestroy();
+	afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt);
+	LRESULT OnMsgLoggingMeasuringPointData(WPARAM wParam, LPARAM lParam);
+	static UINT RecvDataThread(LPVOID lParam);
+private:
+	CMenu						m_Menu;
+	RECT						m_rcClientWnd;		//客户区窗口大小
+	BOOL						m_bIsOpenFile;		//保存参数用于判断是否已经打开文件
+	CString						m_strComName;		//使用串口的名称
+	CSComPort					m_comPort;			//端口
+	int							m_iSeriNo;			//发送数据包序列号
+	BOOL						m_isDownloadParamSetting;//是否下发测井参数
+	BOOL						m_isRecvData;			//是否接受下位机上传的数据
+};
+
+#endif

GeomativeStudio/h/logging/CDialogLoggingWnd.h

@@ -0,0 +1,119 @@
+#ifndef AFX_DIALOG_LOGGING_TEST_WND_H_20190817
+#define AFX_DIALOG_LOGGING_TEST_WND_H_20190817
+#include "afxwin.h"
+#include "logging/CDialogLoggingLithologicWnd.h"
+#pragma once
+
+// CDialogLoggingWnd 对话框
+#define				COMPANY_NAME_TO_TOP_DISTANCE			(30)  //公司名称到顶部的距离
+#define				STATIC_TO_WND_TOP_DISTANCE				(70)  //第一行的Static控件到窗口顶部的距离
+#define				DRAW_DATA_TO_STATIC_DISTANCE			(10)  //数据框到Static的距离
+#define				STATIC_HEIGHT_INTERVAL					(1)   //文件属性Static控件高度间距
+
+#define				LITHOLOGY_NAME_COLUMN_WIDTH				(100)  //岩性名称列宽
+#define				BOTTOM_DEPTH_COLUMN_WIDTH				(50)  //底板深度列宽
+#define				STRATA_THICKNESS_COLUMN_WIDTH			(50)  //岩层厚度列宽
+#define				LITHOLOGY_COLUMN_WIDTH					(50)  //岩性柱状列宽
+#define				DEPTH_COLUMN_WIDTH						(70)  //深度列宽
+#define				SP_RESISTIVITY_COLUMN_WIDTH				(150) //SP电阻率列宽
+#define				LONG_RESISTIVITY_COLUMN_WIDTH			(150) //长电位电阻率列宽
+#define				SHORT_RESISTIVITY_COLUMN_WIDTH			(150) //短电位电阻率列宽
+#define				GRADIENT_RESISTIVITY_COLUMN_WIDTH		(150) //梯度电位电阻率列宽
+#define				CUSTOM_COLUMN_HEIGHT					(150) //列头高度
+
+#define				ONE_DECIMETER_TO_HEIGHT					(10)  //一分米对应的高度
+#define				DEPTH_SCALE_DISTANCE					(5)	  //深度刻度线之间的间距
+#define				DEPTH_SHORT_SCALE_VALUE					(6)   //深度短刻度
+#define				DEPTH_LONG_SCALE_VALUE					(10)  //深度长刻度		
+#define				EACH_SCALE_PIXEL_POINT_VALUE			(5)   //每个刻度对应的像素点
+#define				DISTANCE_TO_RIGHT_FRAME					(15)  //High值到右边框的距离
+#define				DISTANCE_TO_BOTTOM_FRAME				(2)   //Low\High到底部边框的距离
+
+#define				LOW_HIGH_DEVIATION_VALUE				(1)  //Low\High偏差值
+#define				TOTAL_DATA_COLUMN						(16) //数据段分16列
+typedef struct ST_READ_DAT_FILE_DATA_INFO
+{
+	float	fDepth;
+	float	fSPV;
+	float	fLV;
+	float	fLI;
+	float	fLR;
+	float	fSV;
+	float	fSI;
+	float	fSR;
+	float	fGV;		//梯度电压
+	float	fGI;		//梯度电刘
+	float	fGR;		//梯度电阻
+	ST_READ_DAT_FILE_DATA_INFO()
+	{
+		memset(this, 0, sizeof(ST_READ_DAT_FILE_DATA_INFO));
+	}
+}ST_DATA_INFO;
+
+class CDialogLoggingWnd : public CDialog
+{
+	DECLARE_DYNAMIC(CDialogLoggingWnd)
+
+public:
+	static CDialogLoggingWnd* GetInstance();
+
+	// 对话框数据
+	enum { IDD = IDD_DIALOG_LOGGING_WND };
+
+	virtual BOOL OnInitDialog();	
+
+	//绘制Static位置
+	RECT DrawFirstColumnStatic(RECT rcWnd);
+	RECT DrawSecondColumnStatic(RECT rcWnd, RECT rcLastColumn);
+	RECT DrawThreeColumnStatic(RECT rcWnd, RECT rcLastColumn);
+	RECT DrawFourColumnStatic(RECT rcWnd, RECT rcLastColumn);
+	RECT DrawFiveColumnStatic(RECT rcWnd, RECT rcLastColumn);
+	RECT DrawSixColumnStatic(RECT rcWnd, RECT rcLastColumn);
+	void DrawTitleStatic(RECT rcWnd);
+	void SetColumnNameVisible(BOOL bVisible);//设置SP\Long\Short\Gradient列名显示
+	
+	//打开文件
+	float OpenFile(CString strFolderPath, CString strFileName);
+	//关闭文件
+	BOOL CloseFile();
+	//打开文件时，加载参数文件
+	float LoadParamXMLFile(CString strFilePath);//返回井深
+	//打开文件时，加载数据文件
+	BOOL LoadDataDATFile(CString strFilePath);
+	UINT GetStartDrawDataHeight();				//获取开始绘制数据的高度
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	DECLARE_MESSAGE_MAP()
+	afx_msg void OnPaint();
+	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+	afx_msg void OnMouseHover(UINT nFlags, CPoint point);
+	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
+	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
+	void UpdateLowHighValue();
+private:
+	CDialogLoggingWnd(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~CDialogLoggingWnd();
+
+	float						m_fWellDepth;
+	RECT						m_rcDrawData;//粗线蓝框
+	std::vector<ST_DATA_INFO>	m_vecDataInfo;
+	CRect						m_rcLithology;	//岩性柱状矩形框
+
+	float						m_fMinSPR;		//SP最小电阻率
+	float						m_fMaxSPR;		//SP最大电阻率
+	float						m_fMinLR;		//L最小电阻率
+	float						m_fMaxLR;		//L最大电阻率
+	float						m_fMinSR;		//short最小电阻率
+	float						m_fMaxSR;		//short最大电阻率
+	float						m_fMinGR;		//最小梯度电阻率
+	float						m_fMaxGR;		//最大梯度电阻率
+
+	RECT						m_rcWnd;		//窗口大小
+	CString						m_strFileName;  //加载数据文件名
+	UINT						m_uiStartDrawHeigh;//记录开始绘制数据的高度
+
+	std::vector<STLithologyProfile> m_vecLithologyProfile;		//剖面列表
+};
+
+#endif

GeomativeStudio/h/logging/CLoggingDataOper.h

@@ -0,0 +1,87 @@
+#ifndef AFX_C_LOGGING_DATA_OPER_H__20190829__INCLUDED_
+#define AFX_C_LOGGING_DATA_OPER_H__20190829__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "GUCodeCreator.h"
+#include <vector>
+#include "CtrlProtocolDef.h"
+
+#define				MAX_LENGHT_LITHOLOGY_NAME				(40)		//岩性名称最大长度
+#define				MAX_LENGHT_LITHOLOGY_PICTURE			(250)		//岩性图片最大长度
+#define				GRID_X_DIRECTION_SIZE					(50)		//网格X方向50个单元格
+#define				GRID_Y_DIRECTION_SIZE					(40)		//网格Y方向40个单元格
+#define				MAX_LENGTH_TASK_NAME					(60)		//任务名
+#define				MAX_LENGTH_TASK_LOCATION				(100)		//测试地点
+typedef struct ST_LOGGING_LITHOLOGY_INFO
+{
+	//int			iLithologyType;										//岩性类型
+	char		szLithologyType[MAX_LENGHT_LITHOLOGY_NAME];		//岩性类型
+	char		szLithologyName[MAX_LENGHT_LITHOLOGY_NAME];		//岩性名称
+	char		szLithologyPic[MAX_LENGHT_LITHOLOGY_PICTURE];	//岩性图片
+	ST_LOGGING_LITHOLOGY_INFO()
+	{
+		memset(this, 0, sizeof(ST_LOGGING_LITHOLOGY_INFO));
+	}
+}STLoggingLithologyInfo;
+
+typedef struct ST_LOGGING_TASK_INFO
+{
+	char		szTaskName[MAX_LENGTH_TASK_NAME];		//任务名
+	char		szLocation[MAX_LENGTH_TASK_LOCATION];	//测试地点
+	BYTE		byLogType;								//工作模式
+	BYTE		byTrace;								//迭代次数0-255
+	BYTE		byWaveform;								//发射波形
+	BYTE		byLogDirection;							//测井方向
+	float		fSamplingInterval;						//采样频率
+	float		fInitDepth;								//初始深度
+	float		fEndDepth;								//结束深度
+	float		fLoggingDistance;						//测试距离，测距距离
+	float		fInstrumentZeroLength;					//仪器零长
+	float		fPeriod;								//周期
+	ST_LOGGING_TASK_INFO()
+	{
+		memset(this, 0, sizeof(ST_LOGGING_TASK_INFO));
+	}
+}STLoggingTaskInfo;
+
+class CLoggingDataOper
+{
+public:
+	static CLoggingDataOper* GetInstance();
+	
+	//查询岩性列表
+	map<CString, STLoggingLithologyInfo> QueryLithologyInfo();
+
+	//根据岩性名称查找数据库相关信息
+	STLoggingLithologyInfo QueryLithologyInfoByName(CString strLithologyName);
+
+	//数据库删除岩性图片
+	BOOL DeleteDBLithologyBitmap(CString strLithologyType);
+
+	//数据库新增岩性图片
+	BOOL InsertDBLithologyBitmap(CString strLithologyType, CString strLithologyName, CString strLithologyPicPath, map<int, map<int, bool>> mapPictureCode);
+
+	//加载数据库图片信息
+	map<int, map<int, bool>> LoadLithologyBitmapFromDB(CString strLithologyName);
+
+	//logging新建任务写入数据库
+	BOOL SaveTaskInfoIntoDB(CString strTaskName, CString strTestLocation, BYTE byLogTypes, CString strTrace, int iWaveform, CString strSamplingInterval, CString strInitialDepth, CString strEndDepth, int iLogDir, CString strLoggingInterval, CString strInstrumentZeroLength, CString strPeriod);
+	//修改logging任务信息
+	BOOL UpdateTaskInfoIntoDB(CString strTaskName, CString strTestLocation, BYTE byLogTypes, CString strTrace, int iWaveform, CString strSamplingInterval, CString strInitialDepth, CString strEndDepth, int iLogDir, CString strLoggingInterval, CString strInstrumentZeroLength, CString strPeriod);
+	//查询logging任务名列表
+	map<CString, STLoggingTaskInfo> QueryTaskListFromDB();
+	//查询单个任务信息通过任务名
+	STLoggingTaskInfo QueryTaskInfoByName(CString strTaskName);
+protected:
+	//岩性图片类型 对应 岩性信息
+	map<CString, STLoggingLithologyInfo> m_mapLithologyInfo;
+
+private:
+	CLoggingDataOper();
+	virtual ~CLoggingDataOper();
+};
+
+#endif // !defined(AFX_C_LOGGING_DATA_OPER_H__20190829__INCLUDED_)