解决合并冲突

GISDlg.h

@@ -245,6 +245,7 @@ private:  // by Wu
 	//
 	void ShowModifyPointDlg(int selectedPointID=0);  //编辑航线时,显示航点设置对话框
 	void ShowEditSaveDlg();     //显示保存编辑对话框
+	void EndPolylineMessure();  //²âÁ¿½áÊø
 
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support

Globe.cpp

@@ -232,6 +232,6 @@ bool    g_bMarkerPlot[g_iMarkerPtNum] = {false};
 /*-------------------------------------------------------------------------------------------------------------
 说明：不同飞机型号变量，用于控制是否启用个性功能
 -------------------------------------------------------------------------------------------------------------*/
-bool g_b981ADesktop = true;
+bool g_b981ADesktop = false;
-bool g_b981APad = false;
+bool g_b981APad = true;
 bool g_b98CADesktop = false;

ModifyLinePointDlg.cpp

@@ -230,10 +230,10 @@ BOOL CModifyLinePointDlg::OnInitDialog()
 		cstr.Format(_T("%d"), i+1);
 		m_PointID.InsertString(i,cstr);
 	}
-	m_PointID.SetCurSel(m_selectedPointID);
+	m_PointID.SetCurSel(m_selectedPointID-1);
-	cstr.Format(_T("%f"), m_editLineDataGroup.pts[m_selectedPointID].dX);
+	cstr.Format(_T("%f"), m_editLineDataGroup.pts[m_selectedPointID-1].dX);
 	SetDlgItemText(IDC_EDIT_LON,cstr);
-	cstr.Format(_T("%f"), m_editLineDataGroup.pts[m_selectedPointID].dY);
+	cstr.Format(_T("%f"), m_editLineDataGroup.pts[m_selectedPointID-1].dY);
 	SetDlgItemText(IDC_EDIT_LAT,cstr);
 
 	return TRUE;
@@ -369,6 +369,7 @@ void CModifyLinePointDlg::OnEnKillfocusEditLat()
 
 void CModifyLinePointDlg::SetSelectedPointID(int PointID){
 	m_selectedPointID = PointID + 1;
+	//m_selectedPointID = PointID;
 }
 
 // 选择航点下拉列表变化时触发
@@ -379,18 +380,19 @@ void CModifyLinePointDlg::OnCbnSelchangeComboPointid()
 	TRACE(_T("当前选中航点ID: %d \n"),m_selectedPointID);
 	//修改经纬度文本框的值
 	CString cstr;
-	if(posTypeID==0){ //度
+	if(posTypeID==0)
+	{ //度
 		cstr.Format(_T("%f"), m_editLineDataGroup.pts[m_selectedPointID-1].dX);
 		SetDlgItemText(IDC_EDIT_LON,cstr);
 		cstr.Format(_T("%f"), m_editLineDataGroup.pts[m_selectedPointID-1].dY);
 		SetDlgItemText(IDC_EDIT_LAT,cstr);
 	}
-	else if(posTypeID==1){	// 度分秒
+	else if(posTypeID==1)
+	{	// 度分秒
 		string str_lon, str_lat;
 		getDMSString(m_editLineDataGroup.pts[m_selectedPointID-1].dX, m_editLineDataGroup.pts[m_selectedPointID-1].dY,str_lon, str_lat);
 		SetDlgItemText(IDC_EDIT_LON,str_lon.c_str());
 		SetDlgItemText(IDC_EDIT_LAT,str_lat.c_str());
-
 	}
 	
 }