type(fix):修复航线编辑时不同型号的航线对应关系。

GISDlg.cpp

@@ -1981,17 +1981,22 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y)
 
 		m_lineSelectedID = IsSelectLine(pt);
 		ClearHighLightLine();
-		if (m_lineSelectedID==11)  //暂时屏蔽回收航线
+		if (g_b981APad || g_b981ADesktop)
 		{
+			if (m_lineSelectedID==14)  //董珂팁귁쀼澗봄窟
+			{
+				m_lineSelectedID = -1;
 				return;
 			}
+		}
+
 		if (m_lineSelectedID>0) 
 		{
 			m_editLineDataGroup = m_ShowedLineDataList[m_lineSelectedID];
 			DrawHighLightLine(m_editLineDataGroup.linePts,m_editLineDataGroup.linePointNum);
 		}
 	}
-	//回收航线编辑
+	//봄窟긍서
 	if (m_bEditLine && (Button == 1))
 	{
 		if (m_lineSelectedID<=0)
@@ -2012,17 +2017,19 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y)
 			{
 				return;
 			}
+			if (g_b981CDesktop)
+			{
 				if (m_lineSelectedID==11)
 				{
 					if (addPointPos>m_editLineDataGroup.linePointNum-4) return; //回收航线屏蔽4,5,6长边不让编辑
 				}
+			}
 
 			if (m_editLineDataGroup.pointNum>=127) //限制最多127个点
 			{
 				return;
 			}
 
-
 			//计算添加点坐标
 			double linePt1[2] = {m_editLineDataGroup.linePts[addPointPos-1].dX,m_editLineDataGroup.linePts[addPointPos-1].dY};
 			double linePt2[2] = {m_editLineDataGroup.linePts[addPointPos].dX,m_editLineDataGroup.linePts[addPointPos].dY};
@@ -2052,6 +2059,8 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y)
 		m_map.PixelToProj(x,y, &lon, &lat);
 		int selectedPointID = GetPtSel(m_editLineDataGroup.pts,m_editLineDataGroup.pointNum,x,y);
 		if (selectedPointID>=0)
+		{
+			if (g_b981CDesktop)
 			{
 				if (m_lineSelectedID==11)
 				{
@@ -2060,6 +2069,7 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y)
 						return;
 					}
 				}
+			}
 
 			ShowModifyPointDlg(selectedPointID);
 			return;
@@ -2560,6 +2570,8 @@ void CGISDlg::MouseDblClickMap1()
 	if (m_bEditLine)
 	{
 		int ptSelected = GetPtSel(m_editLineDataGroup.pts,m_editLineDataGroup.pointNum,GLOBAL_X,GLOBAL_Y);
+		if (g_b981CDesktop)
+		{
 			if (m_editLineDataGroup.lineID==11) //回收航线屏蔽1,4,5,6航点
 			{
 				if (ptSelected==0 || (ptSelected>=m_editLineDataGroup.pointNum-3))
@@ -2567,6 +2579,8 @@ void CGISDlg::MouseDblClickMap1()
 					return;
 				}
 			}
+		}
+
 		if (ptSelected>=0)
 		{
 			if (m_distLabelLayer!=-1)
@@ -2627,6 +2641,8 @@ void CGISDlg::MouseMoveMap1(short Button, short Shift, long x, long y)
 		{
 			return;
 		}
+		if (g_b981CDesktop)
+		{
 			if (m_editLineDataGroup.lineID==11)  //回收航线1,4,5,6不让编辑
 			{
 				if (m_iPtSel==0 || (m_iPtSel>=m_editLineDataGroup.pointNum-3))
@@ -2634,6 +2650,7 @@ void CGISDlg::MouseMoveMap1(short Button, short Shift, long x, long y)
 					return;
 				}
 			}
+		}
 
 		int n_pts = m_editLineDataGroup.pointNum;
 		bool isClosedLine;
@@ -7430,6 +7447,8 @@ void CGISDlg::ShowEditSaveDlg()
 
 	//
 	CString dirName = "";
+	if (g_b981APad ||g_b981ADesktop)
+	{
 		switch (m_lineSelectedID)
 		{
 		case 1:
@@ -7442,24 +7461,25 @@ void CGISDlg::ShowEditSaveDlg()
 			dirName = "航线3\\";
 			break;
 		case 4:
-		dirName = "地面滑行航线\\";
+			dirName = "봄窟4\\";
 			break;
 		case 5:
-		dirName = "围栏航线\\";
-		break;
-	case 6:
-		dirName = "空投航线\\";
-		break;
-	case 10:
-		dirName = "跑道航线\\";
+			dirName = "봄窟5\\";
 			break;
 		case 11:
-		dirName = "回收航线\\";
+			dirName = "壇선봄窟\\";
+			break;
+		case 12:
+			dirName = "든綾鍋으봄窟\\";
 			break;
 		case 13:
-		dirName = "通场航线\\";
+			dirName = "覩쨌럿봄봄窟\\";
+			break;
+		case 14:
+			dirName = "쀼澗봄窟\\";
 			break;
 		}
+	}
 
 	//重新保存回收航线
 	CString filename;
@@ -7500,7 +7520,7 @@ void CGISDlg::ShowEditSaveDlg()
 			}
 			else if (i==n_linePts-1)
 			{
-				if (m_lineSelectedID==11)  //回收航线
+				if (m_lineSelectedID==11 && g_b981CDesktop)  //쀼澗봄窟
 				{
 					fprintf(fp,"%d, %d, %lf, %lf, %.2lf, 0, 00, 07\n", m_editLineDataGroup.lineID,i,linePt.dX,linePt.dY,linePt.nH);
 				}
@@ -7512,7 +7532,7 @@ void CGISDlg::ShowEditSaveDlg()
 			}
 			else if (i==n_linePts)
 			{
-				if (m_lineSelectedID==11)  //回收航线
+				if (m_lineSelectedID==11 && g_b981CDesktop)  //쀼澗봄窟
 				{
 					fprintf(fp,"%d, %d, %lf, %lf, %.2lf, 0, 00, 0B\n", m_editLineDataGroup.lineID,i,linePt.dX,linePt.dY,linePt.nH);
 				}

resource.h

@@ -289,7 +289,6 @@
 #define ID_32819                        32819
 #define IDM_BINDLINE3                   32820
 #define ID_32821                        32821
-#define IDM_BINDLINE4                   32822
 #define IDM_BINDLINE5                   32823
 #define ID_32825                        32825
 #define IDM_LAYERMNG                    32828
@@ -370,13 +369,14 @@
 #define IDM_SHOW_LINE14                 32908
 #define ID_SHOW_BACKLINE                32909
 #define ID_BIND_BACKLINE                32910
+#define IDM_BINDLINE4                   32911
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        1169
-#define _APS_NEXT_COMMAND_VALUE         32911
+#define _APS_NEXT_COMMAND_VALUE         32912
 #define _APS_NEXT_CONTROL_VALUE         1050
 #define _APS_NEXT_SYMED_VALUE           1000
 #endif