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

Reviewed-on: #13

GISDlg.cpp

@@ -1285,6 +1285,22 @@ void CGISDlg::OnShowRMenu()
 		//鞫刻우쌥꽉데
 		CMenu   menu;
 		
+		//CMenu* pMenu = GetMenu();
+		//if (pMenu != NULL)
+		//{
+/*
+			CMenu* pSubMenu = menu.GetSubMenu(0);
+			if (pSubMenu != NULL)
+			{
+				CMenu* pSubMenu2 = pSubMenu->GetSubMenu(0);
+				if (pSubMenu2 != NULL)
+				{
+					pSubMenu2->DeleteMenu(IDM_SHOW_LINE14, MF_BYCOMMAND);
+				}
+			}*/
+		//}
+
+
 		POINT   pt;
 		GetCursorPos( &pt );
 
@@ -1425,7 +1441,7 @@ void CGISDlg::OnShowRMenu()
 		}
 
 
-		if (g_b98CADesktop)
+		if (g_b981CDesktop)
 		{
 			//봄窟14  쀼澗봄窟
 			if (m_pHaveDrawLineFlag[10])
@@ -1516,10 +1532,34 @@ void CGISDlg::OnShowRMenu()
 			menu.CheckMenuItem( ID_MENU_ADSB, MF_BYCOMMAND | MF_UNCHECKED );
 		}
 		
+		//menu.GetSubMenu(0)->ModifyMenu(0, MF_BYPOSITION | MF_DISABLED | MF_GRAYED);
+
+		if (g_b981ADesktop || g_b981APad)
+		{
+			// 获取子菜单
+			CMenu* pSubMenu = menu.GetSubMenu(0); // 第一个子菜单
+			//int nn = pSubMenu->GetMenuItemCount();
+			if (pSubMenu)
+			{
+				pSubMenu->ModifyMenu(5, MF_BYPOSITION | MF_DISABLED | MF_GRAYED); //隐藏高程分析
+				pSubMenu->ModifyMenu(7, MF_BYPOSITION | MF_DISABLED | MF_GRAYED); //隐藏标绘
+
+				// 获取二级子菜单
+				CMenu* pSubSubMenu = pSubMenu->GetSubMenu(2); // 二级子菜单（航线子项）
+				//int nn2 = pSubSubMenu->GetMenuItemCount();
+				if (pSubSubMenu)
+				{
+					// 隐藏二级子菜单的第一个子项
+					//pSubSubMenu->ModifyMenu(IDM_SHOW_LINE14, MF_BYPOSITION | MF_DISABLED | MF_GRAYED); //隐藏空投航线
+					pSubSubMenu->RemoveMenu(IDM_SHOW_LINE14, MF_BYCOMMAND); //隐藏空投航线
+				}
+			}
+		}
+
+
 		//뎐놔우쌥꽉데
 		menu.GetSubMenu( 0 )->TrackPopupMenu( TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, this );
 
-
 	}
 }
 
@@ -1972,6 +2012,11 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y)
 				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};
@@ -2038,6 +2083,10 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y)
 		}
 		if (m_bSetPointModel)//零듐
 		{
+			if (m_designLinePointNum>=127) //限制最多127个航点
+			{
+				return;
+			}
 			
 			POINT   pt;
 			GetCursorPos( &pt );
@@ -5701,7 +5750,7 @@ void CGISDlg::OnShowBackLine()
 	{
 		SetFlyLineShowStatus(14);
 	}
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		SetFlyLineShowStatus(11);
 	}
@@ -5715,7 +5764,7 @@ void CGISDlg::OnUpdateShowBackLine(CCmdUI *pCmdUI)
 	{
 		pCmdUI->SetCheck(m_pHaveDrawLineFlag[13]); 
 	}
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		pCmdUI->SetCheck(m_pHaveDrawLineFlag[10]); 
 	}
@@ -5729,7 +5778,7 @@ void CGISDlg::OnShowHs11()
 	{
 		SetFlyLineShowStatus(11);
 	}
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		SetFlyLineShowStatus(7);
 	}
