修改检测参估工具

XdCxRhDW.App/CorTools/DetectToolForm.cs

@@ -1,5 +1,6 @@
 using DevExpress.Data.Extensions;
 using DevExpress.Internal.WinApi.Windows.UI.Notifications;
+using DevExpress.Mvvm.Native;
 using DevExpress.XtraEditors;
 using DevExpress.XtraLayout.Utils;
 using System;
@@ -250,12 +251,18 @@ namespace XdCxRhDW.App.CorTools
             {
                 return;
             }
-
+            if (lciStartPos.Visibility == LayoutVisibility.Never && gridSource.Count == 0)
+            {
+                DxHelper.MsgBoxHelper.ShowError($"请输入计算参数起始样点及计算样点(勿勾选DAMA|IBS|Ky5758)!");
+                return;
+            }
+            List<XcorrStruct> xcorrs = new List<XcorrStruct>();
             XcorrStruct xItem = new XcorrStruct();
             xItem.file1 = btnFile1.Text;
             xItem.file2 = btnFile2.Text;
             try
             {
+
                 xItem.smpCount = int.Parse(teCount.Text);
                 xItem.samplingRate = Convert.ToInt32(double.Parse(tefs.Text) * 1e6);
                 xItem.dtCenter = int.Parse(teCenter.Text);
@@ -263,35 +270,57 @@ namespace XdCxRhDW.App.CorTools
                 xItem.dfRange = int.Parse(teDfRange.Text);
                 xItem.smpStart = int.Parse(tePos.Text);
                 xItem.snrThreshold = int.Parse(teSnr.Text);
+
             }
             catch
             {
                 DxHelper.MsgBoxHelper.ShowError($"参数错误");
                 return;
             }
+            if (lciStartPos.Visibility == LayoutVisibility.Never)
+            {
+                foreach (var item in gridSource)
+                {
+                   var corritem= xItem.Copy();
+                    corritem.smpCount =(int)item.smplen;
+                    corritem.smpStart = (int)item.smpstart;
+                    xcorrs.Add(corritem);
+                }
+
+            }
+            else
+            {
+                xcorrs.Add(xItem);
+            }
+
             WriteIni();
             btnCalc.Text = "停止";
             beRunning = true;
-            var result = await ExecuteCorAsync(xItem);
-            if (result != null)
+            foreach (var xcitem in xcorrs)
             {
-                var smitemindex = gridSource.FindIndex(m => m.smpstart == xItem.smpStart && m.smplen == xItem.smpCount);
-                if (smitemindex == -1)
+                var result = await ExecuteCorAsync(xcitem);
+                if (result != null)
                 {
-                    gridSource.Add(result);
-                    gridView1.FocusedRowHandle = gridSource.Count - 1;
-                }
-                else
-                {
-                    var smitem = gridSource[smitemindex];
-                    smitem.dt = result.dt;
-                    smitem.df = result.df;
-                    smitem.snr = result.snr;
-                    smitem.tm = result.tm;
-                    gridView1.RefreshData();
-                    gridView1.FocusedRowHandle = smitemindex;
+                    var smitemindex = gridSource.FindIndex(m => m.smpstart == xcitem.smpStart && m.smplen == xcitem.smpCount);
+                    if (smitemindex == -1)
+                    {
+                        gridSource.Add(result);
+                        gridView1.FocusedRowHandle = gridSource.Count - 1;
+                    }
+                    else
+                    {
+                        var smitem = gridSource[smitemindex];
+                        smitem.dt = result.dt;
+                        smitem.df = result.df;
+                        smitem.snr = result.snr;
+                        smitem.tm = result.tm;
+                        gridView1.RefreshData();
+                        gridView1.FocusedRowHandle = smitemindex;
+                    }
                 }
+
             }
+           
             btnCalc.Text = "计算";
             beRunning = false;
 

XdCxRhDW.App/CorTools/XcorrUtils.cs

@@ -8,6 +8,9 @@ using System.Windows.Forms;
 using XdCxRhDW.App.CpuCgTools;
 using System.Collections;
 using System.Collections.Generic;
