11

DW5S.App/EditForms/FixedStationEditor.cs

@@ -53,7 +53,7 @@ namespace DW5S.App.EditForms
                 this.txtLon.Text = info.Lon.ToString();
                 this.txtLat.Text = info.Lat.ToString();
                 this.txtValue.Text = info.Value.ToString();
-                this.txtFreqUp.EditValue = sigsData.FirstOrDefault(p => p.FreqUp == info.FreqUpHz);
+                this.txtFreqUp.EditValue = sigsData.FirstOrDefault(p => p.FreqUpHz == info.FreqUpHz);
                 this.txtEnable.Checked = info.Enable;
             }
         }
@@ -74,7 +74,7 @@ namespace DW5S.App.EditForms
                     DxHelper.MsgBoxHelper.ShowError($"已经存在名称为[{name}]的固定站!");
                     return;
                 }
-                var freqUpHz = (txtFreqUp.EditValue as SigViewModel).FreqUp;
+                var freqUpHz = (txtFreqUp.EditValue as SigViewModel).FreqUpHz;
                 if (infos.Any(i => i.Id != info.Id && i.FreqUpHz == freqUpHz))
                 {
                     DxHelper.MsgBoxHelper.ShowError($"已经存在上行频点为[{freqUpHz / 1e6:f3}MHz]的固定站!");

DW5S.App/EditForms/SigEditor.cs

@@ -39,8 +39,8 @@ namespace DW5S.App.EditForms
             cbSigType.Properties.AddEnum<EnumSigType>();
             if (this.Text == "编辑信号" && info != null)
             {
-                this.txtFreqUp.EditValue = info.FreqUp / 1e6;
-                this.txtFreqDown.EditValue = info.FreqDown / 1e6;
+                this.txtFreqUp.EditValue = info.FreqUpHz / 1e6;
+                this.txtFreqDown.EditValue = info.FreqDownHz / 1e6;
                 this.txtSnr.EditValue = info.Snr;
                 this.txtBandHz.EditValue = info.Band;
                 var arr = Enum.GetValues(typeof(EnumSigCheckType));
@@ -87,7 +87,7 @@ namespace DW5S.App.EditForms
                     dxErrorProvider.SetError(cbSigType, $"请选择信号类型!");
                     return;
                 }
-                if (!double.TryParse(txtBandHz.Text, out double bandHz))
+                if (!int.TryParse(txtBandHz.Text, out int bandHz))
                 {
                     dxErrorProvider.SetError(txtBandHz, "带宽格式错误");
                     return;
@@ -99,15 +99,15 @@ namespace DW5S.App.EditForms
                 }
                 long frequp = (long)(freqUp * 1000000);
 
-                if (infos.Any(i => i.Id != info.Id && i.FreqUp == frequp))
+                if (infos.Any(i => i.Id != info.Id && i.FreqUpHz == frequp))
                 {
 
                     DxHelper.MsgBoxHelper.ShowError($"上行频点[{freqUp}]已经存在!");
                     return;
                 }
 
-                info.FreqUp = frequp;
-                info.FreqDown = (long)(freqDown * 1000000);
+                info.FreqUpHz = frequp;
+                info.FreqDownHz = (long)(freqDown * 1000000);
                 info.Snr = Convert.ToDouble(txtSnr.EditValue);
                 info.Band = bandHz;
                 var res = txtSigCheckType.Items.Where(p => p.CheckState == CheckState.Checked).Select(t => (EnumSigCheckType)t.Value).ToList();

DW5S.App/EditForms/StationEditor.cs

@@ -188,16 +188,19 @@ namespace DW5S.App.EditForms
                     if (chitem.ChNum == 0)
                     {
                         msg = $"采集通道号不能为空";
+                        checkSucess = false;
                         break;
                     }
                     if (chitem.SatInfoID == 0)
                     {
                         msg = $"采集通道号[{chitem.ChNum}]对应卫星不能为空";
+                        checkSucess = false;
                         break;
                     }
                     if (chitem.TxInfoID == 0)
                     {
                         msg = $"采集通道号[{chitem.ChNum}]对应天线不能为空";
+                        checkSucess = false;
                         break;
                     }
                     checkSucess = true;

DW5S.App/MainForm.Designer.cs

@@ -28,11 +28,10 @@
         /// </summary>
         private void InitializeComponent()
         {
-            components = new System.ComponentModel.Container();
             components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
-            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
-            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
+            DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
             ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
             skinPaletteDropDownButtonItem1 = new DevExpress.XtraBars.SkinPaletteDropDownButtonItem();
             btnOpenApi = new DevExpress.XtraBars.BarButtonItem();
@@ -75,6 +74,7 @@
             documentManager1 = new DevExpress.XtraBars.Docking2010.DocumentManager(components);
             tabbedView1 = new DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(components);
             dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
+            btnADTask = new DevExpress.XtraBars.BarButtonItem();
             ((System.ComponentModel.ISupportInitialize)ribbon).BeginInit();
             ((System.ComponentModel.ISupportInitialize)documentManager1).BeginInit();
             ((System.ComponentModel.ISupportInitialize)tabbedView1).BeginInit();
@@ -87,9 +87,9 @@
             ribbon.CaptionBarItemLinks.Add(btnOpenApi);
             ribbon.DrawGroupCaptions = DevExpress.Utils.DefaultBoolean.False;
             ribbon.ExpandCollapseItem.Id = 0;
-            ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { skinPaletteDropDownButtonItem1, btnOpenApi, ribbon.ExpandCollapseItem, btnTask, btnCg, btnSet, btnRecTx, btnSat, btnCocTool, btnDetectTool, btnXlCalculate, barButtonItem1, btnSvrs, btnSignal, txtSvrLog, btnSignalEmulation, btnFixedStation, btnDraw, btnRefTx, btnCdbTx, btnCxTx, btnXl, btnTarget, btnRefCg, btnRefTask, btnSample, btnADCg, barTaskTemp, btnStation });
+            ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { skinPaletteDropDownButtonItem1, btnOpenApi, ribbon.ExpandCollapseItem, btnTask, btnCg, btnSet, btnRecTx, btnSat, btnCocTool, btnDetectTool, btnXlCalculate, barButtonItem1, btnSvrs, btnSignal, txtSvrLog, btnSignalEmulation, btnFixedStation, btnDraw, btnRefTx, btnCdbTx, btnCxTx, btnXl, btnTarget, btnRefCg, btnRefTask, btnSample, btnADCg, barTaskTemp, btnStation, btnADTask });
             ribbon.Location = new System.Drawing.Point(0, 0);
