[Merge]合并添加的仪表和图表的代码。

xiaoweihan · Jul 9, 2017 · deb9e93 · deb9e93
1 parent 547c8f3
commit deb9e93
Show file tree

Hide file tree

Showing 11 changed files with 1,127 additions and 33 deletions.
diff --git a/Src/Edislab/Edislab Pro/ChartFigureDlg.cpp b/Src/Edislab/Edislab Pro/ChartFigureDlg.cpp
@@ -244,6 +244,10 @@ void ChartFigureDlg::updateData(CGlobalDataManager* dbMgr) const
 		return m_charxy->updateData(dbMgr);
 	}
 }
+void ChartFigureDlg::ChartSet()
+{
+	OnChartSet();
+}
 //保存数据
 int ChartFigureDlg::saveData()const
 {
@@ -265,6 +269,8 @@ void ChartFigureDlg::OnContextMenu(CWnd* pWnd, CPoint point)
 	{
 		pContexMenuManager->ShowPopupMenu(IDR_MENU_CHART,point.x,point.y,pWnd,TRUE);
 	}	
+	ScreenToClient(&point);
+	m_ptContext = point;
 }
 
 
@@ -316,19 +322,29 @@ void ChartFigureDlg::OnChartDel()
 
 void ChartFigureDlg::OnChartZoomIn()
 {
-	// TODO: Add your command handler code here
+	if (m_charxy)
+	{
+		m_charxy->zoomIn(m_ptContext);
+	}
 }
 
 
 void ChartFigureDlg::OnChartZoomOut()
 {
-	// TODO: Add your command handler code here
+	if (m_charxy)
+	{
+		m_charxy->ZoomOut(m_ptContext);
+	}
 }
 
 
 void ChartFigureDlg::OnChartShowAll()
 {
 	// TODO: Add your command handler code here
+	if (m_charxy)
+	{
+		m_charxy->showAll();
+	}
 }
 
 

diff --git a/Src/Edislab/Edislab Pro/ChartFigureDlg.h b/Src/Edislab/Edislab Pro/ChartFigureDlg.h
@@ -20,7 +20,7 @@ class ChartFigureDlg : public CBaseDialog
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
 public:
 	ChartXY* m_charxy;
-
+	CPoint m_ptContext;
 	void setChartMgr(ChartManager* mgr);
 	const ChartManager* getChartMgr();
 
@@ -30,6 +30,8 @@ class ChartFigureDlg : public CBaseDialog
 	int readData();
 
 	void updateData(class CGlobalDataManager* dbMgr) const;
+
+	void ChartSet();
 public:
 	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
 	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);