修复图层管理bug；修复A/C回收航线等显示与装订不匹配问题；暴露地图定位的接口。

ExportQBGISCtrlClass.cpp

@@ -235,7 +235,17 @@ extern "C" void WINAPI SetUAVFlyCoordinate(int uavid,const double lon, const dou
 	}
 }
 
-
+//功能：定位到目标点
+//输入：经度lon，纬度lat
+extern "C" void WINAPI ZoomToLocation(double lon,double lat)
+{
+	AFX_MANAGE_STATE(AfxGetAppModuleState());
+	if (g_bCreateMap)
+	{
+		//标绘目标点
+		g_mapShowDlg.ZoomToLocation(lon,lat);
+	}
+}
 
 //功能：增加目标点，在地图显示区标绘出来
 //输入：目标点号ptID，经度lon，纬度lat

ExportQBGISCtrlClass.h

@@ -44,7 +44,9 @@ extern "C" _declspec(dllexport) void  DeleteGISDlg();
 //      航向角yaw（以°为单位）
 extern "C" _declspec(dllexport) void  SetUAVFlyCoordinate(const double lon, const double lat, const double yaw);
 
-
+//功能：定位到目标点
+//输入：经度lon，纬度lat
+extern "C" _declspec(dllexport) void  ZoomToLocation(double lon,double lat);
 
 //功能：增加目标点，在地图显示区标绘出来
 //输入：目标点号ptID，经度lon，纬度lat

GISControlDlg.def

@@ -34,4 +34,5 @@ EXPORTS
  ShowGISDlg                 @27
  GetMouseWheel				@28
  UpdateDataInfo				@29
- AddAirPt_ADS				@30
+ AddAirPt_ADS				@30
+ ZoomToLocation             @31

GISControlDlg.rc

@@ -535,6 +535,7 @@ BEGIN
             MENUITEM "鞫刻힛뵀봄窟",                      IDM_SHOW_LINE3
             MENUITEM "鞫刻愷뵀봄窟",                      IDM_SHOW_LINE4
             MENUITEM "鞫刻巧뵀봄窟",                      IDM_SHOW_LINE5
+            MENUITEM "ÏÔʾ¿ÕͶº½Ïß",                      IDM_SHOW_LINE14
             MENUITEM SEPARATOR
             MENUITEM "陋땐寧뵀봄窟",                      ID_LOAD_MYLINE1
             MENUITEM "陋땐랗뵀봄窟",                      IDM_BINDLINE2
@@ -544,11 +545,11 @@ BEGIN
         END
         POPUP "든綾鍋으섟壇선봄窟"
         BEGIN
-            MENUITEM "»ØÊÕº½ÏßÏÔʾ",                      ID_SHOW_PD10
+            MENUITEM "»ØÊÕº½ÏßÏÔʾ",                      ID_SHOW_BACKLINE
             MENUITEM "壇선봄窟鞫刻",                      ID_SHOW_HS11
             MENUITEM "든綾鍋으鞫刻",                      ID_SHOW_TC12
             MENUITEM SEPARATOR
-            MENUITEM "»ØÊÕº½Ïß×°¶©",                      ID_32855
+            MENUITEM "»ØÊÕº½Ïß×°¶©",                      ID_BIND_BACKLINE
             MENUITEM "壇선봄窟陋땐",                      ID_BIND_HS11
             MENUITEM "든綾鍋으陋땐",                      ID_BIND_TC12
         END

GISControlDlg.vcxproj

@@ -377,6 +377,7 @@
     <ClInclude Include="DlgDemAlt.h" />
     <ClInclude Include="DlgLightRegion.h" />
     <ClInclude Include="DlgMarker.h" />
+    <ClInclude Include="ExportQBGISCtrlClass.h" />
     <ClInclude Include="extents.h" />
     <ClInclude Include="field.h" />
     <ClInclude Include="FlyLineDesign.h" />

GISControlDlg.vcxproj.filters

@@ -418,5 +418,8 @@
     <ClInclude Include="SaveLineEditSetting.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ExportQBGISCtrlClass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

