diff --git a/DlgMarker.cpp b/DlgMarker.cpp index b776a45..520cf33 100644 --- a/DlgMarker.cpp +++ b/DlgMarker.cpp @@ -16,6 +16,11 @@ CDlgMarker::CDlgMarker(CWnd* pParent /*=NULL*/) EnableVisualManagerStyle(TRUE, TRUE); m_iSelectedIndex = -1; + + for (int i=0;i= 20) + if (g_iHaveMarkedPts >= 120) { - BCGPMessageBoxEx(NULL,_T("最多支持20个标记点!"),_T("Tip"),MB_OK,MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US)); + BCGPMessageBoxEx(NULL,_T("最多支持120个标记点!"),_T("Tip"),MB_OK,MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US)); return ; } diff --git a/GISDlg.cpp b/GISDlg.cpp index e11b9c2..1af8e90 100644 --- a/GISDlg.cpp +++ b/GISDlg.cpp @@ -13,6 +13,7 @@ #include "SetSaveLineID.h" #include "CUtils.h" + //#include "8BMapDLL_type.h" #include @@ -2593,7 +2594,7 @@ void CGISDlg::MouseDownMap1(short Button, short Shift, long x, long y) m_CircleGuideLayer = m_map.NewDrawing(1); } - double radius = circleGuidenceDlg.g_radius/abs(2*M_PI*6371000*cos(m_guidePtInfo.guidePtLat*M_PI/180)/360); + double radius = circleGuidenceDlg.g_radius/abs(2*M_PI*6378137*cos(m_guidePtInfo.guidePtLat*M_PI/180)/360); m_map.DrawWideCircleEx(m_CircleGuideLayer,m_guidePtInfo.guidePtLon,m_guidePtInfo.guidePtLat,radius,RGB(248,252,55),false,2); m_map.Redraw(); @@ -7790,6 +7791,14 @@ void CGISDlg::ShowSaveZoneDlg(double* xPoints,double* yPoints) OnShowGivenLine(filename); m_map.Redraw(); } + else + { + if (m_tempZoneLayerID>=0) + { + m_map.RemoveLayer(m_tempZoneLayerID); + m_tempZoneLayerID = -1; + } + } } @@ -7864,12 +7873,14 @@ void CGISDlg::DrawRestrictedZone(long& layerID,double* xPoints,double* yPoints,i if(type == 0){//限飞区黄色 pShapeDrawingOption->LineColor = RGB(250,173,20); pShapeDrawingOption->FillColor = RGB(254,252,233);//RGB(244,206,199); + //pShapeDrawingOption->LineColor = RGB(212,212,252); + //pShapeDrawingOption->FillColor = RGB(0,255,255);//RGB(244,206,199); }else if(type==1){ //禁飞区红色 pShapeDrawingOption->LineColor = RGB(220,38,38); pShapeDrawingOption->FillColor = RGB(254,243,243);//RGB(244,206,199); } pShapeDrawingOption->LineWidth = 2; - pShapeDrawingOption->FillTransparency = 180; //透明度 + pShapeDrawingOption->FillTransparency = 60; //透明度 (m_map.GetShapefile(layerID)).SetDefaultDrawingOptions(pShapeDrawingOption); }; diff --git a/Globe.h b/Globe.h index af5b5a1..cc2e9de 100644 --- a/Globe.h +++ b/Globe.h @@ -260,7 +260,7 @@ extern long g_lDemPtNumLayerID[g_iDemAltPtNum]; extern bool g_bSelectMarker; //最大支持的标记点数 -const int g_iMarkerPtNum = 20; +const int g_iMarkerPtNum = 120; //标记点图层 extern long g_lMarkerLayerID[g_iMarkerPtNum];