dev/cbwu #46

Merged
WuChengbo merged 2 commits from dev/cbwu into master 9 months ago

@ -436,4 +436,13 @@ extern "C" void WINAPI SetBindLine14Coordinate(int uavID,double lon,double lat)
{ {
g_mapShowDlg.SetBindLine14Coordinate(uavID,lon,lat); g_mapShowDlg.SetBindLine14Coordinate(uavID,lon,lat);
} }
}
//获取地图版本号
extern "C" CString WINAPI GetMapVersion() {
AFX_MANAGE_STATE(AfxGetAppModuleState());
if (g_bCreateMap)
{
return g_mapShowDlg.GetMapVersion();
}
} }

@ -119,4 +119,7 @@ extern "C" _declspec(dllexport) void ShowLine14Ex(int uavID,double uavLon,double
//输入飞机ID自主着陆点经纬度 //输入飞机ID自主着陆点经纬度
extern "C" _declspec(dllexport) void SetBindLine14Coordinate(int uavID,double lon,double lat); extern "C" _declspec(dllexport) void SetBindLine14Coordinate(int uavID,double lon,double lat);
//获取地图版本号
extern "C" _declspec(dllexport) CString GetMapVersion();
//#endif //#endif

@ -38,4 +38,5 @@ EXPORTS
ZoomToLocation @31 ZoomToLocation @31
OnShowTargetPoint @32 OnShowTargetPoint @32
ShowLine14Ex @33 ShowLine14Ex @33
SetBindLine14Coordinate @34 SetBindLine14Coordinate @34
GetMapVersion @35

@ -97,7 +97,7 @@
<Culture>0x0804</Culture> <Culture>0x0804</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\Release/GISControlDlgUAV.dll</OutputFile> <OutputFile>..\Release/GISControlDlg.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\GISControlDlg.def</ModuleDefinitionFile> <ModuleDefinitionFile>.\GISControlDlg.def</ModuleDefinitionFile>
<ProgramDatabaseFile>.\Release/GISControlDlg.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>.\Release/GISControlDlg.pdb</ProgramDatabaseFile>
@ -149,7 +149,7 @@
<Culture>0x0804</Culture> <Culture>0x0804</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\Debug/GISControlDlgUAV.dll</OutputFile> <OutputFile>..\Debug/GISControlDlg.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\GISControlDlg.def</ModuleDefinitionFile> <ModuleDefinitionFile>.\GISControlDlg.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>

@ -8800,7 +8800,26 @@ void CGISDlg::SetBindLine14Coordinate(int uavID,double lon,double lat)
m_CoordinateBindLine14[uavID] = pt; 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;
}

@ -66,6 +66,8 @@ public:
~CGISDlg(); ~CGISDlg();
//获取地图版本号
CString GetMapVersion();
/*******************新增<编辑航线>功能**************************/ /*******************新增<编辑航线>功能**************************/
map<int,DrawLineDataStruct> m_ShowedLineDataList; //存储已显示的航线数据 map<int,DrawLineDataStruct> m_ShowedLineDataList; //存储已显示的航线数据
DrawLineDataStruct m_editLineDataGroup; //编辑航线数据 DrawLineDataStruct m_editLineDataGroup; //编辑航线数据

@ -323,4 +323,7 @@ bool g_bMarkerPlot[g_iMarkerPtNum] = {false};
bool g_b981ADesktop = true; bool g_b981ADesktop = true;
bool g_b981APad = false; bool g_b981APad = false;
bool g_b981CDesktop = false; bool g_b981CDesktop = false;
bool g_b981AMulti = true; bool g_b981AMulti = false;
//地图模块版本号 [主版本.次版本.修订版本,日期,特性]
CString mapVersion[3] = { "1.0.0","20240920", "单机版在线地图"};

@ -301,4 +301,6 @@ extern bool g_b981APad; // 981Aƽ
extern bool g_b981CDesktop; // 981C电脑端 extern bool g_b981CDesktop; // 981C电脑端
extern bool g_b981AMulti; // 981A多机 extern bool g_b981AMulti; // 981A多机
extern CString mapVersion[3];
#endif #endif

@ -1,13 +1,13 @@
// //
// GISCONTROLDLG.RC2 - resources Microsoft Visual C++ does not edit directly // GISCONTROLDLG.RC2 - resources Microsoft Visual C++ does not edit directly
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#error this file is not editable by Microsoft Visual C++ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED #endif //APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Add manually edited resources here... // Add manually edited resources here...
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

Loading…
Cancel
Save