GISDlg.cpp

@@ -502,8 +502,8 @@ BEGIN_MESSAGE_MAP(CGISDlg, CBCGPDialog)
 	//	ON_WM_MOUSEHWHEEL()
 	ON_COMMAND(ID_NLINEDESIGN, &CGISDlg::OnNlinedesign)
 	ON_UPDATE_COMMAND_UI(ID_NLINEDESIGN, &CGISDlg::OnUpdateNlinedesign)
-	ON_COMMAND(ID_SHOW_PD10, &CGISDlg::OnShowPd10)
+	ON_COMMAND(ID_SHOW_BACKLINE, &CGISDlg::OnShowBackLine)
-	ON_UPDATE_COMMAND_UI(ID_SHOW_PD10, &CGISDlg::OnUpdateShowPd10)
+	ON_UPDATE_COMMAND_UI(ID_SHOW_BACKLINE, &CGISDlg::OnUpdateShowBackLine)
 	ON_COMMAND(ID_SHOW_HS11, &CGISDlg::OnShowHs11)
 	ON_UPDATE_COMMAND_UI(ID_SHOW_HS11, &CGISDlg::OnUpdateShowHs11)
 	ON_COMMAND(ID_BIND_HS11, &CGISDlg::OnBindHs11)
@@ -511,7 +511,7 @@ BEGIN_MESSAGE_MAP(CGISDlg, CBCGPDialog)
 	ON_COMMAND(ID_BIND_TC12, &CGISDlg::OnBindTc12)
 	ON_UPDATE_COMMAND_UI(ID_SHOW_TC12, &CGISDlg::OnUpdateShowTc12)
 	ON_WM_SIZE()
-	ON_COMMAND(ID_32855, &CGISDlg::On32855)
+	ON_COMMAND(ID_BIND_BACKLINE, &CGISDlg::OnBindBackLine)
 	ON_WM_MOVE()
 	ON_MESSAGE(WM_SEL_UAV, &CGISDlg::OnSelUav)
 	ON_COMMAND(ID_ADD_TARGET, &CGISDlg::OnAddTarget)
@@ -578,6 +578,9 @@ BEGIN_MESSAGE_MAP(CGISDlg, CBCGPDialog)
 	ON_UPDATE_COMMAND_UI(IDM_SHOW_LINE10, &CGISDlg::OnUpdateShowLine10)
 	ON_COMMAND(IDM_BINDLINE9, &CGISDlg::OnBindline9)
 	ON_COMMAND(IDM_BINDLINE10, &CGISDlg::OnBindline10)*/
+	//空投航线
+	ON_COMMAND(IDM_SHOW_LINE14, &CGISDlg::OnShowLine14)
+	ON_UPDATE_COMMAND_UI(IDM_SHOW_LINE14, &CGISDlg::OnUpdateShowLine14)
 	END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1375,36 +1378,86 @@ void CGISDlg::OnShowRMenu()
 		}
 		*/
 
-		//봄窟14  쀼澗봄窟
+		if (g_b981ADesktop || g_b981APad)
-		if (m_pHaveDrawLineFlag[13])
 		{
-			menu.CheckMenuItem( ID_SHOW_PD10, MF_BYCOMMAND | MF_CHECKED );
+			//航线14  回收航线
-		}
+			if (m_pHaveDrawLineFlag[13])
-		else
+			{
-		{
+				menu.CheckMenuItem( ID_SHOW_BACKLINE, MF_BYCOMMAND | MF_CHECKED );
-			menu.CheckMenuItem( ID_SHOW_PD10, MF_BYCOMMAND | MF_UNCHECKED );
+			}
-		}
+			else
+			{
+				menu.CheckMenuItem( ID_SHOW_BACKLINE, MF_BYCOMMAND | MF_UNCHECKED );
+			}
 
