检测参估工具

XdCxRhDW.App/CorTools/DetectToolForm.cs

@@ -1,4 +1,5 @@
-using DevExpress.Internal.WinApi.Windows.UI.Notifications;
+using DevExpress.Data.Extensions;
+using DevExpress.Internal.WinApi.Windows.UI.Notifications;
 using DevExpress.XtraEditors;
 using DevExpress.XtraLayout.Utils;
 using System;
@@ -200,14 +201,128 @@ namespace XdCxRhDW.App.CorTools
                     smplen = dmcItem.Length
                 });
             }
+            WriteIni();
         }
 
         private void chkDama_CheckedChanged(object sender, EventArgs e)
         {
-            //lciBtnCheck.Visibility = chkDama.Checked ? LayoutVisibility.Always : LayoutVisibility.Never;
-            lciStartPos.Visibility = lciSampleLength.Visibility = chkDama.Checked ? LayoutVisibility.Never : LayoutVisibility.Always;
-            //layoutControl1.BestFit();
+            lciStartPos.Visibility = lciSampleLength.Visibility = ckKY.Checked | ckIBS.Checked | chkDama.Checked ? LayoutVisibility.Never : LayoutVisibility.Always;
+            if (chkDama.Checked)
+            {
+                ckIBS.Checked = false;
+                ckKY.Checked = false;
+            }
+        }
+        private void ckIBS_CheckedChanged(object sender, EventArgs e)
+        {
+            lciStartPos.Visibility = lciSampleLength.Visibility = ckKY.Checked | ckIBS.Checked | chkDama.Checked ? LayoutVisibility.Never : LayoutVisibility.Always;
+            if (ckIBS.Checked)
+            {
+                chkDama.Checked = false;
+                ckKY.Checked = false;
+            }
+        }
 
+        private void ckKY_CheckedChanged(object sender, EventArgs e)
+        {
+            lciStartPos.Visibility = lciSampleLength.Visibility = ckKY.Checked | ckIBS.Checked | chkDama.Checked ? LayoutVisibility.Never : LayoutVisibility.Always;
+            if (ckKY.Checked)
+            {
+                ckIBS.Checked = false;
+                chkDama.Checked = false;
+            }
         }
+
+        private async void btnCalc_Click(object sender, EventArgs e)
+        {
+            if (btnCalc.Text == "停止")
+            {
+                XcorrUtils.Stop();
+                return;
+            }
+            //开始计算
+            //校验文件名称
+            if (!ValidateFile(btnFile1.Text))
+            {
+                return;
+            }
+            if (!ValidateFile(btnFile2.Text))
+            {
+                return;
+            }
+
+            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);
+                xItem.dtRange = int.Parse(teRange.Text);
+                xItem.dfRange = int.Parse(teDfRange.Text);
+                xItem.smpStart = int.Parse(tePos.Text);
+                xItem.snrThreshold = int.Parse(teSnr.Text);
+            }
+            catch
+            {
+                DxHelper.MsgBoxHelper.ShowError($"参数错误");
+                return;
+            }
+            WriteIni();
+            btnCalc.Text = "停止";
+            beRunning = true;
+            var result = await ExecuteCorAsync(xItem);
+            if (result != null)
+            {
+                var smitemindex = gridSource.FindIndex(m => m.smpstart == xItem.smpStart && m.smplen == xItem.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;
+
+        }
+        private async Task<CafResult> ExecuteCorAsync(XcorrStruct xItem)
+        {
+
+            var result = await XcorrUtils.Calc(xItem);
+            //开始计算
+            if (result.flag == -2)
+            {
+                DxHelper.MsgBoxHelper.ShowError($"内部错误");
+                btnCalc.Text = "计算";
+                beRunning = false;
+                return null;
+            }
+            else if (result.flag == -1)
+            {
+                DxHelper.MsgBoxHelper.ShowError($"计算所需数据超出文件范围");
+                btnCalc.Text = "计算";
+                beRunning = false;
+                return null;
+            }
+            else if (result.flag == -3)
+            {
+                btnCalc.Text = "计算";
+                beRunning = false;
+                return null;
+            }
+            return result;
+        }
+
     }
 }

