Merge pull request 'fix: 多机自主着陆点，子航线号存储位置改为航线文件第一个航点号的速度' (#40) from dev/cbwu into master

Reviewed-on: #40

GISDlg.cpp

@@ -191,7 +191,7 @@ CGISDlg::CGISDlg(CWnd* pParent /*=NULL*/)
 	//多机子航线
 	for (int i=0;i<20;++i)
 	{
-		for (int j=0;j<20;++j)
+		for (int j=0;j<255;++j)
 		{
 			m_subLineLayerID[i][j]=-1;
 			m_subLinePtLayerID[i][j]=-1;
@@ -4667,18 +4667,7 @@ void CGISDlg::DrawCopyFlyLine(const DrawLineDataStruct lineData)
 	//航线索引号
 	int lineID = lineData.lineID-1;
 	//子航线索引号
-	int sublineID = lineData.pts[0].ch1-1;
-/*
-	map<long,long> subLineLayerIDs;
-	map<long,long> subLinePtLayerIDs;
-	if (m_subLineLayerID.find(lineData.lineID)!=m_subLineLayerID.end())
-	{
-		subLineLayerIDs = m_subLineLayerID[lineData.lineID];
-	}
-	if (m_subLinePtLayerID.find(lineData.lineID)!=m_subLinePtLayerID.end())
-	{
-		subLinePtLayerIDs = m_subLinePtLayerID[lineData.lineID];
-	}*/
+	int sublineID = lineData.pts[0].nV-1;
 
 	//没有目标标绘SHP图层，创建该图层
 	if (m_subLineLayerID[lineID][sublineID] ==-1)
@@ -4731,11 +4720,11 @@ void CGISDlg::DrawCopyFlyLine(const DrawLineDataStruct lineData)
 		//标注信息
 		if ( 14 ==lineData.lineID)
 		{
-			strText.Format(_T("×ÔÖ÷׎µã(%d)") /*lineData.lineID, */ /*lineData.pts[i].nPt*/,lineData.pts[0].ch1);
+			strText.Format(_T("×ÔÖ÷׎µã(%d)") /*lineData.lineID, */ /*lineData.pts[i].nPt*/,lineData.pts[0].nV);
 		}
 		else
 		{
-			strText.Format(_T("%d(%d)-%d"), lineData.lineID,  lineData.pts[0].ch1,lineData.pts[i].nPt);
+			strText.Format(_T("%d(%d)-%d"), lineData.lineID,  lineData.pts[0].nV,lineData.pts[i].nPt);
 		}
 		
 		//增加Labels
@@ -5239,10 +5228,10 @@ void CGISDlg::OnShowGivenLine(const CString strLineFileName)
 		}
 
 		m_lineFullPathName[lineDataGroup.lineID] = strLineFileName;
-		if (lineDataGroup.pts[0].ch1>1)
+		if (lineDataGroup.pts[0].nV>1)
 		{
 			//清除标绘的航线
-			ClearDrawedCopyLine(lineDataGroup.lineID-1,lineDataGroup.pts[0].ch1);
+			ClearDrawedCopyLine(lineDataGroup.lineID-1,lineDataGroup.pts[0].nV);
 
 			//标绘航线
 			DrawCopyFlyLine(lineDataGroup);	
@@ -8667,7 +8656,7 @@ void CGISDlg::SaveMultiRouteLine(CString pathDirName,double heightInterval,vecto
 		{
 			if (j==0) //第一个航线存储批量航线子航线号
 			{
-				fprintf(fp,"%d, %d, %.7f, %.7f, %.2f, 0, %02X, 03\n", line[j].nL, j+1,line[j].dX, line[j].dY,line[j].nH + heightInterval*(i+1),i+2);
+				fprintf(fp,"%d, %d, %.7f, %.7f, %.2f, %d, 00, 03\n", line[j].nL, j+1,line[j].dX, line[j].dY,line[j].nH + heightInterval*(i+1),i+2);
 			}
 			else
 				fprintf(fp,"%d, %d, %.7f, %.7f, %.2f, 0, 00, 03\n", line[j].nL, j+1,line[j].dX, line[j].dY,line[j].nH + heightInterval*(i+1));

GISDlg.h

@@ -250,9 +250,9 @@ public:
 private:  // by Wu
 	//map<int,map<long,long>> m_subLineLayerID;	  //子航线线图层号
 	//map<int,map<long,long>> m_subLinePtLayerID;	  //子航线点图层号
-	long m_subLineLayerID[20][20]; //子航线线图层号
-	long m_subLinePtLayerID[20][20]; //子航线点图层号
-	bool m_pHaveDrawCopyLineFlag[20][20];
+	long m_subLineLayerID[20][255]; //子航线线图层号
+	long m_subLinePtLayerID[20][255]; //子航线点图层号
+	bool m_pHaveDrawCopyLineFlag[20][255];
 	bool m_bShowCopyLine;
 	map<int,CString> m_lineFullPathName;
 	//