diff --git a/ExportQBGISCtrlClass.cpp b/ExportQBGISCtrlClass.cpp index 7631ca4..6960ef8 100644 --- a/ExportQBGISCtrlClass.cpp +++ b/ExportQBGISCtrlClass.cpp @@ -436,4 +436,13 @@ extern "C" void WINAPI SetBindLine14Coordinate(int uavID,double lon,double lat) { g_mapShowDlg.SetBindLine14Coordinate(uavID,lon,lat); } +} + +//获取地图版本号 +extern "C" CString WINAPI GetMapVersion() { + AFX_MANAGE_STATE(AfxGetAppModuleState()); + if (g_bCreateMap) + { + return g_mapShowDlg.GetMapVersion(); + } } \ No newline at end of file diff --git a/ExportQBGISCtrlClass.h b/ExportQBGISCtrlClass.h index aff09b1..5e8e90d 100644 --- a/ExportQBGISCtrlClass.h +++ b/ExportQBGISCtrlClass.h @@ -119,4 +119,7 @@ extern "C" _declspec(dllexport) void ShowLine14Ex(int uavID,double uavLon,double //输入:飞机ID,自主着陆点经纬度 extern "C" _declspec(dllexport) void SetBindLine14Coordinate(int uavID,double lon,double lat); +//获取地图版本号 +extern "C" _declspec(dllexport) CString GetMapVersion(); + //#endif \ No newline at end of file diff --git a/GISControlDlg.def b/GISControlDlg.def index 13d0248..4740923 100644 --- a/GISControlDlg.def +++ b/GISControlDlg.def @@ -38,4 +38,5 @@ EXPORTS ZoomToLocation @31 OnShowTargetPoint @32 ShowLine14Ex @33 - SetBindLine14Coordinate @34 \ No newline at end of file + SetBindLine14Coordinate @34 + GetMapVersion @35 \ No newline at end of file diff --git a/GISControlDlg.vcxproj b/GISControlDlg.vcxproj index 0eaefd5..a7f3bfa 100644 --- a/GISControlDlg.vcxproj +++ b/GISControlDlg.vcxproj @@ -97,7 +97,7 @@ 0x0804 - ..\Release/GISControlDlgUAV.dll + ..\Release/GISControlDlg.dll true .\GISControlDlg.def .\Release/GISControlDlg.pdb @@ -149,7 +149,7 @@ 0x0804 - ..\Debug/GISControlDlgUAV.dll + ..\Debug/GISControlDlg.dll true .\GISControlDlg.def true diff --git a/GISDlg.cpp b/GISDlg.cpp index ed33573..67b59b4 100644 --- a/GISDlg.cpp +++ b/GISDlg.cpp @@ -8800,7 +8800,26 @@ void CGISDlg::SetBindLine14Coordinate(int uavID,double lon,double lat) m_CoordinateBindLine14[uavID] = pt; } - +//获取地图版本号 +CString CGISDlg::GetMapVersion() +{ + CString str; + if (g_b981ADesktop && g_b981AMulti) + { + mapVersion[2] = "多机单机版在线地图"; + }else if (g_b981ADesktop && !g_b981AMulti) + { + mapVersion[2] = "单机版在线地图"; + }else if (g_b981APad) + { + mapVersion[2] = "平板版在线地图"; + }else if (g_b981AMulti) + { + mapVersion[2] = "多机版在线地图"; + } + str = mapVersion[0] + '\/' + mapVersion[1] + '\/' + mapVersion[2]; + return str; +} diff --git a/GISDlg.h b/GISDlg.h index 291c2a9..d11f0ff 100644 --- a/GISDlg.h +++ b/GISDlg.h @@ -66,6 +66,8 @@ public: ~CGISDlg(); + //获取地图版本号 + CString GetMapVersion(); /*******************新增<编辑航线>功能**************************/ map m_ShowedLineDataList; //存储已显示的航线数据 DrawLineDataStruct m_editLineDataGroup; //编辑航线数据 diff --git a/Globe.cpp b/Globe.cpp index e22551c..4afb89c 100644 --- a/Globe.cpp +++ b/Globe.cpp @@ -323,4 +323,7 @@ bool g_bMarkerPlot[g_iMarkerPtNum] = {false}; bool g_b981ADesktop = true; bool g_b981APad = false; bool g_b981CDesktop = false; -bool g_b981AMulti = true; \ No newline at end of file +bool g_b981AMulti = false; + +//地图模块版本号 [主版本.次版本.修订版本,日期,特性] +CString mapVersion[3] = { "1.0.0","20240920", "单机版在线地图"}; \ No newline at end of file diff --git a/Globe.h b/Globe.h index 61e18ad..34dc6a7 100644 --- a/Globe.h +++ b/Globe.h @@ -301,4 +301,6 @@ extern bool g_b981APad; // 981A平 extern bool g_b981CDesktop; // 981C电脑端 extern bool g_b981AMulti; // 981A多机 +extern CString mapVersion[3]; + #endif \ No newline at end of file diff --git a/res/GISControlDlg.rc2 b/res/GISControlDlg.rc2 index 23dc028..63186b0 100644 --- a/res/GISControlDlg.rc2 +++ b/res/GISControlDlg.rc2 @@ -1,13 +1,13 @@ -// -// GISCONTROLDLG.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// +// +// GISCONTROLDLG.RC2 - resources Microsoft Visual C++ does not edit directly +// + +#ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// Add manually edited resources here... + +/////////////////////////////////////////////////////////////////////////////