XdCxRhDW.App/CorTools/DetectToolForm.designer.cs

@@ -58,6 +58,8 @@
             this.tefs = new DevExpress.XtraEditors.TextEdit();
             this.btnFile1 = new DevExpress.XtraEditors.ButtonEdit();
             this.btnFile2 = new DevExpress.XtraEditors.ButtonEdit();
+            this.ckIBS = new DevExpress.XtraEditors.CheckEdit();
+            this.ckKY = new DevExpress.XtraEditors.CheckEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -71,12 +73,12 @@
             this.lciSampleLength = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.lciBtnCheck = new DevExpress.XtraLayout.LayoutControlItem();
-            this.popupMenu1 = new DevExpress.XtraBars.PopupMenu(this.components);
-            this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
-            this.checkEdit1 = new DevExpress.XtraEditors.CheckEdit();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.checkEdit2 = new DevExpress.XtraEditors.CheckEdit();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.popupMenu1 = new DevExpress.XtraBars.PopupMenu(this.components);
+            this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+            this.btnCalc = new DevExpress.XtraEditors.SimpleButton();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.chkDama.Properties)).BeginInit();
@@ -92,6 +94,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.tefs.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.btnFile1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.btnFile2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ckIBS.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ckKY.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
@@ -105,15 +109,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.lciSampleLength)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.lciBtnCheck)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.checkEdit2.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
             // 
+            this.layoutControl1.Controls.Add(this.btnCalc);
             this.layoutControl1.Controls.Add(this.chkDama);
             this.layoutControl1.Controls.Add(this.btnCheck);
             this.layoutControl1.Controls.Add(this.teSnr);
@@ -126,27 +130,29 @@
             this.layoutControl1.Controls.Add(this.tefs);
             this.layoutControl1.Controls.Add(this.btnFile1);
             this.layoutControl1.Controls.Add(this.btnFile2);
-            this.layoutControl1.Controls.Add(this.checkEdit1);
-            this.layoutControl1.Controls.Add(this.checkEdit2);
+            this.layoutControl1.Controls.Add(this.ckIBS);
+            this.layoutControl1.Controls.Add(this.ckKY);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1589, 829, 1300, 800);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(1257, 627);
+            this.layoutControl1.Size = new System.Drawing.Size(1100, 488);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // chkDama
             // 
-            this.chkDama.Location = new System.Drawing.Point(1023, 8);
+            this.chkDama.Location = new System.Drawing.Point(867, 6);
+            this.chkDama.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.chkDama.MenuManager = this.barManager1;
             this.chkDama.Name = "chkDama";
             this.chkDama.Properties.Caption = "DAMA";
-            this.chkDama.Size = new System.Drawing.Size(81, 24);
+            this.chkDama.Size = new System.Drawing.Size(70, 20);
             this.chkDama.StyleController = this.layoutControl1;
             this.chkDama.TabIndex = 16;
+            this.chkDama.TabStop = false;
             this.chkDama.CheckedChanged += new System.EventHandler(this.chkDama_CheckedChanged);
             // 
             // barManager1
@@ -168,16 +174,16 @@
             this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
             this.barDockControlTop.Manager = this.barManager1;
             this.barDockControlTop.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
-            this.barDockControlTop.Size = new System.Drawing.Size(1257, 0);
+            this.barDockControlTop.Size = new System.Drawing.Size(1100, 0);
             // 
             // barDockControlBottom
             // 
             this.barDockControlBottom.CausesValidation = false;
             this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.barDockControlBottom.Location = new System.Drawing.Point(0, 627);
+            this.barDockControlBottom.Location = new System.Drawing.Point(0, 488);
             this.barDockControlBottom.Manager = this.barManager1;
             this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
-            this.barDockControlBottom.Size = new System.Drawing.Size(1257, 0);
+            this.barDockControlBottom.Size = new System.Drawing.Size(1100, 0);
             // 
             // barDockControlLeft
             // 
@@ -186,16 +192,16 @@
             this.barDockControlLeft.Location = new System.Drawing.Point(0, 0);
             this.barDockControlLeft.Manager = this.barManager1;
             this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
