11

XdCxRhDW.App/EditForms/X2PosParamEditor.Designer.cs

@@ -325,7 +325,7 @@
             this.txtTarFreqUp.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtTarFreqUp.Name = "txtTarFreqUp";
             this.txtTarFreqUp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtTarFreqUp.Size = new System.Drawing.Size(240, 20);
             this.txtTarFreqUp.StyleController = this.layoutControl1;
             this.txtTarFreqUp.TabIndex = 14;
@@ -336,7 +336,7 @@
             this.txtTarFreqDown.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtTarFreqDown.Name = "txtTarFreqDown";
             this.txtTarFreqDown.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtTarFreqDown.Size = new System.Drawing.Size(415, 20);
             this.txtTarFreqDown.StyleController = this.layoutControl1;
             this.txtTarFreqDown.TabIndex = 15;
@@ -369,7 +369,7 @@
             this.txtRefFreqDown.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefFreqDown.Name = "txtRefFreqDown";
             this.txtRefFreqDown.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtRefFreqDown.Size = new System.Drawing.Size(415, 20);
             this.txtRefFreqDown.StyleController = this.layoutControl1;
             this.txtRefFreqDown.TabIndex = 18;
@@ -380,7 +380,7 @@
             this.txtRefFreqUp.MaximumSize = new System.Drawing.Size(0, 20);
             this.txtRefFreqUp.Name = "txtRefFreqUp";
             this.txtRefFreqUp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtRefFreqUp.Size = new System.Drawing.Size(240, 20);
             this.txtRefFreqUp.StyleController = this.layoutControl1;
             this.txtRefFreqUp.TabIndex = 19;

XdCxRhDW.App/EditForms/X2PosParamEditor.cs

@@ -78,10 +78,11 @@ namespace XdCxRhDW.App.EditForms
                 this.txtDfo.Text = $"{cg.Dfo1.Value:f4}";
                 this.txtYbMainDfo.Text = $"{cg.YbMainDfo.Value:f4}";
                 this.txtYbAdjaDfo.Text = $"{cg.YbAdja1Dfo.Value:f4}";
-                this.txtTarFreqUp.Text = $"{cg.TarFreqUp.Value:f3}";
-                this.txtTarFreqDown.Text = $"{cg.TarFreqDown.Value:f3}";
-                this.txtRefFreqUp.Text = $"{cg.RefFreqUp.Value:f3}";
-                this.txtRefFreqDown.Text = $"{cg.RefFreqDown.Value:f3}";
+
+                this.txtTarFreqUp.EditValue = cg.TarFreqUp.HasValue ? cg.TarFreqUp.Value * 1e-6 : 950;
+                this.txtTarFreqDown.EditValue = cg.TarFreqDown.HasValue ? cg.TarFreqDown.Value * 1e-6 : 950;
+                this.txtRefFreqUp.EditValue = cg.RefFreqUp.HasValue ? cg.RefFreqUp.Value * 1e-6 : 950;
+                this.txtRefFreqDown.EditValue = cg.RefFreqDown.HasValue ? cg.RefFreqDown.Value * 1e-6 : 950;
             }
             if (station != null)
             {
@@ -122,10 +123,10 @@ namespace XdCxRhDW.App.EditForms
                 var Dfo = Convert.ToDouble(this.txtDfo.Text);
                 var YbMainDfo = Convert.ToDouble(this.txtYbMainDfo.Text);
                 var YbAdja1Dfo = Convert.ToDouble(this.txtYbAdjaDfo.Text);
-                var TarFreqUp = Convert.ToDouble(this.txtTarFreqUp.Text);
-                var TarFreqDown = Convert.ToDouble(this.txtTarFreqDown.Text);
-                var RefFreqUp = Convert.ToDouble(this.txtRefFreqUp.Text);
-                var RefFreqDown = Convert.ToDouble(this.txtRefFreqDown.Text);
+                var TarFreqUp = Convert.ToDouble(this.txtTarFreqUp.Text) * 1e6;
+                var TarFreqDown = Convert.ToDouble(this.txtTarFreqDown.Text) * 1e6;
+                var RefFreqUp = Convert.ToDouble(this.txtRefFreqUp.Text) * 1e6;
+                var RefFreqDown = Convert.ToDouble(this.txtRefFreqDown.Text) * 1e6;
 
                 var sigTime = txtSigTime.DateTime;