-            ribbon.MaxItemId = 42;
+            ribbon.MaxItemId = 43;
             ribbon.Name = "ribbon";
             ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1, ribbonPage2, ribbonPage3 });
             ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.MacOffice;
@@ -117,9 +117,9 @@
             btnOpenApi.Id = 21;
             btnOpenApi.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("btnOpenApi.ImageOptions.SvgImage");
             btnOpenApi.Name = "btnOpenApi";
-            toolTipItem2.Text = "查看接口文档";
-            superToolTip2.Items.Add(toolTipItem2);
-            btnOpenApi.SuperTip = superToolTip2;
+            toolTipItem1.Text = "查看接口文档";
+            superToolTip1.Items.Add(toolTipItem1);
+            btnOpenApi.SuperTip = superToolTip1;
             btnOpenApi.ItemClick += btnOpenApi_ItemClick;
             // 
             // btnTask
@@ -353,6 +353,7 @@
             ribbonPageGroup1.ItemLinks.Add(btnCg);
             ribbonPageGroup1.ItemLinks.Add(btnDraw);
             ribbonPageGroup1.ItemLinks.Add(btnRefCg);
+            ribbonPageGroup1.ItemLinks.Add(btnADTask);
             ribbonPageGroup1.Name = "ribbonPageGroup1";
             ribbonPageGroup1.Text = "主功能区";
             // 
@@ -433,6 +434,12 @@
             dockManager1.Form = this;
             dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
             // 