-            this.barDockControlLeft.Size = new System.Drawing.Size(0, 627);
+            this.barDockControlLeft.Size = new System.Drawing.Size(0, 488);
             // 
             // barDockControlRight
             // 
             this.barDockControlRight.CausesValidation = false;
             this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
-            this.barDockControlRight.Location = new System.Drawing.Point(1257, 0);
+            this.barDockControlRight.Location = new System.Drawing.Point(1100, 0);
             this.barDockControlRight.Manager = this.barManager1;
             this.barDockControlRight.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
-            this.barDockControlRight.Size = new System.Drawing.Size(0, 627);
+            this.barDockControlRight.Size = new System.Drawing.Size(0, 488);
             // 
             // barButtonItem1
             // 
@@ -213,10 +219,9 @@
             // 
             // btnCheck
             // 
-            this.btnCheck.Location = new System.Drawing.Point(1023, 40);
-            this.btnCheck.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btnCheck.Location = new System.Drawing.Point(867, 31);
             this.btnCheck.Name = "btnCheck";
-            this.btnCheck.Size = new System.Drawing.Size(229, 27);
+            this.btnCheck.Size = new System.Drawing.Size(113, 22);
             this.btnCheck.StyleController = this.layoutControl1;
             this.btnCheck.TabIndex = 15;
             this.btnCheck.Text = "检测";
@@ -225,21 +230,21 @@
             // teSnr
             // 
             this.teSnr.EditValue = "14";
-            this.teSnr.Location = new System.Drawing.Point(766, 75);
+            this.teSnr.Location = new System.Drawing.Point(646, 57);
             this.teSnr.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teSnr.Name = "teSnr";
-            this.teSnr.Size = new System.Drawing.Size(62, 28);
+            this.teSnr.Size = new System.Drawing.Size(56, 22);
             this.teSnr.StyleController = this.layoutControl1;
             this.teSnr.TabIndex = 14;
             // 
             // gridControl1
             // 
             this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0);
-            this.gridControl1.Location = new System.Drawing.Point(5, 109);
+            this.gridControl1.Location = new System.Drawing.Point(5, 83);
             this.gridControl1.MainView = this.gridView1;
             this.gridControl1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.gridControl1.Name = "gridControl1";
-            this.gridControl1.Size = new System.Drawing.Size(1247, 511);
+            this.gridControl1.Size = new System.Drawing.Size(1090, 400);
             this.gridControl1.TabIndex = 12;
             this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -258,13 +263,13 @@
             this.tm,
             this.file1,
             this.file2});
-            this.gridView1.DetailHeight = 217;
+            this.gridView1.DetailHeight = 169;
             this.gridView1.FooterPanelHeight = 0;
             this.gridView1.GridControl = this.gridControl1;
             this.gridView1.GroupRowHeight = 0;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsBehavior.Editable = false;
-            this.gridView1.OptionsEditForm.PopupEditFormWidth = 493;
+            this.gridView1.OptionsEditForm.PopupEditFormWidth = 431;
             this.gridView1.OptionsMenu.EnableColumnMenu = false;
             this.gridView1.OptionsView.ShowDetailButtons = false;
             this.gridView1.OptionsView.ShowGroupExpandCollapseButtons = false;
@@ -280,151 +285,151 @@
             // 
             this.dt.Caption = "时差(us)";
             this.dt.FieldName = "dt";
-            this.dt.MinWidth = 25;
+            this.dt.MinWidth = 22;
             this.dt.Name = "dt";
             this.dt.Visible = true;
             this.dt.VisibleIndex = 4;
-            this.dt.Width = 125;
+            this.dt.Width = 109;
             // 
             // df
             // 
             this.df.Caption = "频差(Hz)";
             this.df.FieldName = "df";
-            this.df.MinWidth = 25;
+            this.df.MinWidth = 22;
             this.df.Name = "df";
             this.df.Visible = true;
             this.df.VisibleIndex = 5;