@@ -5744,7 +5793,7 @@ void CGISDlg::OnUpdateShowHs11(CCmdUI *pCmdUI)
 		pCmdUI->SetCheck(m_pHaveDrawLineFlag[10]);
 	}
 
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		pCmdUI->SetCheck(m_pHaveDrawLineFlag[6]);
 	}
@@ -5759,7 +5808,7 @@ void CGISDlg::OnBindHs11()
 	{
 		m_struMapOut.ID=11;
 	}
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		m_struMapOut.ID=7;
 	}
@@ -5773,7 +5822,7 @@ void CGISDlg::OnShowTc12()
 	{
 		SetFlyLineShowStatus(12);
 	}
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		SetFlyLineShowStatus(6);
 	}
@@ -5788,7 +5837,7 @@ void CGISDlg::OnBindTc12()
 	{
 		m_struMapOut.ID=12;
 	}
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		m_struMapOut.ID=6;
 	}
@@ -5802,7 +5851,7 @@ void CGISDlg::OnUpdateShowTc12(CCmdUI *pCmdUI)
 	{
 		pCmdUI->SetCheck(m_pHaveDrawLineFlag[11]);
 	}
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		pCmdUI->SetCheck(m_pHaveDrawLineFlag[5]);
 	}
@@ -5831,7 +5880,7 @@ void CGISDlg::OnBindBackLine()
 	{
 		m_struMapOut.ID=14;
 	}
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		m_struMapOut.ID=11;
 	}

Globe.cpp

@@ -234,4 +234,4 @@ bool    g_bMarkerPlot[g_iMarkerPtNum] = {false};
 -------------------------------------------------------------------------------------------------------------*/
 bool g_b981ADesktop = true;
 bool g_b981APad = false;
-bool g_b98CADesktop = false;
+bool g_b981CDesktop = false;

Globe.h

@@ -272,6 +272,6 @@ extern bool    g_bMarkerPlot[g_iMarkerPtNum];
 -------------------------------------------------------------------------------------------------------------*/
 extern bool g_b981ADesktop;		// 981AµçÄÔ¶Ë
 extern bool g_b981APad;			// 981Aƽ°å¶Ë
-extern bool g_b98CADesktop;		// 981CµçÄÔ¶Ë
+extern bool g_b981CDesktop;		// 981CµçÄÔ¶Ë
 
 #endif

ModifyLinePointDlg.cpp

@@ -342,7 +342,7 @@ void CModifyLinePointDlg::OnEnKillfocusEditLon()
 	bool  b = checkLon(cstr.GetBuffer(),typeID);
 	if (!b)
 	{
-		BCGPMessageBox("经度范围或格式有误,请重新输入!");
+		//BCGPMessageBox("经度范围或格式有误,请重新输入!");
 		m_strLon.SetFocus();
 	}
 
@@ -359,7 +359,7 @@ void CModifyLinePointDlg::OnEnKillfocusEditLat()
 	bool  b = checkLat(cstr.GetBuffer(),typeID);
 	if (!b)
 	{
-		BCGPMessageBox("纬度范围或格式有误,请重新输入!");
+		//BCGPMessageBox("纬度范围或格式有误,请重新输入!");
 		m_strLat.SetFocus();
 	}
 

SetSaveLineID.cpp

@@ -121,7 +121,7 @@ BOOL CSetSaveLineID::OnInitDialog()
 	m_LineCE.InsertString(0,_T("¿ªºÏ"));
 	m_LineCE.InsertString(1,_T("±ÕºÏ"));
 	//GetDlgItem(IDC_RADIO3)->EnableWindow(TRUE);
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 /*
 		((CButton *)GetDlgItem(IDC_RADIO3))->SetCheck(true);
@@ -200,7 +200,7 @@ int CSetSaveLineID::GetLineID()
 		}
 	}
 
-	if (g_b98CADesktop)
+	if (g_b981CDesktop)
 	{
 		if (str=="Ó¦¼±º½Ïß")
 		{