地图

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -265,8 +265,12 @@ public static class MapControlEx
         {
             //DevExpress.XtraMap.WmsLayer
             var provider = new WmsDataProvider();//地图瓦片提供者
+            //provider.ResponseCapabilities += (obj,e) =>
+            //{
+
+            //};
             provider.ServerUri = wmsUrl;
-            //provider.
+            provider.ActiveLayerName = "OSM-WMS";
             ctrl.GetImageLayer().DataProvider = provider;
         }
         else
@@ -477,42 +481,42 @@ public static class MapControlEx
         ctrl.NavigationPanelOptions.BackgroundStyle.Fill = Color.Transparent;
         ctrl.NavigationPanelOptions.ShowScrollButtons = false;
         ctrl.NavigationPanelOptions.ShowZoomTrackbar = false;
-        // ctrl.NavigationPanelOptions.ShowCoordinates = true;
-        //ctrl.NavigationPanelOptions.ShowKilometersScale = false;
-        //ctrl.NavigationPanelOptions.ShowMilesScale = false;
+        ctrl.NavigationPanelOptions.ShowCoordinates = true;
+        ctrl.NavigationPanelOptions.ShowKilometersScale = false;
+        ctrl.NavigationPanelOptions.ShowMilesScale = false;
         ctrl.NavigationPanelOptions.CoordinatesStyle.Font = new Font("微软雅黑", 10F);
         ctrl.NavigationPanelOptions.ScaleStyle.Font = new Font("微软雅黑", 10F);
 
         // Create ImageTileLayer
         ImageLayer layer = new ImageLayer() { Name = "ImageTileLayer" };
-        bool localGmdbDataEnable = false;//本地Data.Gmdb是否可用,可用时读取本地瓦片,否则执行Http请求资源
-        var files = Directory.GetFiles(Application.StartupPath, "Data.gmdb", SearchOption.AllDirectories);
-        if (files.Length > 0)
-        {
-            try
-            {
-                string conStr = string.Format("Data Source=\"{0}\";Page Size=32768", files[0]);
-                var con = new SQLiteConnection(conStr);
-                con.Open();
-                con.Close();
-                localGmdbDataEnable = true;
-            }
-            catch (Exception ex)
-            {
-                Console.Error.WriteLine(ex.Message);
-            }
-        }
-        if (localGmdbDataEnable)
-        {
-            var provider = new ImageTileDataProvider();//地图瓦片提供者
-            provider.TileSource = new ImageTileSource();//地图瓦片数据源接口实现
-            layer.DataProvider = provider;
-        }
-        else
-        {
-            var provider = new HttpMapDataProvider();
-            layer.DataProvider = provider;
-        }
+        //bool localGmdbDataEnable = false;//本地Data.Gmdb是否可用,可用时读取本地瓦片,否则执行Http请求资源
+        //var files = Directory.GetFiles(Application.StartupPath, "Data.gmdb", SearchOption.AllDirectories);
+        //if (files.Length > 0)
+        //{
+        //    try
+        //    {
+        //        string conStr = string.Format("Data Source=\"{0}\";Page Size=32768", files[0]);
+        //        var con = new SQLiteConnection(conStr);
+        //        con.Open();
+        //        con.Close();
+        //        localGmdbDataEnable = true;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        Console.Error.WriteLine(ex.Message);
+        //    }
+        //}
+        //if (localGmdbDataEnable)
+        //{
+        //    var provider = new ImageTileDataProvider();//地图瓦片提供者
+        //    provider.TileSource = new ImageTileSource();//地图瓦片数据源接口实现
+        //    layer.DataProvider = provider;
+        //}
+        //else
+        //{
+        //    var provider = new HttpMapDataProvider();
+        //    layer.DataProvider = provider;
+        //}
         ctrl.Layers.Add(layer);
 
         //地图绘制加载(标点、测距、框选等元素载体图层).用来绘制可擦除的元素

XdCxRhDW.App/MainForm.Designer.cs

@@ -28,10 +28,11 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
-            DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
-            DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
+            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
             this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
             this.skinPaletteDropDownButtonItem1 = new DevExpress.XtraBars.SkinPaletteDropDownButtonItem();
             this.btnOpenApi = new DevExpress.XtraBars.BarButtonItem();
@@ -53,6 +54,7 @@
             this.documentManager1 = new DevExpress.XtraBars.Docking2010.DocumentManager(this.components);
             this.tabbedView1 = new DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(this.components);
             this.dockManager1 = new DevExpress.XtraBars.Docking.DockManager(this.components);
+            this.btnXlCalculate = new DevExpress.XtraBars.BarButtonItem();
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.documentManager1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedView1)).BeginInit();
@@ -64,7 +66,6 @@
             this.ribbon.CaptionBarItemLinks.Add(this.skinPaletteDropDownButtonItem1);
             this.ribbon.CaptionBarItemLinks.Add(this.btnOpenApi);
             this.ribbon.DrawGroupCaptions = DevExpress.Utils.DefaultBoolean.False;