-		//봄窟11  壇선봄窟
+			//航线11  应急航线
-		if (m_pHaveDrawLineFlag[10])
+			if (m_pHaveDrawLineFlag[10])
-		{
+			{
-			menu.CheckMenuItem( ID_SHOW_HS11, MF_BYCOMMAND | MF_CHECKED );
+				menu.CheckMenuItem( ID_SHOW_HS11, MF_BYCOMMAND | MF_CHECKED );
-		}
+			}
-		else
+			else
-		{
+			{
-			menu.CheckMenuItem( ID_SHOW_HS11, MF_BYCOMMAND | MF_UNCHECKED );
+				menu.CheckMenuItem( ID_SHOW_HS11, MF_BYCOMMAND | MF_UNCHECKED );
-		}
+			}
 
-		//봄窟12  든綾鍋으
+			//航线12  电子围栏
-		if (m_pHaveDrawLineFlag[11])
+			if (m_pHaveDrawLineFlag[11])
-		{
+			{
-			menu.CheckMenuItem( ID_SHOW_TC12, MF_BYCOMMAND | MF_CHECKED );
+				menu.CheckMenuItem( ID_SHOW_TC12, MF_BYCOMMAND | MF_CHECKED );
+			}
+			else
+			{
+				menu.CheckMenuItem( ID_SHOW_TC12, MF_BYCOMMAND | MF_UNCHECKED );
+			}
 		}
-		else
+
+
+		if (g_b98CADesktop)
 		{
-			menu.CheckMenuItem( ID_SHOW_TC12, MF_BYCOMMAND | MF_UNCHECKED );
+			//航线14  回收航线
+			if (m_pHaveDrawLineFlag[10])
+			{
+				menu.CheckMenuItem( ID_SHOW_BACKLINE, MF_BYCOMMAND | MF_CHECKED );
+			}
+			else
+			{
+				menu.CheckMenuItem( ID_SHOW_BACKLINE, MF_BYCOMMAND | MF_UNCHECKED );
+			}
+			//航线6 围栏
+			if (m_pHaveDrawLineFlag[5])
+			{
+				//menu.CheckMenuItem( ID_SHOW_WEILAN, MF_BYCOMMAND | MF_CHECKED );
+				menu.CheckMenuItem( ID_SHOW_TC12, MF_BYCOMMAND | MF_UNCHECKED );
+			}
+			else
+			{
+				//menu.CheckMenuItem( ID_SHOW_WEILAN, MF_BYCOMMAND | MF_UNCHECKED );
+				menu.CheckMenuItem( ID_SHOW_TC12, MF_BYCOMMAND | MF_UNCHECKED );
+			}
+
+			//航线7 应急
+			if (m_pHaveDrawLineFlag[6])
+			{
+				//menu.CheckMenuItem( ID_SHOW_LINE_YINGJI, MF_BYCOMMAND | MF_CHECKED );
+				menu.CheckMenuItem( ID_SHOW_HS11, MF_BYCOMMAND | MF_CHECKED );
+			}
+			else
+			{
+				//menu.CheckMenuItem( ID_SHOW_LINE_YINGJI, MF_BYCOMMAND | MF_UNCHECKED );
+				menu.CheckMenuItem( ID_SHOW_HS11, MF_BYCOMMAND | MF_CHECKED );
+			}
+			//航线14,空投航线
+			if (m_pHaveDrawLineFlag[13])
+			{
+				menu.CheckMenuItem( IDM_SHOW_LINE14, MF_BYCOMMAND | MF_CHECKED );
+			}
+			else
+			{
+				menu.CheckMenuItem( IDM_SHOW_LINE14, MF_BYCOMMAND | MF_UNCHECKED );
+			}
 		}
 
+
 		if (m_bAutoMove)
 		{
 			menu.CheckMenuItem( IDM_AUTO_MOVE, MF_BYCOMMAND | MF_CHECKED );
@@ -4576,6 +4629,12 @@ void CGISDlg::OnShowLine10()
 	SetFlyLineShowStatus(10);
 }
 
+//功能：显示空投
+void CGISDlg::OnShowLine14()
+{
+	SetFlyLineShowStatus(14);
+}
+
 //功能：清除已经标绘的航线
 //输入：航线编号lineID，从0开始计数
 void CGISDlg::ClearDrawedLine(const int lineID)
