gongqiuhong пре 1 година
родитељ
комит
1850f9a92c

+ 219 - 9
XdCxRhDW.App/EditForms/TaskEditor.Designer.cs

@@ -28,6 +28,16 @@
         /// </summary>
         private void InitializeComponent()
         {
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.btnSave = new DevExpress.XtraEditors.SimpleButton();
             this.txtTaskName = new DevExpress.XtraEditors.TextEdit();
@@ -37,6 +47,19 @@
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtFreq = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtBand = new DevExpress.XtraEditors.ButtonEdit();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtMainSat = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.txtAdja1Sat = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.txtAdja2Sat = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtTaskName.Properties)).BeginInit();
@@ -46,6 +69,19 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtFreq.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtBand.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdja1Sat.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdja2Sat.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -53,18 +89,23 @@
             this.layoutControl1.Controls.Add(this.btnSave);
             this.layoutControl1.Controls.Add(this.txtTaskName);
             this.layoutControl1.Controls.Add(this.txtPosType);
+            this.layoutControl1.Controls.Add(this.txtFreq);
+            this.layoutControl1.Controls.Add(this.txtBand);
+            this.layoutControl1.Controls.Add(this.txtMainSat);
+            this.layoutControl1.Controls.Add(this.txtAdja1Sat);
+            this.layoutControl1.Controls.Add(this.txtAdja2Sat);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(784, 215, 650, 400);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(437, 331);
+            this.layoutControl1.Size = new System.Drawing.Size(437, 514);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(299, 278);
+            this.btnSave.Location = new System.Drawing.Point(299, 454);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(116, 26);
             this.btnSave.StyleController = this.layoutControl1;
@@ -99,10 +140,15 @@
             this.layoutControlItem1,
             this.emptySpaceItem1,
             this.layoutControlItem2,
-            this.layoutControlItem3});
+            this.layoutControlItem3,
+            this.layoutControlItem4,
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem7,
+            this.layoutControlItem8});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(20, 20, 20, 20);
-            this.Root.Size = new System.Drawing.Size(437, 331);
+            this.Root.Size = new System.Drawing.Size(437, 514);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -121,9 +167,9 @@
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 246);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 422);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(277, 45);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(277, 52);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem2
@@ -143,21 +189,159 @@
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.btnSave;
-            this.layoutControlItem3.Location = new System.Drawing.Point(277, 246);
+            this.layoutControlItem3.Location = new System.Drawing.Point(277, 422);
             this.layoutControlItem3.MaxSize = new System.Drawing.Size(120, 40);
             this.layoutControlItem3.MinSize = new System.Drawing.Size(120, 40);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.layoutControlItem3.Size = new System.Drawing.Size(120, 45);
+            this.layoutControlItem3.Size = new System.Drawing.Size(120, 52);
             this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem3.TextVisible = false;
             // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txtMainSat;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 246);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(397, 44);
+            this.layoutControlItem4.Text = "主星";
+            this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txtAdja1Sat;
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 290);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(397, 44);
+            this.layoutControlItem5.Text = "邻星1";
+            this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txtAdja2Sat;
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 334);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Size = new System.Drawing.Size(397, 44);
+            this.layoutControlItem6.Text = "邻星2";
+            this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // txtFreq
+            // 
+            this.txtFreq.Location = new System.Drawing.Point(22, 418);
+            this.txtFreq.Name = "txtFreq";
+            this.txtFreq.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtFreq.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtFreq.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            this.txtFreq.Properties.MaskSettings.Set("mask", "f3");
+            this.txtFreq.Size = new System.Drawing.Size(194, 22);
+            this.txtFreq.StyleController = this.layoutControl1;
+            this.txtFreq.TabIndex = 10;
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txtFreq;
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 378);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.Size = new System.Drawing.Size(198, 44);
+            this.layoutControlItem7.Text = "上行频点";
+            this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // txtBand
+            // 
+            this.txtBand.Location = new System.Drawing.Point(220, 418);
+            this.txtBand.Name = "txtBand";
+            this.txtBand.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.txtBand.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            this.txtBand.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            this.txtBand.Properties.MaskSettings.Set("mask", "f3");
+            this.txtBand.Size = new System.Drawing.Size(195, 22);
+            this.txtBand.StyleController = this.layoutControl1;
+            this.txtBand.TabIndex = 10;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txtBand;
+            this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem8.CustomizationFormText = "上行频点";
+            this.layoutControlItem8.Location = new System.Drawing.Point(198, 378);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Size = new System.Drawing.Size(199, 44);
+            this.layoutControlItem8.Text = "信号带宽";
+            this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // txtMainSat
+            // 
+            this.txtMainSat.Location = new System.Drawing.Point(22, 286);
+            this.txtMainSat.Name = "txtMainSat";
+            this.txtMainSat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtMainSat.Properties.NullText = "";
+            this.txtMainSat.Properties.PopupSizeable = false;
+            this.txtMainSat.Properties.PopupView = this.searchLookUpEdit1View;
+            this.txtMainSat.Size = new System.Drawing.Size(393, 22);
+            this.txtMainSat.StyleController = this.layoutControl1;
+            this.txtMainSat.TabIndex = 7;
+            // 
+            // searchLookUpEdit1View
+            // 
+            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            // 
+            // txtAdja1Sat
+            // 
+            this.txtAdja1Sat.Location = new System.Drawing.Point(22, 330);
+            this.txtAdja1Sat.Name = "txtAdja1Sat";
+            this.txtAdja1Sat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtAdja1Sat.Properties.NullText = "";
+            this.txtAdja1Sat.Properties.PopupSizeable = false;
+            this.txtAdja1Sat.Properties.PopupView = this.gridView1;
+            this.txtAdja1Sat.Size = new System.Drawing.Size(393, 22);
+            this.txtAdja1Sat.StyleController = this.layoutControl1;
+            this.txtAdja1Sat.TabIndex = 8;
+            // 
+            // gridView1
+            // 
+            this.gridView1.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // txtAdja2Sat
+            // 
+            this.txtAdja2Sat.Location = new System.Drawing.Point(22, 374);
+            this.txtAdja2Sat.Name = "txtAdja2Sat";
+            this.txtAdja2Sat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtAdja2Sat.Properties.NullText = "";
+            this.txtAdja2Sat.Properties.PopupSizeable = false;
+            this.txtAdja2Sat.Properties.PopupView = this.gridView2;
+            this.txtAdja2Sat.Size = new System.Drawing.Size(393, 22);
+            this.txtAdja2Sat.StyleController = this.layoutControl1;
+            this.txtAdja2Sat.TabIndex = 9;
+            // 
+            // gridView2
+            // 
+            this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.gridView2.Name = "gridView2";
+            this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.gridView2.OptionsView.ShowGroupPanel = false;
+            // 
             // TaskEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(437, 331);