+            // btnADTask
+            // 
+            btnADTask.Caption = "采集任务";
+            btnADTask.Id = 42;
+            btnADTask.Name = "btnADTask";
+            // 
             // MainForm
             // 
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -497,5 +504,6 @@
         private DevExpress.XtraBars.BarButtonItem btnADCg;
         private DevExpress.XtraBars.BarButtonItem barTaskTemp;
         private DevExpress.XtraBars.BarButtonItem btnStation;
+        private DevExpress.XtraBars.BarButtonItem btnADTask;
     }
 }

DW5S.App/UserControl/CtrlHome.cs

@@ -483,8 +483,8 @@ namespace DW5S.App.UserControl
                         {
                             TaskInfoID = taskInfo.Id,
                             SigInfoID = item.Id,
-                            FreqUpHz = item.FreqUp,
-                            FreqDownHz = item.FreqDown,
+                            FreqUpHz = item.FreqUpHz,
+                            FreqDownHz = item.FreqDownHz,
                         };
                         sigList.Add(taskSig);
                     }
@@ -554,8 +554,8 @@ namespace DW5S.App.UserControl
                         TaskSig taskSigEdit = new TaskSig();
                         taskSigEdit.TaskInfoID = editItem.Id;
                         taskSigEdit.SigInfoID = item.Id;
-                        taskSigEdit.FreqUpHz = item.FreqUp;
-                        taskSigEdit.FreqDownHz = item.FreqDown;
+                        taskSigEdit.FreqUpHz = item.FreqUpHz;
+                        taskSigEdit.FreqDownHz = item.FreqDownHz;
                         sigList.Add(taskSigEdit);
                     }
                     await repsTaskSig.AddOrUpdateAsync(sigList);

DW5S.App/UserControl/CtrlSignal.cs

@@ -45,12 +45,12 @@ namespace DW5S.App.UserControl
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsSig = unitOfWork.Of<SigInfo>();
                 var items = await repsSig.GetAllAsync(p => p.FreqUpHz);
-                listSigInfo.AddRange(items.To<List<SigViewModel>>().OrderBy(i=>i.FreqDown));
+                listSigInfo.AddRange(items.To<List<SigViewModel>>().OrderBy(i=>i.FreqDownHz));
                 var repsFixedStation = unitOfWork.Of<FixedStation>();
                 var fixedStations = await repsFixedStation.FindAsync(p => p.Enable);
                 foreach (var item in listSigInfo)
                 {
-                    if (fixedStations.Any(p => p.FreqUpHz == item.FreqUp))
+                    if (fixedStations.Any(p => p.FreqUpHz == item.FreqUpHz))
                         item.IsFixedStationFreq = "✔";
                     else
                         item.IsFixedStationFreq = "✖";

DW5S.ViewModel/SigViewModel.cs

@@ -8,16 +8,16 @@ namespace DW5S.ViewModel
     public class SigViewModel : BaseViewModel<int>
     {
         [Display(Name = "上行频点(Hz)", AutoGenerateField = false)]
-        public long FreqUp { get; set; }
+        public long FreqUpHz { get; set; }
 
         [Display(Name = "上行频点(MHz)")]
-        public double FreqUpDis => FreqUp / 1e6;
+        public double FreqUpDis => FreqUpHz / 1e6;
 
         [Display(Name = "下行频点(Hz)", AutoGenerateField = false)]
-        public long FreqDown { get; set; }
+        public long FreqDownHz { get; set; }
 
         [Display(Name = "下行频点(MHz)")]
-        public double FreqDownDis => FreqDown / 1e6;
+        public double FreqDownDis => FreqDownHz / 1e6;
 
         [Display(Name = "信号类型")]
         public EnumSigType SigType { get; set; }
@@ -30,7 +30,7 @@ namespace DW5S.ViewModel
 
 
         [Display(Name = "带宽(Hz)")]
-        public double Band { get; set; }
+        public int Band { get; set; }
 
         [Display(Name = "是否是固定站", AutoGenerateField = false)]
         public string IsFixedStationFreq { get; set; }