@@ -4683,6 +4742,11 @@ void CGISDlg::OnUpdateShowLine10(CCmdUI *pCmdUI)
 	pCmdUI->SetCheck(m_pHaveDrawLineFlag[9]);
 }
 
+void CGISDlg::OnUpdateShowLine14(CCmdUI *pCmdUI)
+{
+	pCmdUI->SetCheck(m_pHaveDrawLineFlag[13]);
+}
+
 //功能：显示航线
 //输入：航线文件名称strLineFileName
 void CGISDlg::OnShowGivenLine(const CString strLineFileName)
@@ -5614,59 +5678,118 @@ BOOL CGISDlg::ReadLine(int iLine,PTLIST *pList)
 }
 
 //显示回收航线（14）
-void CGISDlg::OnShowPd10()
+void CGISDlg::OnShowBackLine()
 {
 	// TODO: 在此添加命令处理程序代码
-	SetFlyLineShowStatus(14);
+	if (g_b981ADesktop || g_b981APad)
+	{
+		SetFlyLineShowStatus(14);
+	}
+	if (g_b98CADesktop)
+	{
+		SetFlyLineShowStatus(11);
+	}
 }
 
 
-void CGISDlg::OnUpdateShowPd10(CCmdUI *pCmdUI)
+void CGISDlg::OnUpdateShowBackLine(CCmdUI *pCmdUI)
 {
 	// TODO: 在此添加命令更新用户界面处理程序代码
-	pCmdUI->SetCheck(m_pHaveDrawLineFlag[13]);  
+	if (g_b981ADesktop || g_b981APad)
+	{
+		pCmdUI->SetCheck(m_pHaveDrawLineFlag[13]); 
+	}
+	if (g_b98CADesktop)
+	{
+		pCmdUI->SetCheck(m_pHaveDrawLineFlag[10]); 
+	}
 }
 
 
 void CGISDlg::OnShowHs11()
 {
 	// TODO: 在此添加命令处理程序代码
-	SetFlyLineShowStatus(11);
+	if (g_b981ADesktop || g_b981APad)
+	{
+		SetFlyLineShowStatus(11);
+	}
+	if (g_b98CADesktop)
+	{
+		SetFlyLineShowStatus(7);
+	}
 }
 
 //应急航线 11
 void CGISDlg::OnUpdateShowHs11(CCmdUI *pCmdUI)
 {
 	// TODO: 在此添加命令更新用户界面处理程序代码
-	pCmdUI->SetCheck(m_pHaveDrawLineFlag[10]);
+	if (g_b981ADesktop || g_b981APad)
+	{
+		pCmdUI->SetCheck(m_pHaveDrawLineFlag[10]);
+	}
+
+	if (g_b98CADesktop)
+	{
+		pCmdUI->SetCheck(m_pHaveDrawLineFlag[6]);
+	}
+	
 }
 
 
 void CGISDlg::OnBindHs11()
 {
 	m_struMapOut.cmd=MapCmd_BindLine;
-	m_struMapOut.ID=11;
+	if (g_b981ADesktop || g_b981APad)
+	{
+		m_struMapOut.ID=11;
+	}
+	if (g_b98CADesktop)
+	{
+		m_struMapOut.ID=7;
+	}
 	::SendMessage(GetParent()->GetSafeHwnd(),MESSAGE_B8MAP,(int)(&m_struMapOut),0);
 }
 
 //电子围栏 12
 void CGISDlg::OnShowTc12()
 {
-	SetFlyLineShowStatus(12);
+	if (g_b981ADesktop || g_b981APad)
+	{
+		SetFlyLineShowStatus(12);
+	}
+	if (g_b98CADesktop)
+	{
+		SetFlyLineShowStatus(6);
+	}
+	
 }
 
 
 void CGISDlg::OnBindTc12()
 {
 	m_struMapOut.cmd=MapCmd_BindLine;
-	m_struMapOut.ID=12;
+	if (g_b981ADesktop || g_b981APad)
+	{
+		m_struMapOut.ID=12;
+	}
+	if (g_b98CADesktop)
+	{
+		m_struMapOut.ID=6;
+	}
 	::SendMessage(GetParent()->GetSafeHwnd(),MESSAGE_B8MAP,(int)(&m_struMapOut),0);
 }
 
 
 void CGISDlg::OnUpdateShowTc12(CCmdUI *pCmdUI)
 {
+	if (g_b981ADesktop || g_b981APad)
+	{
 		pCmdUI->SetCheck(m_pHaveDrawLineFlag[11]);
+	}
+	if (g_b98CADesktop)
+	{
+		pCmdUI->SetCheck(m_pHaveDrawLineFlag[5]);
+	}
 }
 
 void CGISDlg::OnSize(UINT nType, int cx, int cy)
