Merge pull request 'dev/cbwu' (#17) from dev/cbwu into master

Reviewed-on: #17

GISDlg.cpp

@@ -1830,7 +1830,7 @@ void CGISDlg::OnRemoveAllLayers()
 	m_map.SetBackColor(RGB(0,0,0));
 
 	//是否已经加载了地图
-	m_bHaveAddMap = false;
+	//m_bHaveAddMap = false;
 }
 
 
@@ -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)
 		{
-			return;
+			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,9 +2017,12 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y)
 			{
 				return;
 			}
-			if (m_lineSelectedID==11)
+			if (g_b981CDesktop)
 			{
-				if (addPointPos>m_editLineDataGroup.linePointNum-4) return; //回收航线屏蔽4,5,6长边不让编辑
+				if (m_lineSelectedID==11)
+				{
+					if (addPointPos>m_editLineDataGroup.linePointNum-4) return; //回收航线屏蔽4,5,6长边不让编辑
+				}
 			}
 
 			if (m_editLineDataGroup.pointNum>=127) //限制最多127个点
@@ -2022,7 +2030,6 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y)
 				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};
@@ -2053,11 +2060,14 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y)
 		int selectedPointID = GetPtSel(m_editLineDataGroup.pts,m_editLineDataGroup.pointNum,x,y);
 		if (selectedPointID>=0)
 		{
-			if (m_lineSelectedID==11)
+			if (g_b981CDesktop)
 			{
-				if (selectedPointID>=m_editLineDataGroup.pointNum-3 || selectedPointID==0) //回收航线屏蔽1,4,5,6,航点
+				if (m_lineSelectedID==11)
 				{
-					return;
+					if (selectedPointID>=m_editLineDataGroup.pointNum-3 || selectedPointID==0) //回收航线屏蔽1,4,5,6,航点
+					{
+						return;
+					}
 				}
 			}
 
@@ -2560,13 +2570,17 @@ void CGISDlg::MouseDblClickMap1()
 	if (m_bEditLine)
 	{
 		int ptSelected = GetPtSel(m_editLineDataGroup.pts,m_editLineDataGroup.pointNum,GLOBAL_X,GLOBAL_Y);
-		if (m_editLineDataGroup.lineID==11) //回收航线屏蔽1,4,5,6航点
+		if (g_b981CDesktop)
 		{
-			if (ptSelected==0 || (ptSelected>=m_editLineDataGroup.pointNum-3))
+			if (m_editLineDataGroup.lineID==11) //回收航线屏蔽1,4,5,6航点
 			{
-				return;
+				if (ptSelected==0 || (ptSelected>=m_editLineDataGroup.pointNum-3))
+				{
+					return;
+				}
 			}
 		}
+
 		if (ptSelected>=0)
 		{
 			if (m_distLabelLayer!=-1)
@@ -2627,11 +2641,14 @@ void CGISDlg::MouseMoveMap1(short Button, short Shift, long x, long y)
 		{
 			return;
 		}
-		if (m_editLineDataGroup.lineID==11)  //回收航线1,4,5,6不让编辑
+		if (g_b981CDesktop)
 		{
-			if (m_iPtSel==0 || (m_iPtSel>=m_editLineDataGroup.pointNum-3))
+			if (m_editLineDataGroup.lineID==11)  //回收航线1,4,5,6不让编辑
 			{
-				return;
+				if (m_iPtSel==0 || (m_iPtSel>=m_editLineDataGroup.pointNum-3))
+				{
+					return;
+				}
 			}
 		}
 
@@ -4467,6 +4484,7 @@ void CGISDlg::CreateFloatToolBar()
 
 	m_ImageList.Create(24, 24, ILC_COLOR24|ILC_MASK, 0, 0);                  //创建Image List  
 	CRect rcToolBar;
+	
 /*
 	rcToolBar.top = m_rcGISArea.top;
 	rcToolBar.left = m_rcGISArea.right-24;
@@ -4512,6 +4530,7 @@ void CGISDlg::CreateFloatToolBar()
 
 	//m_ToolBar.ShowWindow(SW_HIDE);  
 	RepositionBars(AFX_IDW_CONTROLBAR_FIRST,AFX_IDW_CONTROLBAR_LAST, 0);
+
 }
 
 
@@ -7430,35 +7449,38 @@ void CGISDlg::ShowEditSaveDlg()
 
 	//
 	CString dirName = "";
-	switch (m_lineSelectedID)
+	if (g_b981APad ||g_b981ADesktop)
 	{
-	case 1:
+		switch (m_lineSelectedID)
-		dirName = "航线1\\";
+		{
-		break;
+		case 1:
-	case 2:
+			dirName = "航线1\\";
-		dirName = "航线2\\";
+			break;
-		break;
+		case 2:
-	case 3:
+			dirName = "航线2\\";
-		dirName = "航线3\\";
+			break;
-		break;
+		case 3:
-	case 4:
+			dirName = "航线3\\";
-		dirName = "地面滑行航线\\";
+			break;
-		break;
+		case 4:
-	case 5:
+			dirName = "航线4\\";
-		dirName = "围栏航线\\";
+			break;
-		break;
+		case 5:
-	case 6:
+			dirName = "航线5\\";
-		dirName = "空投航线\\";
+			break;
-		break;
+		case 11:
-	case 10:
+			dirName = "应急航线\\";
-		dirName = "跑道航线\\";
+			break;
-		break;
+		case 12:
-	case 11:
+			dirName = "电子围栏航线\\";
-		dirName = "回收航线\\";
+			break;
-		break;
+		case 13:
-	case 13:
+			dirName = "原路返航航线\\";
-		dirName = "通场航线\\";
+			break;
-		break;
+		case 14:
+			dirName = "回收航线\\";
+			break;
+		}
 	}
 
 	//重新保存回收航线
@@ -7500,7 +7522,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 +7534,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);
 				}

GISDlg.h

@@ -60,6 +60,7 @@ public:
 	CGISDlg(CWnd* pParent = NULL);   // standard constructor
 
 	~CGISDlg();
+
 	/*******************新增<编辑航线>功能**************************/
 	map<int,DrawLineDataStruct> m_ShowedLineDataList;  //存储已显示的航线数据
 	DrawLineDataStruct m_editLineDataGroup;  //编辑航线数据

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