-            this.df.Width = 125;
+            this.df.Width = 109;
             // 
             // snr
             // 
             this.snr.Caption = "信噪比";
             this.snr.FieldName = "snr";
-            this.snr.MinWidth = 25;
+            this.snr.MinWidth = 22;
             this.snr.Name = "snr";
             this.snr.Visible = true;
             this.snr.VisibleIndex = 6;
-            this.snr.Width = 95;
+            this.snr.Width = 83;
             // 
             // smpstart
             // 
             this.smpstart.Caption = "起始样点";
             this.smpstart.FieldName = "smpstart";
-            this.smpstart.MinWidth = 25;
+            this.smpstart.MinWidth = 22;
             this.smpstart.Name = "smpstart";
             this.smpstart.Visible = true;
             this.smpstart.VisibleIndex = 2;
-            this.smpstart.Width = 103;
+            this.smpstart.Width = 90;
             // 
             // smplen
             // 
             this.smplen.Caption = "样点长度";
             this.smplen.FieldName = "smplen";
-            this.smplen.MinWidth = 25;
+            this.smplen.MinWidth = 22;
             this.smplen.Name = "smplen";
             this.smplen.Visible = true;
             this.smplen.VisibleIndex = 3;
-            this.smplen.Width = 103;
+            this.smplen.Width = 90;
             // 
             // tm
             // 
             this.tm.Caption = "耗时(s)";
             this.tm.FieldName = "tm";
-            this.tm.MinWidth = 25;
+            this.tm.MinWidth = 22;
             this.tm.Name = "tm";
             this.tm.Visible = true;
             this.tm.VisibleIndex = 7;
-            this.tm.Width = 79;
+            this.tm.Width = 69;
             // 
             // file1
             // 
             this.file1.Caption = "文件1";
             this.file1.FieldName = "file1";
-            this.file1.MinWidth = 25;
+            this.file1.MinWidth = 22;
             this.file1.Name = "file1";
             this.file1.Visible = true;
             this.file1.VisibleIndex = 1;
-            this.file1.Width = 189;
+            this.file1.Width = 165;
             // 
             // file2
             // 
             this.file2.Caption = "文件2";
             this.file2.FieldName = "file2";
-            this.file2.MinWidth = 25;
+            this.file2.MinWidth = 22;
             this.file2.Name = "file2";
             this.file2.Visible = true;
             this.file2.VisibleIndex = 0;
-            this.file2.Width = 145;
+            this.file2.Width = 127;
             // 
             // teDfRange
             // 
             this.teDfRange.EditValue = "16384";
-            this.teDfRange.Location = new System.Drawing.Point(605, 75);
+            this.teDfRange.Location = new System.Drawing.Point(509, 57);
             this.teDfRange.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teDfRange.Name = "teDfRange";
-            this.teDfRange.Size = new System.Drawing.Size(62, 28);
+            this.teDfRange.Size = new System.Drawing.Size(56, 22);
             this.teDfRange.StyleController = this.layoutControl1;
             this.teDfRange.TabIndex = 11;
             // 
             // tePos
             // 
             this.tePos.EditValue = "0";
-            this.tePos.Location = new System.Drawing.Point(911, 75);
+            this.tePos.Location = new System.Drawing.Point(770, 57);
             this.tePos.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tePos.Name = "tePos";
-            this.tePos.Size = new System.Drawing.Size(62, 28);
+            this.tePos.Size = new System.Drawing.Size(55, 22);
             this.tePos.StyleController = this.layoutControl1;
             this.tePos.TabIndex = 10;
             // 
             // teCount
             // 
             this.teCount.EditValue = "0";
-            this.teCount.Location = new System.Drawing.Point(1057, 75);
+            this.teCount.Location = new System.Drawing.Point(894, 57);
             this.teCount.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teCount.Name = "teCount";
-            this.teCount.Size = new System.Drawing.Size(195, 28);
+            this.teCount.Size = new System.Drawing.Size(201, 22);
             this.teCount.StyleController = this.layoutControl1;
             this.teCount.TabIndex = 9;
             // 
             // teRange
             // 
             this.teRange.EditValue = "40000";