@@ -5685,10 +5808,17 @@ void CGISDlg::OnSize(UINT nType, int cx, int cy)
 	
 }
 
-void CGISDlg::On32855()
+void CGISDlg::OnBindBackLine()
 {
 	m_struMapOut.cmd=MapCmd_BindLine;
-	m_struMapOut.ID=14;
+	if (g_b981ADesktop || g_b981APad)
+	{
+		m_struMapOut.ID=14;
+	}
+	if (g_b98CADesktop)
+	{
+		m_struMapOut.ID=11;
+	}
 	::SendMessage(GetParent()->GetSafeHwnd(),MESSAGE_B8MAP,(int)(&m_struMapOut),0);
 }
 

GISDlg.h

@@ -781,8 +781,8 @@ public:
 	//	afx_msg void OnMouseHWheel(UINT nFlags, short zDelta, CPoint pt);
 	afx_msg void OnNlinedesign();
 	afx_msg void OnUpdateNlinedesign(CCmdUI *pCmdUI);
-	afx_msg void OnShowPd10();
+	afx_msg void OnShowBackLine();
-	afx_msg void OnUpdateShowPd10(CCmdUI *pCmdUI);
+	afx_msg void OnUpdateShowBackLine(CCmdUI *pCmdUI);
 	afx_msg void OnShowHs11();
 	afx_msg void OnUpdateShowHs11(CCmdUI *pCmdUI);
 	afx_msg void OnBindHs11();
@@ -790,7 +790,7 @@ public:
 	afx_msg void OnBindTc12();
 	afx_msg void OnUpdateShowTc12(CCmdUI *pCmdUI);
 	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void On32855();
+	afx_msg void OnBindBackLine();
 
 	
 	afx_msg void OnMove(int x, int y);
@@ -906,6 +906,9 @@ public:
 	afx_msg void OnUpdateShowLine10(CCmdUI *pCmdUI);
 	afx_msg void OnBindline9();
 	afx_msg void OnBindline10();
+
+	afx_msg void OnShowLine14();
+	afx_msg void OnUpdateShowLine14(CCmdUI *pCmdUI);
 };
 
 //{{AFX_INSERT_LOCATION}}

Globe.cpp

@@ -233,5 +233,5 @@ bool    g_bMarkerPlot[g_iMarkerPtNum] = {false};
 说明：不同飞机型号变量，用于控制是否启用个性功能
 -------------------------------------------------------------------------------------------------------------*/
 bool g_b981ADesktop = false;
-bool g_b981APad = true;
+bool g_b981APad = false;
-bool g_b98CADesktop = false;
+bool g_b98CADesktop = true;

resource.h

@@ -328,13 +328,17 @@
 #define ID__32904                       32904
 #define ID_EDIT                         32905
 #define ID_EDIT_LINEPOINT               32906
+#define ID_32907                        32907
+#define IDM_SHOW_LINE14                 32908
+#define ID_SHOW_BACKLINE                32909
+#define ID_BIND_BACKLINE                32910
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        1078
-#define _APS_NEXT_COMMAND_VALUE         32907
+#define _APS_NEXT_COMMAND_VALUE         32911
 #define _APS_NEXT_CONTROL_VALUE         1050
 #define _APS_NEXT_SYMED_VALUE           1000
 #endif