+using DevExpress.Drawing.Internal.Fonts.Interop;
+using System.Windows.Documents;
+using XdCxRhDW.App.WebAPI.DTO;
 
 namespace XdCxRhDW.App.CorTools
 {
@@ -24,6 +27,21 @@ namespace XdCxRhDW.App.CorTools
         public double dfRange { get; set; }         //频差范围
         public double snrThreshold { get; set; }	//信噪比门限
 
+        public XcorrStruct Copy()
+        {
+            XcorrStruct xItem = new XcorrStruct();
+            xItem.file1 = file1;
+            xItem.file2 = file2;
+            xItem.smpCount = smpCount;
+            xItem.samplingRate = samplingRate;
+            xItem.dtCenter = dtCenter;
+            xItem.dtRange = dtRange;
+            xItem.dfRange = dfRange;
+            xItem.smpStart = smpStart;
+            xItem.snrThreshold = snrThreshold;
+            return xItem;
+        }
+
     }
     class XcorrUtils
     {

XdCxRhDW.App/MainForm.Designer.cs

@@ -31,8 +31,8 @@
             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 superToolTip4 = new DevExpress.Utils.SuperToolTip();
-            DevExpress.Utils.ToolTipItem toolTipItem4 = 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();
@@ -47,6 +47,7 @@
             this.btnCocTool = new DevExpress.XtraBars.BarButtonItem();
             this.btnErrFx = new DevExpress.XtraBars.BarButtonItem();
             this.btnDetectTool = new DevExpress.XtraBars.BarButtonItem();
+            this.btnXlCalculate = new DevExpress.XtraBars.BarButtonItem();
             this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
             this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -55,7 +56,6 @@
             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();
@@ -98,7 +98,7 @@
             this.ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Show;
             this.ribbon.ShowQatLocationSelector = false;
             this.ribbon.ShowToolbarCustomizeItem = false;
-            this.ribbon.Size = new System.Drawing.Size(1347, 126);
+            this.ribbon.Size = new System.Drawing.Size(1347, 133);
             this.ribbon.Toolbar.ShowCustomizeItem = false;
             // 
             // skinPaletteDropDownButtonItem1
@@ -112,9 +112,9 @@
             this.btnOpenApi.Id = 21;
             this.btnOpenApi.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnOpenApi.ImageOptions.SvgImage")));
             this.btnOpenApi.Name = "btnOpenApi";
-            toolTipItem4.Text = "查看接口文档";
-            superToolTip4.Items.Add(toolTipItem4);
-            this.btnOpenApi.SuperTip = superToolTip4;
+            toolTipItem2.Text = "查看接口文档";
+            superToolTip2.Items.Add(toolTipItem2);
+            this.btnOpenApi.SuperTip = superToolTip2;
             this.btnOpenApi.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnOpenApi_ItemClick);
             // 
             // btnTask
@@ -189,6 +189,7 @@
             this.btnCocTool.Id = 17;
             this.btnCocTool.ImageOptions.ImageUri.Uri = "snap/calcdefault";
             this.btnCocTool.Name = "btnCocTool";
+            this.btnCocTool.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             this.btnCocTool.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_ItemClick);
             // 
             // btnErrFx
@@ -200,12 +201,20 @@
             // 
             // btnDetectTool
             // 
-            this.btnDetectTool.Caption = "检测工具";
+            this.btnDetectTool.Caption = "检测参估工具";
             this.btnDetectTool.Id = 22;
             this.btnDetectTool.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnDetectTool.ImageOptions.SvgImage")));
             this.btnDetectTool.Name = "btnDetectTool";
             this.btnDetectTool.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_ItemClick);
             // 
+            // btnXlCalculate
+            // 
+            this.btnXlCalculate.Caption = "星历推算";
+            this.btnXlCalculate.Id = 24;
+            this.btnXlCalculate.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnXlCalculate.ImageOptions.SvgImage")));
+            this.btnXlCalculate.Name = "btnXlCalculate";
+            this.btnXlCalculate.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_ItemClick);
+            // 
             // ribbonPage1
             // 
             this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
@@ -277,14 +286,6 @@
             "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl",
             "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"});
             // 
-            // btnXlCalculate
-            // 
-            this.btnXlCalculate.Caption = "星历推算";
-            this.btnXlCalculate.Id = 24;
-            this.btnXlCalculate.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnXlCalculate.ImageOptions.SvgImage")));
-            this.btnXlCalculate.Name = "btnXlCalculate";
-            this.btnXlCalculate.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_ItemClick);
-            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);

XdCxRhDW.App/MainForm.cs

@@ -42,8 +42,8 @@ namespace XdCxRhDW
             ctrlTypes.Add("天线管理", typeof(CtrlTx));
             ctrlTypes.Add("目标管理", typeof(CtrlTarget));
             ctrlTypes.Add("系统设置", typeof(CtrlSysSettings));
-            ctrlTypes.Add("参估工具", typeof(CorToolForm));
-            ctrlTypes.Add("检测工具", typeof(DetectToolForm));
+            //ctrlTypes.Add("参估工具", typeof(CorToolForm));
+            ctrlTypes.Add("检测参估工具", typeof(DetectToolForm));
             ctrlTypes.Add("星历推算", typeof(CtrlXlCalculate));
             btn_ItemClick(null, null);
             XlScan();

XdCxRhDW.App/Properties/licenses.licx

@@ -1,9 +1,10 @@
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.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.ButtonEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.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
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.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.XtraBars.BarManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a