-            this.teRange.Location = new System.Drawing.Point(440, 75);
+            this.teRange.Location = new System.Drawing.Point(370, 57);
             this.teRange.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teRange.Name = "teRange";
-            this.teRange.Size = new System.Drawing.Size(62, 28);
+            this.teRange.Size = new System.Drawing.Size(55, 22);
             this.teRange.StyleController = this.layoutControl1;
             this.teRange.TabIndex = 8;
             // 
             // teCenter
             // 
             this.teCenter.EditValue = "0";
-            this.teCenter.Location = new System.Drawing.Point(267, 75);
+            this.teCenter.Location = new System.Drawing.Point(224, 57);
             this.teCenter.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teCenter.Name = "teCenter";
-            this.teCenter.Size = new System.Drawing.Size(62, 28);
+            this.teCenter.Size = new System.Drawing.Size(55, 22);
             this.teCenter.StyleController = this.layoutControl1;
             this.teCenter.TabIndex = 7;
             // 
             // tefs
             // 
             this.tefs.EditValue = "0.096";
-            this.tefs.Location = new System.Drawing.Point(94, 75);
+            this.tefs.Location = new System.Drawing.Point(77, 57);
             this.tefs.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tefs.Name = "tefs";
-            this.tefs.Size = new System.Drawing.Size(62, 28);
+            this.tefs.Size = new System.Drawing.Size(56, 22);
             this.tefs.StyleController = this.layoutControl1;
             this.tefs.TabIndex = 6;
             // 
             // btnFile1
             // 
             this.btnFile1.AllowDrop = true;
-            this.btnFile1.Location = new System.Drawing.Point(93, 7);
+            this.btnFile1.Location = new System.Drawing.Point(77, 5);
             this.btnFile1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.btnFile1.Name = "btnFile1";
             this.btnFile1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.btnFile1.Size = new System.Drawing.Size(926, 28);
+            this.btnFile1.Size = new System.Drawing.Size(786, 22);
             this.btnFile1.StyleController = this.layoutControl1;
             this.btnFile1.TabIndex = 5;
             this.btnFile1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.btnFile_ButtonClick);
@@ -435,12 +440,12 @@
             // btnFile2
             // 
             this.btnFile2.AllowDrop = true;
-            this.btnFile2.Location = new System.Drawing.Point(93, 41);
+            this.btnFile2.Location = new System.Drawing.Point(77, 31);
             this.btnFile2.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.btnFile2.Name = "btnFile2";
             this.btnFile2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.btnFile2.Size = new System.Drawing.Size(926, 28);
+            this.btnFile2.Size = new System.Drawing.Size(786, 22);
             this.btnFile2.StyleController = this.layoutControl1;
             this.btnFile2.TabIndex = 4;
             this.btnFile2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.btnFile_ButtonClick);
@@ -448,6 +453,32 @@
             this.btnFile2.DragOver += new System.Windows.Forms.DragEventHandler(this.btnFile_DragOver);
             this.btnFile2.DoubleClick += new System.EventHandler(this.btnFile_DoubleClick);
             // 
+            // ckIBS
+            // 
+            this.ckIBS.Location = new System.Drawing.Point(941, 6);
+            this.ckIBS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ckIBS.MenuManager = this.barManager1;
+            this.ckIBS.Name = "ckIBS";
+            this.ckIBS.Properties.Caption = "IBS";
+            this.ckIBS.Size = new System.Drawing.Size(52, 20);
+            this.ckIBS.StyleController = this.layoutControl1;
+            this.ckIBS.TabIndex = 17;
+            this.ckIBS.TabStop = false;
+            this.ckIBS.CheckedChanged += new System.EventHandler(this.ckIBS_CheckedChanged);
+            // 
+            // ckKY
+            // 
+            this.ckKY.Location = new System.Drawing.Point(997, 6);
+            this.ckKY.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ckKY.MenuManager = this.barManager1;
+            this.ckKY.Name = "ckKY";
+            this.ckKY.Properties.Caption = "Ky5758";
+            this.ckKY.Size = new System.Drawing.Size(98, 20);
+            this.ckKY.StyleController = this.layoutControl1;
+            this.ckKY.TabIndex = 18;
+            this.ckKY.TabStop = false;
+            this.ckKY.CheckedChanged += new System.EventHandler(this.ckKY_CheckedChanged);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -466,10 +497,11 @@
             this.layoutControlItem12,
             this.lciBtnCheck,
             this.layoutControlItem6,
