diff --git a/GISControlDlg.rc b/GISControlDlg.rc
index 2caec7a..6243423 100644
--- a/GISControlDlg.rc
+++ b/GISControlDlg.rc
@@ -155,21 +155,21 @@ BEGIN
EDITTEXT IDC_AZ_ANGLE,78,43,44,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_CLIENTEDGE
END
-IDD_DIALOG_LINE_ID DIALOGEX 0, 0, 101, 72
+IDD_DIALOG_LINE_ID DIALOGEX 0, 0, 143, 104
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "选择航路特征和航线号"
-FONT 9, "微软雅黑", 0, 0, 0x1
+FONT 12, "微软雅黑", 400, 0, 0x86
BEGIN
- DEFPUSHBUTTON "保存",IDOK,3,54,43,12
- PUSHBUTTON "取消",IDCANCEL,50,54,43,12
- LTEXT "航线编号:",IDC_STATIC,7,23,38,8
- COMBOBOX IDC_COMBO_LINEID,46,21,45,63,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "返回原点",IDC_RADIO_LINE,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_GROUP,2,2,37,10
- CONTROL "闭合航路",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,41,2,37,10
- LTEXT "航线高度:",IDC_STATIC,7,8,38,8
- EDITTEXT IDC_EDIT_LHGT,46,6,45,12,ES_AUTOHSCROLL
- LTEXT "航路特征:",IDC_STATIC,7,39,38,8
- COMBOBOX IDC_COMBO_LINECE,46,37,45,63,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "保存",IDOK,77,82,43,12
+ PUSHBUTTON "取消",IDCANCEL,23,82,43,12
+ LTEXT "航线编号:",IDC_STATIC,25,43,38,8
+ COMBOBOX IDC_COMBO_LINEID,76,41,45,63,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ CONTROL "返回原点",IDC_RADIO_LINE,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_GROUP,23,4,37,10
+ CONTROL "闭合航路",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,62,4,37,10
+ LTEXT "航线高度:",IDC_STATIC,25,21,38,8
+ EDITTEXT IDC_EDIT_LHGT,76,19,45,12,ES_CENTER | ES_AUTOHSCROLL
+ LTEXT "航路特征:",IDC_STATIC,25,64,38,8
+ COMBOBOX IDC_COMBO_LINECE,76,62,45,63,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
END
IDD_DIALOG_LINE_SECT DIALOGEX 0, 0, 106, 71
@@ -422,9 +422,9 @@ BEGIN
IDD_DIALOG_LINE_ID, DIALOG
BEGIN
LEFTMARGIN, 2
- RIGHTMARGIN, 98
+ RIGHTMARGIN, 140
TOPMARGIN, 2
- BOTTOMMARGIN, 70
+ BOTTOMMARGIN, 102
END
IDD_DIALOG_LINE_SECT, DIALOG
@@ -490,62 +490,25 @@ END
// Bitmap
//
-IDB_BITMAP_FLYLINE_DESIGN BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\编辑.bmp"
-IDB_BITMAP_ZOOMIN BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\放大.bmp"
-IDB_BITMAP_ADD_FLYLINE BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\加载弹道数据.bmp"
-IDB_BITMAP_ADD_SHPFILE BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\加载矢量数据.bmp"
-IDB_BITMAP_ADD_IMGFILE BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\加载影像数据.bmp"
-IDB_BITMAP_RULER BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\清除航迹.bmp"
-IDB_BITMAP_FULLSCREEN BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\全图.bmp"
-IDB_BITMAP_DELETE_LAYER BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\删除图层.bmp"
-IDB_BITMAP_ZOOMOUT BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\缩小.bmp"
-IDB_BITMAP10 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\添加文字.bmp"
-IDB_BITMAP_LAYER_MANAGE BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\图层管理.bmp"
-IDB_BITMAP_SELECT BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\选择.bmp"
-IDB_BITMAP_MOVE BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\移动.bmp"
-IDB_BITMAP14 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\鹰眼图.bmp"
-IDB_BITMAP_XY BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\坐标.bmp"
-IDB_BITMAP_SURVEY BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\测量.bmp"
-IDB_BITMAP_PRINT BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\打印.bmp"
-IDB_BITMAP_REFRESH BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\刷新.bmp"
-ID_STR_ZCW BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\放大.bmp"
-IDB_BITMAP3 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\编辑.bmp"
-IDB_BITMAP4 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\测量.bmp"
-IDB_BITMAP5 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\打印.bmp"
-IDB_BITMAP6 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\加载弹道数据.bmp"
-IDB_BITMAP7 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\加载矢量数据.bmp"
-IDB_BITMAP8 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\加载影像数据.bmp"
-IDB_BITMAP9 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\清除航迹.bmp"
-IDB_BITMAP11 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\全图.bmp"
-IDB_BITMAP12 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\删除图层.bmp"
-IDB_BITMAP13 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\刷新.bmp"
-IDB_BITMAP15 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\缩小.bmp"
-IDB_BITMAP16 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\添加文字.bmp"
-IDB_BITMAP17 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\图层管理.bmp"
-IDB_BITMAP18 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\选择.bmp"
-IDB_BITMAP19 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\移动.bmp"
-IDB_BITMAP20 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\鹰眼图.bmp"
-IDB_BITMAP21 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\坐标.bmp"
-IDB_BITMAP22 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\放大.bmp"
-IDB_BITMAP23 BITMAP "C:\\Users\\DELL\\Desktop\\bmp32\\加载弹道数据.bmp"
-IDB_BITMAP24 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\编辑.bmp"
-IDB_BITMAP25 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\测量.bmp"
-IDB_BITMAP26 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\打印.bmp"
-IDB_BITMAP27 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\加载弹道数据.bmp"
-IDB_BITMAP28 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\加载矢量数据.bmp"
-IDB_BITMAP29 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\加载影像数据.bmp"
-IDB_BITMAP30 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\清除航迹.bmp"
-IDB_BITMAP31 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\全图.bmp"
-IDB_BITMAP32 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\删除图层.bmp"
-IDB_BITMAP33 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\刷新.bmp"
-IDB_BITMAP34 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\缩小.bmp"
-IDB_BITMAP35 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\添加文字.bmp"
-IDB_BITMAP36 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\图层管理.bmp"
-IDB_BITMAP37 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\选择.bmp"
-IDB_BITMAP38 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\移动.bmp"
-IDB_BITMAP39 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\鹰眼图.bmp"
-IDB_BITMAP40 BITMAP "C:\\GCS-JE20230622-981A\\GISControlDlg\\res\\坐标.bmp"
-IDB_BITMAP41 BITMAP "res\\放大.bmp"
+IDB_BITMAP_FLYLINE_DESIGN BITMAP "res\\编辑.bmp"
+IDB_BITMAP_ZOOMIN BITMAP "res\\放大.bmp"
+IDB_BITMAP_ADD_FLYLINE BITMAP "res\\加载弹道数据.bmp"
+IDB_BITMAP_ADD_SHPFILE BITMAP "res\\加载矢量数据.bmp"
+IDB_BITMAP_ADD_IMGFILE BITMAP "res\\加载影像数据.bmp"
+IDB_BITMAP_RULER BITMAP "res\\清除航迹.bmp"
+IDB_BITMAP_FULLSCREEN BITMAP "res\\全图.bmp"
+IDB_BITMAP_DELETE_LAYER BITMAP "res\\删除图层.bmp"
+IDB_BITMAP_ZOOMOUT BITMAP "res\\缩小.bmp"
+IDB_BITMAP10 BITMAP "res\\添加文字.bmp"
+IDB_BITMAP_LAYER_MANAGE BITMAP "res\\图层管理.bmp"
+IDB_BITMAP_SELECT BITMAP "res\\选择.bmp"
+IDB_BITMAP_MOVE BITMAP "res\\移动.bmp"
+IDB_BITMAP14 BITMAP "res\\鹰眼图.bmp"
+IDB_BITMAP_XY BITMAP "res\\坐标.bmp"
+IDB_BITMAP_SURVEY BITMAP "res\\测量.bmp"
+IDB_BITMAP_PRINT BITMAP "res\\打印.bmp"
+IDB_BITMAP_REFRESH BITMAP "res\\刷新.bmp"
+ID_STR_ZCW BITMAP "res\\放大.bmp"
/////////////////////////////////////////////////////////////////////////////
//
@@ -565,10 +528,11 @@ BEGIN
END
POPUP "航线"
BEGIN
- MENUITEM "导入航线", IDT_BUTTON3
MENUITEM SEPARATOR
MENUITEM "航线设计", IDM_DESIGN_MYFLYLINE
MENUITEM SEPARATOR
+ MENUITEM "导入航线", IDT_BUTTON3
+ MENUITEM SEPARATOR
MENUITEM "显示一号航线", IDM_SHOW_LINE1
MENUITEM "显示二号航线", IDM_SHOW_LINE2
MENUITEM "显示三号航线", IDM_SHOW_LINE3
@@ -620,7 +584,6 @@ BEGIN
BEGIN
MENUITEM "置点", ID_ADDPOINT
MENUITEM "删点", ID_DELPOINT
- MENUITEM "属性", ID_EDITPOINT
MENUITEM "清除", ID_CLEARPOINT
MENUITEM "结束", ID_ENDDESIGN
END
diff --git a/GISControlDlg.vcxproj b/GISControlDlg.vcxproj
index 43348d4..1f98ed3 100644
--- a/GISControlDlg.vcxproj
+++ b/GISControlDlg.vcxproj
@@ -333,7 +333,6 @@
-
diff --git a/GISControlDlg.vcxproj.filters b/GISControlDlg.vcxproj.filters
index c37c0ac..47e299c 100644
--- a/GISControlDlg.vcxproj.filters
+++ b/GISControlDlg.vcxproj.filters
@@ -258,9 +258,6 @@
Resource Files
-
- Resource Files
-
diff --git a/GISDlg.cpp b/GISDlg.cpp
index e95e0e4..812f3ff 100644
--- a/GISDlg.cpp
+++ b/GISDlg.cpp
@@ -1553,6 +1553,10 @@ void CGISDlg::OnShowRMenu()
// 隐藏二级子菜单的第一个子项
//pSubSubMenu->ModifyMenu(IDM_SHOW_LINE14, MF_BYPOSITION | MF_DISABLED | MF_GRAYED); //隐藏空投航线
pSubSubMenu->RemoveMenu(IDM_SHOW_LINE14, MF_BYCOMMAND); //隐藏空投航线
+
+ // 修改二级子菜单文本
+ pSubMenu->ModifyMenu(ID_BIND_BACKLINE, MF_BYCOMMAND | MF_STRING, IDR_MENU2, _T("自主着陆点装订"));
+ pSubMenu->ModifyMenu(ID_SHOW_BACKLINE, MF_BYCOMMAND | MF_STRING, IDR_MENU2, _T("自主着陆点显示"));
}
}
}