+            this.ClientSize = new System.Drawing.Size(437, 514);
             this.Controls.Add(this.layoutControl1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Name = "TaskEditor";
@@ -172,6 +356,19 @@
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtFreq.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtBand.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMainSat.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdja1Sat.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtAdja2Sat.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -187,5 +384,18 @@
         private DevExpress.XtraEditors.RadioGroup txtPosType;
         private DevExpress.XtraEditors.SimpleButton btnSave;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraEditors.ButtonEdit txtFreq;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraEditors.ButtonEdit txtBand;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraEditors.SearchLookUpEdit txtMainSat;
+        private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+        private DevExpress.XtraEditors.SearchLookUpEdit txtAdja1Sat;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraEditors.SearchLookUpEdit txtAdja2Sat;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
     }
 }

+ 19 - 1
XdCxRhDW.App/EditForms/TaskEditor.cs

@@ -2,17 +2,21 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
 using DxHelper;
+using ExtensionsDev;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Data;
+using System.Data.Entity;
 using System.Drawing;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Documents;
 using System.Windows.Forms;
+using XdCxRhDW.Repostory.EFContext;
 using XdCxRhDW.Repostory.Model;
 
 namespace XdCxRhDW.App.EditForms
@@ -34,6 +38,8 @@ namespace XdCxRhDW.App.EditForms
                 radioGroups.Add(new RadioGroupItem(Convert.ToInt32(item), ((EnumPosType)item).GetEnumDisplayName()));
             }
             this.txtPosType.Properties.Items.AddRange(radioGroups.ToArray());
+
+
         }
         public TaskEditor(TaskInfo info)
            : this()
@@ -42,8 +48,15 @@ namespace XdCxRhDW.App.EditForms
             this.info = info;
         }
 
-        private void TaskEditor_Load(object sender, EventArgs e)
+        private async void TaskEditor_Load(object sender, EventArgs e)
         {
+            using (RHDWContext db = new RHDWContext())
+            {
+                var sats = await db.SatInfos.ToListAsync();
+                this.txtMainSat.UseDefault().SetData(sats).UseDoubleClickToSelectAll();
+                this.txtAdja1Sat.UseDefault().SetData(sats).UseDoubleClickToSelectAll();
+                this.txtAdja2Sat.UseDefault().SetData(sats).UseDoubleClickToSelectAll();
+            }
             if (this.Text == "编辑任务" && info != null)
             {
                 this.txtTaskName.Text = info.TaskName;
@@ -58,6 +71,11 @@ namespace XdCxRhDW.App.EditForms
                 info.TaskState = EnumTaskState.Stopped;
                 info.TaskName = txtTaskName.Text;
                 info.PosType = (EnumPosType)txtPosType.SelectedIndex;
+                info.MainSat = ((SatInfo)txtMainSat.EditValue).SatCode;
+                info.Adja1Sat = ((SatInfo)txtAdja1Sat.EditValue).SatCode;
+                info.Adja2Sat = ((SatInfo)txtAdja2Sat.EditValue).SatCode;
+                info.Freq = (long)((double)txtFreq.EditValue * 1e6);
+                info.Band = (int)((double)txtBand.EditValue * 1e6);
                 this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)

+ 5 - 4
XdCxRhDW.App/Properties/licenses.licx

@@ -1,8 +1,9 @@
-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
+DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.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.XtraEditors.DateEdit, DevExpress.XtraEditors.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.XtraGrid.GridControl, DevExpress.XtraGrid.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.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.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.XtraMap.MapControl, DevExpress.XtraMap.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

+ 16 - 1
XdCxRhDW.Repostory/Model/TaskInfo.cs

@@ -21,6 +21,21 @@ namespace XdCxRhDW.Repostory.Model
 
         [Display(Name = "定位类型")]
         public EnumPosType PosType { get; set; }
-  
+
+        [Display(Name = "主星")]
+        public int MainSat { get; set; }
+
+        [Display(Name = "邻星1")]
+        public int Adja1Sat { get; set; }
+
+        [Display(Name = "邻星2")]
+        public int Adja2Sat { get; set; }
+
+        [Display(Name = "上行频点(Hz)")]
+        public long Freq { get; set; }
+
+        [Display(Name = "信号带宽(Hz)")]
+        public int Band { get; set; }
+
     }
 }