-            this.layoutControlItem7});
+            this.layoutControlItem7,
+            this.layoutControlItem11});
             this.Root.Name = "Root";
-            this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 4, 4);
-            this.Root.Size = new System.Drawing.Size(1257, 627);
+            this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 3, 3, 3);
+            this.Root.Size = new System.Drawing.Size(1100, 488);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem2
@@ -477,107 +509,107 @@
             this.layoutControlItem2.Control = this.btnFile1;
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(1018, 34);
+            this.layoutControlItem2.Size = new System.Drawing.Size(862, 26);
             this.layoutControlItem2.Text = "信号文件1：";
             this.layoutControlItem2.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(83, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(67, 14);
             this.layoutControlItem2.TextToControlDistance = 5;
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.tefs;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 68);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 52);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(155, 34);
+            this.layoutControlItem3.Size = new System.Drawing.Size(132, 26);
             this.layoutControlItem3.Text = "采样率(M)：";
             this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(84, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(67, 14);
             this.layoutControlItem3.TextToControlDistance = 5;
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.gridControl1;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 102);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 78);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(1251, 517);
+            this.layoutControlItem9.Size = new System.Drawing.Size(1094, 404);
             this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem9.TextVisible = false;
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.btnFile2;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 34);
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 26);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(1018, 34);
+            this.layoutControlItem1.Size = new System.Drawing.Size(862, 26);
             this.layoutControlItem1.Text = "信号文件2：";
             this.layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(83, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(67, 14);
             this.layoutControlItem1.TextToControlDistance = 5;
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.teCenter;
-            this.layoutControlItem4.Location = new System.Drawing.Point(155, 68);
+            this.layoutControlItem4.Location = new System.Drawing.Point(132, 52);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(173, 34);
+            this.layoutControlItem4.Size = new System.Drawing.Size(146, 26);
             this.layoutControlItem4.Text = "时差中心(us)：";
             this.layoutControlItem4.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(102, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(82, 14);
             this.layoutControlItem4.TextToControlDistance = 5;
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.teRange;
-            this.layoutControlItem5.Location = new System.Drawing.Point(328, 68);
+            this.layoutControlItem5.Location = new System.Drawing.Point(278, 52);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(173, 34);
+            this.layoutControlItem5.Size = new System.Drawing.Size(146, 26);
             this.layoutControlItem5.Text = "时差范围(us)：";
             this.layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(102, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(82, 14);
             this.layoutControlItem5.TextToControlDistance = 5;
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.teSnr;
-            this.layoutControlItem10.Location = new System.Drawing.Point(666, 68);
+            this.layoutControlItem10.Location = new System.Drawing.Point(564, 52);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(161, 34);
+            this.layoutControlItem10.Size = new System.Drawing.Size(137, 26);
             this.layoutControlItem10.Text = "信噪比门限：";
             this.layoutControlItem10.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
             this.layoutControlItem10.TextToControlDistance = 5;
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.teDfRange;
-            this.layoutControlItem8.Location = new System.Drawing.Point(501, 68);
+            this.layoutControlItem8.Location = new System.Drawing.Point(424, 52);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(165, 34);
+            this.layoutControlItem8.Size = new System.Drawing.Size(140, 26);
             this.layoutControlItem8.Text = "频差范围(Hz):";
             this.layoutControlItem8.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(94, 18);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 14);
             this.layoutControlItem8.TextToControlDistance = 5;
             // 
             // lciStartPos
             // 
             this.lciStartPos.Control = this.tePos;
-            this.lciStartPos.Location = new System.Drawing.Point(827, 68);
+            this.lciStartPos.Location = new System.Drawing.Point(701, 52);
             this.lciStartPos.Name = "lciStartPos";
-            this.lciStartPos.Size = new System.Drawing.Size(145, 34);
+            this.lciStartPos.Size = new System.Drawing.Size(123, 26);
             this.lciStartPos.Text = "起始样点：";
             this.lciStartPos.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.lciStartPos.TextSize = new System.Drawing.Size(75, 18);
+            this.lciStartPos.TextSize = new System.Drawing.Size(60, 14);
             this.lciStartPos.TextToControlDistance = 4;
             // 
             // lciSampleLength
             // 
             this.lciSampleLength.Control = this.teCount;
-            this.lciSampleLength.Location = new System.Drawing.Point(972, 68);
+            this.lciSampleLength.Location = new System.Drawing.Point(824, 52);
             this.lciSampleLength.Name = "lciSampleLength";
-            this.lciSampleLength.Size = new System.Drawing.Size(279, 34);
+            this.lciSampleLength.Size = new System.Drawing.Size(270, 26);
             this.lciSampleLength.Text = "计算样点：";
             this.lciSampleLength.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.lciSampleLength.TextSize = new System.Drawing.Size(75, 18);
+            this.lciSampleLength.TextSize = new System.Drawing.Size(60, 14);
             this.lciSampleLength.TextToControlDistance = 5;
             // 
             // layoutControlItem12
@@ -585,11 +617,11 @@
             this.layoutControlItem12.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem12.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             this.layoutControlItem12.Control = this.chkDama;
-            this.layoutControlItem12.Location = new System.Drawing.Point(1018, 0);
-            this.layoutControlItem12.MaxSize = new System.Drawing.Size(0, 33);
-            this.layoutControlItem12.MinSize = new System.Drawing.Size(85, 33);
+            this.layoutControlItem12.Location = new System.Drawing.Point(862, 0);
+            this.layoutControlItem12.MaxSize = new System.Drawing.Size(0, 26);
+            this.layoutControlItem12.MinSize = new System.Drawing.Size(74, 26);
             this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(85, 33);
+            this.layoutControlItem12.Size = new System.Drawing.Size(74, 26);
             this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -597,83 +629,85 @@
             // lciBtnCheck
             // 
             this.lciBtnCheck.Control = this.btnCheck;
-            this.lciBtnCheck.Location = new System.Drawing.Point(1018, 33);
-            this.lciBtnCheck.MaxSize = new System.Drawing.Size(233, 33);
-            this.lciBtnCheck.MinSize = new System.Drawing.Size(233, 33);
+            this.lciBtnCheck.Location = new System.Drawing.Point(862, 26);
+            this.lciBtnCheck.MaxSize = new System.Drawing.Size(0, 26);
+            this.lciBtnCheck.MinSize = new System.Drawing.Size(117, 26);
             this.lciBtnCheck.Name = "lciBtnCheck";
-            this.lciBtnCheck.Size = new System.Drawing.Size(233, 35);
+            this.lciBtnCheck.Size = new System.Drawing.Size(117, 26);
             this.lciBtnCheck.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.lciBtnCheck.TextSize = new System.Drawing.Size(0, 0);
             this.lciBtnCheck.TextVisible = false;
             // 
-            // popupMenu1
-            // 
-            this.popupMenu1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] {
-            new DevExpress.XtraBars.LinkPersistInfo(this.barButtonItem1),
-            new DevExpress.XtraBars.LinkPersistInfo(this.barButtonItem2)});
-            this.popupMenu1.Manager = this.barManager1;
-            this.popupMenu1.Name = "popupMenu1";
-            // 
-            // openFileDialog1
-            // 
-            this.openFileDialog1.FileName = "openFileDialog1";
-            // 
-            // checkEdit1
-            // 
-            this.checkEdit1.Location = new System.Drawing.Point(1108, 8);
-            this.checkEdit1.MenuManager = this.barManager1;
-            this.checkEdit1.Name = "checkEdit1";
-            this.checkEdit1.Properties.Caption = "IBS";
-            this.checkEdit1.Size = new System.Drawing.Size(60, 24);
-            this.checkEdit1.StyleController = this.layoutControl1;
-            this.checkEdit1.TabIndex = 17;
-            // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem6.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
-            this.layoutControlItem6.Control = this.checkEdit1;
-            this.layoutControlItem6.Location = new System.Drawing.Point(1103, 0);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 33);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(64, 33);
+            this.layoutControlItem6.Control = this.ckIBS;
+            this.layoutControlItem6.Location = new System.Drawing.Point(936, 0);
+            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 26);
+            this.layoutControlItem6.MinSize = new System.Drawing.Size(56, 26);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(64, 33);
+            this.layoutControlItem6.Size = new System.Drawing.Size(56, 26);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem6.TextVisible = false;
             // 