-            this.ribbon.EmptyAreaImageOptions.ImagePadding = new System.Windows.Forms.Padding(34, 39, 34, 39);
             this.ribbon.ExpandCollapseItem.Id = 0;
             this.ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
             this.skinPaletteDropDownButtonItem1,
@@ -80,12 +81,11 @@
             this.btnSat,
             this.btnCocTool,
             this.btnErrFx,
-            this.btnDetectTool});
+            this.btnDetectTool,
+            this.btnXlCalculate});
             this.ribbon.Location = new System.Drawing.Point(0, 0);
-            this.ribbon.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.ribbon.MaxItemId = 23;
+            this.ribbon.MaxItemId = 24;
             this.ribbon.Name = "ribbon";
-            this.ribbon.OptionsMenuMinWidth = 377;
             this.ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
             this.ribbonPage1});
             this.ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.MacOffice;
@@ -97,7 +97,7 @@
             this.ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Show;
             this.ribbon.ShowQatLocationSelector = false;
             this.ribbon.ShowToolbarCustomizeItem = false;
-            this.ribbon.Size = new System.Drawing.Size(1539, 164);
+            this.ribbon.Size = new System.Drawing.Size(1347, 126);
             this.ribbon.Toolbar.ShowCustomizeItem = false;
             // 
             // skinPaletteDropDownButtonItem1
@@ -111,9 +111,9 @@
             this.btnOpenApi.Id = 21;
             this.btnOpenApi.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnOpenApi.ImageOptions.SvgImage")));
             this.btnOpenApi.Name = "btnOpenApi";
-            toolTipItem1.Text = "查看接口文档";
-            superToolTip1.Items.Add(toolTipItem1);
-            this.btnOpenApi.SuperTip = superToolTip1;
+            toolTipItem2.Text = "查看接口文档";
+            superToolTip2.Items.Add(toolTipItem2);
+            this.btnOpenApi.SuperTip = superToolTip2;
             this.btnOpenApi.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnOpenApi_ItemClick);
             // 
             // btnTask
@@ -237,6 +237,7 @@
             this.ribbonPageGroup3.ItemLinks.Add(this.btnCocTool);
             this.ribbonPageGroup3.ItemLinks.Add(this.btnDetectTool);
             this.ribbonPageGroup3.ItemLinks.Add(this.btnErrFx);
+            this.ribbonPageGroup3.ItemLinks.Add(this.btnXlCalculate);
             this.ribbonPageGroup3.Name = "ribbonPageGroup3";
             this.ribbonPageGroup3.Text = "手动工具";
             // 
@@ -265,15 +266,22 @@
             "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl",
             "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"});
             // 
+            // btnXlCalculate
+            // 
+            this.btnXlCalculate.Caption = "星历推算";
+            this.btnXlCalculate.Id = 23;
+            this.btnXlCalculate.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barButtonItem1.ImageOptions.SvgImage")));
+            this.btnXlCalculate.Name = "btnXlCalculate";
+            this.btnXlCalculate.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_ItemClick);
+            // 
             // MainForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1539, 905);
+            this.ClientSize = new System.Drawing.Size(1347, 704);
             this.Controls.Add(this.ribbon);
             this.IconOptions.Icon = ((System.Drawing.Icon)(resources.GetObject("MainForm.IconOptions.Icon")));
             this.IsMdiContainer = true;
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "MainForm";
             this.Ribbon = this.ribbon;
             this.Text = "多模式融合定位平台";
@@ -310,5 +318,6 @@
         private DevExpress.XtraBars.BarButtonItem btnErrFx;
         private DevExpress.XtraBars.BarButtonItem btnOpenApi;
         private DevExpress.XtraBars.BarButtonItem btnDetectTool;
+        private DevExpress.XtraBars.BarButtonItem btnXlCalculate;
     }
 }

XdCxRhDW.App/MainForm.resx

@@ -490,6 +490,34 @@
         PHBvbHlnb24gcG9pbnRzPSIxMiwyMiAxMCwyMCAxMCwyOCAyMiwyOCAyMiwxMiAgIiBjbGFzcz0iQmx1
         ZSIgLz4NCiAgICA8cGF0aCBkPSJNMjYsMzBoMnYyaC00VjJoNHYyaC0yVjMweiBNNCw0aDJ2MjZINHYy
         aDRWMkg0VjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="barButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAN4EAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iU3BlbGxDaGVjayIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAw
+        IDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9
+        CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8cG9seWdvbiBwb2ludHM9IjI3LDcgMTIs
+        MjIgNywxNyA0LDIwIDEyLDI4IDMwLDEwICIgY2xhc3M9IkJsdWUiIC8+DQogIDxwYXRoIGQ9Ik03Ljks
+        MTBINkw1LjQsOC4ySDIuNkwyLDEwaC0yTDMsMmgyLjFMNy45LDEweiBNNSw2LjhMNC4xLDQuMUM0LjEs
+        My45LDQsMy43LDQsMy40aDBjMCwwLjItMC4xLDAuNS0wLjEsMC43ICBMMyw2LjhINXogTTguOSwxMFYy
+        aDIuOWMwLjksMCwxLjYsMC4yLDIuMSwwLjVjMC41LDAuMywwLjcsMC44LDAuNywxLjRjMCwwLjQtMC4x
+        LDAuOC0wLjQsMS4xYy0wLjMsMC4zLTAuNywwLjUtMS4xLDAuN3YwICBjMC42LDAuMSwxLDAuMywxLjQs
+        MC42UzE1LDcuMSwxNSw3LjZjMCwwLjctMC4zLDEuMy0wLjgsMS43QzEzLjYsOS44LDEyLjksMTAsMTIs
+        MTBIOC45eiBNMTAuNywzLjN2MS45aDAuOGMwLjQsMCwwLjctMC4xLDAuOS0wLjMgIHMwLjMtMC40LDAu
+        My0wLjdjMC0wLjYtMC40LTAuOS0xLjMtMC45SDEwLjd6IE0xMC43LDYuNnYyLjFoMWMwLjQsMCwwLjct
+        MC4xLDEtMC4zYzAuMi0wLjIsMC40LTAuNSwwLjQtMC44YzAtMC4zLTAuMS0wLjYtMC4zLTAuOCAgYy0w
+        LjItMC4yLTAuNi0wLjMtMS0wLjNIMTAuN3ogTTIyLDkuN2MtMC42LDAuMy0xLjMsMC40LTIuMywwLjRj
+        LTEuMiwwLTIuMi0wLjQtMi45LTEuMWMtMC43LTAuNy0xLjEtMS43LTEuMS0yLjkgIGMwLTEuMywwLjQt
+        Mi4zLDEuMi0zLjFjMC44LTAuOCwxLjgtMS4yLDMuMS0xLjJjMC44LDAsMS40LDAuMSwyLDAuM3YxLjdj
+        LTAuNS0wLjMtMS4xLTAuNS0xLjgtMC41Yy0wLjgsMC0xLjQsMC4yLTEuOCwwLjcgIGMtMC41LDAuNS0w
+        LjcsMS4xLTAuNywxLjljMCwwLjgsMC4yLDEuNCwwLjcsMS44czEsMC43LDEuOCwwLjdjMC43LDAsMS4z
+        LTAuMiwxLjktMC41VjkuN3oiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
 </value>
   </data>
   <metadata name="documentManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

XdCxRhDW.App/Program.cs

@@ -77,9 +77,7 @@ namespace XdCxRhDW
             DxHelper.WaitHelper.ShowSplashScreen(screenTitle, screenCompany);
             DxHelper.WaitHelper.UpdateSplashMessage("正在加载程序资源文件...");
             MainForm mainForm = new MainForm() { Text = screenTitle };
-            Thread.Sleep(500);
             DxHelper.WaitHelper.UpdateSplashMessage("正在初始化...");
-            Thread.Sleep(1000);
             System.Windows.Forms.Application.Run(mainForm);
         }
     }

XdCxRhDW.App/Properties/licenses.licx

@@ -1,3 +1,6 @@
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -46,14 +46,17 @@ namespace XdCxRhDW.App.UserControl
     public partial class CtrlHome : DevExpress.XtraEditors.XtraUserControl
     {
         List<TaskInfo> list = new List<TaskInfo>();
-
-
-        public CtrlHome()
+       public CtrlHome()
         {
             InitializeComponent();
             gridHomeTask.Init();
             gridHomePosRes.Init().UseMultiSelect().UseRowNumber();
-            mapControl1.UseDefalutOptions()
+            var mapService = string.Empty;//http://ows.mundialis.de/services/service
+            using (RHDWContext db = new RHDWContext())
+            {
+                mapService = db.SysSetings.FirstOrDefault().MapService;
+            }
+                mapControl1.UseDefalutOptions()
                 //.UseCluster()//定位点使用内置聚合
                 .UseClearAll()
                 .UseDistanceLine()
@@ -61,6 +64,8 @@ namespace XdCxRhDW.App.UserControl
                 .UseExportImg()
                 .UseExportXlsx()
                 .UseExportCsv()
+                .SetMapLayerType(mapService)
+                //.SetMapLayerType("")
                 .UseDrawRect(rect =>
                 {
                     (double startLon, double startLat, double centerLon, double centerLat, double endLon, double endLat, double lonRange, double latRange) = rect;