From d58663293fea6b13ec061c880936e2936ecd7f15 Mon Sep 17 00:00:00 2001 From: cbwu <504-wuchengbo@htsdfp.com> Date: Mon, 4 Dec 2023 09:17:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?type(fix):=E7=A7=BB=E9=99=A4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=88=AA=E7=82=B9=E6=97=B6=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E6=8F=90=E7=A4=BA=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ModifyLinePointDlg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModifyLinePointDlg.cpp b/ModifyLinePointDlg.cpp index 57b464a..7ee08c5 100644 --- a/ModifyLinePointDlg.cpp +++ b/ModifyLinePointDlg.cpp @@ -341,7 +341,7 @@ void CModifyLinePointDlg::OnEnKillfocusEditLon() bool b = checkLon(cstr.GetBuffer(),typeID); if (!b) { - BCGPMessageBox("经度范围或格式有误,请重新输入!"); + //BCGPMessageBox("经度范围或格式有误,请重新输入!"); m_strLon.SetFocus(); } @@ -358,7 +358,7 @@ void CModifyLinePointDlg::OnEnKillfocusEditLat() bool b = checkLat(cstr.GetBuffer(),typeID); if (!b) { - BCGPMessageBox("纬度范围或格式有误,请重新输入!"); + //BCGPMessageBox("纬度范围或格式有误,请重新输入!"); m_strLat.SetFocus(); } -- 2.37.1.windows.1 From 1517e5a5e06b3469507cd4e4647f40e76a532899 Mon Sep 17 00:00:00 2001 From: cbwu <504-wuchengbo@htsdfp.com> Date: Mon, 4 Dec 2023 09:34:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?type(feat):=E6=96=B0=E5=A2=9E=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=B7=BB=E5=8A=A0=E6=9C=80=E5=A4=9A127=E4=B8=AA?= =?UTF-8?q?=E8=88=AA=E7=82=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GISDlg.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/GISDlg.cpp b/GISDlg.cpp index d4c189c..6e74a2b 100644 --- a/GISDlg.cpp +++ b/GISDlg.cpp @@ -1972,6 +1972,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 +2043,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 ); -- 2.37.1.windows.1 From 76cf403bcd650ab5d5da7cb793d5532e1d6e7e0a Mon Sep 17 00:00:00 2001 From: cbwu <504-wuchengbo@htsdfp.com> Date: Mon, 4 Dec 2023 11:26:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?type(feat):981A=E5=8F=B3=E9=94=AE=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E9=9A=90=E8=97=8F=E9=AB=98=E7=A8=8B=E5=88=86=E6=9E=90?= =?UTF-8?q?=E3=80=81=E6=A0=87=E7=BB=98=E3=80=81=E6=98=BE=E7=A4=BA=E7=A9=BA?= =?UTF-8?q?=E6=8A=95=E8=88=AA=E7=BA=BF=E5=AD=90=E9=A1=B9=E3=80=82type(fix)?= =?UTF-8?q?:=E4=BF=AE=E6=94=B9981C=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GISDlg.cpp | 62 ++++++++++++++++++++++++++++++++++++++--------- Globe.cpp | 2 +- Globe.h | 2 +- SetSaveLineID.cpp | 4 +-- 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/GISDlg.cpp b/GISDlg.cpp index 6e74a2b..3316bbb 100644 --- a/GISDlg.cpp +++ b/GISDlg.cpp @@ -1284,6 +1284,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]) @@ -1515,11 +1531,35 @@ 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 ); - } } @@ -5710,7 +5750,7 @@ void CGISDlg::OnShowBackLine() { SetFlyLineShowStatus(14); } - if (g_b98CADesktop) + if (g_b981CDesktop) { SetFlyLineShowStatus(11); } @@ -5724,7 +5764,7 @@ void CGISDlg::OnUpdateShowBackLine(CCmdUI *pCmdUI) { pCmdUI->SetCheck(m_pHaveDrawLineFlag[13]); } - if (g_b98CADesktop) + if (g_b981CDesktop) { pCmdUI->SetCheck(m_pHaveDrawLineFlag[10]); } @@ -5738,7 +5778,7 @@ void CGISDlg::OnShowHs11() { SetFlyLineShowStatus(11); } - if (g_b98CADesktop) + if (g_b981CDesktop) { SetFlyLineShowStatus(7); } @@ -5753,7 +5793,7 @@ void CGISDlg::OnUpdateShowHs11(CCmdUI *pCmdUI) pCmdUI->SetCheck(m_pHaveDrawLineFlag[10]); } - if (g_b98CADesktop) + if (g_b981CDesktop) { pCmdUI->SetCheck(m_pHaveDrawLineFlag[6]); } @@ -5768,7 +5808,7 @@ void CGISDlg::OnBindHs11() { m_struMapOut.ID=11; } - if (g_b98CADesktop) + if (g_b981CDesktop) { m_struMapOut.ID=7; } @@ -5782,7 +5822,7 @@ void CGISDlg::OnShowTc12() { SetFlyLineShowStatus(12); } - if (g_b98CADesktop) + if (g_b981CDesktop) { SetFlyLineShowStatus(6); } @@ -5797,7 +5837,7 @@ void CGISDlg::OnBindTc12() { m_struMapOut.ID=12; } - if (g_b98CADesktop) + if (g_b981CDesktop) { m_struMapOut.ID=6; } @@ -5811,7 +5851,7 @@ void CGISDlg::OnUpdateShowTc12(CCmdUI *pCmdUI) { pCmdUI->SetCheck(m_pHaveDrawLineFlag[11]); } - if (g_b98CADesktop) + if (g_b981CDesktop) { pCmdUI->SetCheck(m_pHaveDrawLineFlag[5]); } @@ -5840,7 +5880,7 @@ void CGISDlg::OnBindBackLine() { m_struMapOut.ID=14; } - if (g_b98CADesktop) + if (g_b981CDesktop) { m_struMapOut.ID=11; } diff --git a/Globe.cpp b/Globe.cpp index 52f3005..ee64dda 100644 --- a/Globe.cpp +++ b/Globe.cpp @@ -234,4 +234,4 @@ bool g_bMarkerPlot[g_iMarkerPtNum] = {false}; -------------------------------------------------------------------------------------------------------------*/ bool g_b981ADesktop = true; bool g_b981APad = false; -bool g_b98CADesktop = false; \ No newline at end of file +bool g_b981CDesktop = false; \ No newline at end of file diff --git a/Globe.h b/Globe.h index 1cb2a38..987d3c7 100644 --- a/Globe.h +++ b/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 \ No newline at end of file diff --git a/SetSaveLineID.cpp b/SetSaveLineID.cpp index c308eae..439a5bc 100644 --- a/SetSaveLineID.cpp +++ b/SetSaveLineID.cpp @@ -117,7 +117,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); @@ -184,7 +184,7 @@ int CSetSaveLineID::GetLineID() } } - if (g_b98CADesktop) + if (g_b981CDesktop) { if (str=="应急航线") { -- 2.37.1.windows.1