-            // checkEdit2
-            // 
-            this.checkEdit2.Location = new System.Drawing.Point(1172, 8);
-            this.checkEdit2.MenuManager = this.barManager1;
-            this.checkEdit2.Name = "checkEdit2";
-            this.checkEdit2.Properties.Caption = "Ky5758";
-            this.checkEdit2.Size = new System.Drawing.Size(80, 24);
-            this.checkEdit2.StyleController = this.layoutControl1;
-            this.checkEdit2.TabIndex = 18;
-            // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem7.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
-            this.layoutControlItem7.Control = this.checkEdit2;
-            this.layoutControlItem7.Location = new System.Drawing.Point(1167, 0);
+            this.layoutControlItem7.Control = this.ckKY;
+            this.layoutControlItem7.Location = new System.Drawing.Point(992, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(84, 33);
+            this.layoutControlItem7.Size = new System.Drawing.Size(102, 26);
             this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem7.TextVisible = false;
             // 
+            // popupMenu1
+            // 
+            this.popupMenu1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] {
+            new DevExpress.XtraBars.LinkPersistInfo(this.barButtonItem1),
+            new DevExpress.XtraBars.LinkPersistInfo(this.barButtonItem2)});
+            this.popupMenu1.Manager = this.barManager1;
+            this.popupMenu1.Name = "popupMenu1";
+            // 
+            // openFileDialog1
+            // 
+            this.openFileDialog1.FileName = "openFileDialog1";
+            // 
+            // btnCalc
+            // 
+            this.btnCalc.Location = new System.Drawing.Point(984, 31);
+            this.btnCalc.Name = "btnCalc";
+            this.btnCalc.Size = new System.Drawing.Size(111, 22);
+            this.btnCalc.StyleController = this.layoutControl1;
+            this.btnCalc.TabIndex = 19;
+            this.btnCalc.Text = "计算";
+            this.btnCalc.Click += new System.EventHandler(this.btnCalc_Click);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.btnCalc;
+            this.layoutControlItem11.Location = new System.Drawing.Point(979, 26);
+            this.layoutControlItem11.MaxSize = new System.Drawing.Size(0, 26);
+            this.layoutControlItem11.MinSize = new System.Drawing.Size(115, 26);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.Size = new System.Drawing.Size(115, 26);
+            this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem11.TextVisible = false;
+            // 
             // DetectToolForm
             // 
-            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(1257, 627);
+            this.ClientSize = new System.Drawing.Size(1100, 488);
             this.Controls.Add(this.layoutControl1);
             this.Controls.Add(this.barDockControlLeft);
             this.Controls.Add(this.barDockControlRight);
             this.Controls.Add(this.barDockControlBottom);
             this.Controls.Add(this.barDockControlTop);
-            this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
             this.Name = "DetectToolForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
@@ -695,6 +729,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.tefs.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.btnFile1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.btnFile2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ckIBS.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ckKY.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
@@ -708,11 +744,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.lciSampleLength)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.lciBtnCheck)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.checkEdit2.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -765,9 +800,11 @@
         private DevExpress.XtraLayout.LayoutControlItem lciBtnCheck;
         private DevExpress.XtraEditors.CheckEdit chkDama;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraEditors.CheckEdit checkEdit1;
-        private DevExpress.XtraEditors.CheckEdit checkEdit2;
+        private DevExpress.XtraEditors.CheckEdit ckIBS;
+        private DevExpress.XtraEditors.CheckEdit ckKY;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraEditors.SimpleButton btnCalc;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
     }
 }

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