wyq 5 months ago
parent
commit
d5bc36223e

+ 114 - 50
DW5S.App/EditForms/TaskEditor.Designer.cs

@@ -41,8 +41,8 @@
             txtAdja2Sat = new DevExpress.XtraEditors.SearchLookUpEdit();
             gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             txtTaskType = new DevExpress.XtraEditors.RadioGroup();
+            btnAsSave = new DevExpress.XtraEditors.SimpleButton();
             Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -52,7 +52,11 @@
             layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            layAsSave = new DevExpress.XtraLayout.LayoutControlItem();
             dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
             layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)txtTaskName.Properties).BeginInit();
@@ -65,7 +69,6 @@
             ((System.ComponentModel.ISupportInitialize)gridView2).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtTaskType.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
@@ -75,7 +78,11 @@
             ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layAsSave).BeginInit();
             ((System.ComponentModel.ISupportInitialize)dxErrorProvider).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
             SuspendLayout();
             // 
             // layoutControl1
@@ -88,32 +95,33 @@
             layoutControl1.Controls.Add(txtAdja1Sat);
             layoutControl1.Controls.Add(txtAdja2Sat);
             layoutControl1.Controls.Add(txtTaskType);
+            layoutControl1.Controls.Add(btnAsSave);
             layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             layoutControl1.Location = new System.Drawing.Point(0, 0);
             layoutControl1.Name = "layoutControl1";
             layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(784, 215, 650, 400);
             layoutControl1.Root = Root;
-            layoutControl1.Size = new System.Drawing.Size(514, 254);
+            layoutControl1.Size = new System.Drawing.Size(541, 203);
             layoutControl1.TabIndex = 0;
             layoutControl1.Text = "layoutControl1";
             // 
             // btnFreq
             // 
-            btnFreq.Location = new System.Drawing.Point(296, 219);
+            btnFreq.Location = new System.Drawing.Point(247, 168);
             btnFreq.Name = "btnFreq";
-            btnFreq.Size = new System.Drawing.Size(96, 23);
+            btnFreq.Size = new System.Drawing.Size(86, 23);
             btnFreq.StyleController = layoutControl1;
-            btnFreq.TabIndex = 7;
+            btnFreq.TabIndex = 8;
             btnFreq.Text = "选择信号";
             btnFreq.Click += btnFreq_Click;
             // 
             // btnSave
             // 
-            btnSave.Location = new System.Drawing.Point(406, 219);
+            btnSave.Location = new System.Drawing.Point(347, 168);
             btnSave.Name = "btnSave";
-            btnSave.Size = new System.Drawing.Size(96, 23);
+            btnSave.Size = new System.Drawing.Size(86, 23);
             btnSave.StyleController = layoutControl1;
-            btnSave.TabIndex = 8;
+            btnSave.TabIndex = 9;
             btnSave.Text = "保存";
             btnSave.Click += btnSave_ClickAsync;
             // 
@@ -122,7 +130,7 @@
             txtTaskName.Location = new System.Drawing.Point(12, 39);
             txtTaskName.Name = "txtTaskName";
             txtTaskName.Properties.AutoHeight = false;
-            txtTaskName.Size = new System.Drawing.Size(252, 20);
+            txtTaskName.Size = new System.Drawing.Size(242, 20);
             txtTaskName.StyleController = layoutControl1;
             txtTaskName.TabIndex = 0;
             // 
@@ -134,20 +142,20 @@
             txtPosType.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(244, 244, 244);
             txtPosType.Properties.Appearance.Options.UseBackColor = true;
             txtPosType.Properties.Columns = 3;
-            txtPosType.Size = new System.Drawing.Size(490, 79);
+            txtPosType.Size = new System.Drawing.Size(517, 28);
             txtPosType.StyleController = layoutControl1;
             txtPosType.TabIndex = 3;
             txtPosType.EditValueChanged += txtPosType_EditValueChanged;
             // 
             // txtMainSat
             // 
-            txtMainSat.Location = new System.Drawing.Point(12, 185);
+            txtMainSat.Location = new System.Drawing.Point(12, 134);
             txtMainSat.Name = "txtMainSat";
             txtMainSat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
             txtMainSat.Properties.NullText = "";
             txtMainSat.Properties.PopupSizeable = false;
             txtMainSat.Properties.PopupView = searchLookUpEdit1View;
-            txtMainSat.Size = new System.Drawing.Size(160, 20);
+            txtMainSat.Size = new System.Drawing.Size(153, 20);
             txtMainSat.StyleController = layoutControl1;
             txtMainSat.TabIndex = 4;
             // 
@@ -160,13 +168,13 @@
             // 
             // txtAdja1Sat
             // 
-            txtAdja1Sat.Location = new System.Drawing.Point(176, 185);
+            txtAdja1Sat.Location = new System.Drawing.Point(169, 134);
             txtAdja1Sat.Name = "txtAdja1Sat";
             txtAdja1Sat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
             txtAdja1Sat.Properties.NullText = "";
             txtAdja1Sat.Properties.PopupSizeable = false;
             txtAdja1Sat.Properties.PopupView = gridView1;
-            txtAdja1Sat.Size = new System.Drawing.Size(160, 20);
+            txtAdja1Sat.Size = new System.Drawing.Size(154, 20);
             txtAdja1Sat.StyleController = layoutControl1;
             txtAdja1Sat.TabIndex = 5;
             // 
@@ -179,13 +187,13 @@
             // 
             // txtAdja2Sat
             // 
-            txtAdja2Sat.Location = new System.Drawing.Point(340, 185);
+            txtAdja2Sat.Location = new System.Drawing.Point(327, 134);
             txtAdja2Sat.Name = "txtAdja2Sat";
             txtAdja2Sat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
             txtAdja2Sat.Properties.NullText = "";
             txtAdja2Sat.Properties.PopupSizeable = false;
             txtAdja2Sat.Properties.PopupView = gridView2;
-            txtAdja2Sat.Size = new System.Drawing.Size(162, 20);
+            txtAdja2Sat.Size = new System.Drawing.Size(202, 20);
             txtAdja2Sat.StyleController = layoutControl1;
             txtAdja2Sat.TabIndex = 6;
             // 
@@ -199,43 +207,43 @@
             // txtTaskType
             // 
             txtTaskType.EditValue = 0;
-            txtTaskType.Location = new System.Drawing.Point(268, 37);
+            txtTaskType.Location = new System.Drawing.Point(258, 37);
             txtTaskType.Name = "txtTaskType";
             txtTaskType.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(244, 244, 244);
             txtTaskType.Properties.Appearance.Options.UseBackColor = true;
             txtTaskType.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
             txtTaskType.Properties.ColumnIndent = 3;
             txtTaskType.Properties.Columns = 3;
-            txtTaskType.Size = new System.Drawing.Size(234, 27);
+            txtTaskType.Size = new System.Drawing.Size(271, 27);
             txtTaskType.StyleController = layoutControl1;
             txtTaskType.TabIndex = 2;
             txtTaskType.SelectedIndexChanged += txtTaskType_SelectedIndexChanged;
             // 
+            // btnAsSave
+            // 
+            btnAsSave.Location = new System.Drawing.Point(447, 168);
+            btnAsSave.Name = "btnAsSave";
+            btnAsSave.Size = new System.Drawing.Size(82, 23);
+            btnAsSave.StyleController = layoutControl1;
+            btnAsSave.TabIndex = 7;
+            btnAsSave.Text = "另存";
+            // 
             // Root
             // 
             Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             Root.GroupBordersVisible = false;
-            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItemAdja1, layoutControlItemAdja2, layoutControlGroup1, layoutControlItem7 });
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItemAdja1, layoutControlItemAdja2, layoutControlGroup1, layoutControlItem7, emptySpaceItem1, layAsSave });
             Root.Name = "Root";
-            Root.Size = new System.Drawing.Size(514, 254);
+            Root.Size = new System.Drawing.Size(541, 203);
             Root.TextVisible = false;
             // 
-            // emptySpaceItem1
-            // 
-            emptySpaceItem1.AllowHotTrack = false;
-            emptySpaceItem1.Location = new System.Drawing.Point(0, 197);
-            emptySpaceItem1.Name = "emptySpaceItem1";
-            emptySpaceItem1.Size = new System.Drawing.Size(284, 37);
-            emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // layoutControlItem2
             // 
             layoutControlItem2.Control = txtPosType;
             layoutControlItem2.Location = new System.Drawing.Point(0, 56);
-            layoutControlItem2.MaxSize = new System.Drawing.Size(0, 100);
-            layoutControlItem2.MinSize = new System.Drawing.Size(54, 100);
+            layoutControlItem2.MinSize = new System.Drawing.Size(54, 31);
             layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Size = new System.Drawing.Size(494, 100);
+            layoutControlItem2.Size = new System.Drawing.Size(521, 49);
             layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem2.Text = "定位模式";
             layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
@@ -244,11 +252,11 @@
             // layoutControlItem3
             // 
             layoutControlItem3.Control = btnSave;
-            layoutControlItem3.Location = new System.Drawing.Point(394, 197);
+            layoutControlItem3.Location = new System.Drawing.Point(335, 146);
             layoutControlItem3.MaxSize = new System.Drawing.Size(100, 37);
             layoutControlItem3.MinSize = new System.Drawing.Size(100, 37);
             layoutControlItem3.Name = "layoutControlItem3";
-            layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 12, 12, 2);
             layoutControlItem3.Size = new System.Drawing.Size(100, 37);
             layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
@@ -257,9 +265,9 @@
             // layoutControlItem4
             // 
             layoutControlItem4.Control = txtMainSat;
-            layoutControlItem4.Location = new System.Drawing.Point(0, 156);
+            layoutControlItem4.Location = new System.Drawing.Point(0, 105);
             layoutControlItem4.Name = "layoutControlItem4";
-            layoutControlItem4.Size = new System.Drawing.Size(164, 41);
+            layoutControlItem4.Size = new System.Drawing.Size(157, 41);
             layoutControlItem4.Text = "主星";
             layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
             layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
@@ -267,9 +275,9 @@
             // layoutControlItemAdja1
             // 
             layoutControlItemAdja1.Control = txtAdja1Sat;
-            layoutControlItemAdja1.Location = new System.Drawing.Point(164, 156);
+            layoutControlItemAdja1.Location = new System.Drawing.Point(157, 105);
             layoutControlItemAdja1.Name = "layoutControlItemAdja1";
-            layoutControlItemAdja1.Size = new System.Drawing.Size(164, 41);
+            layoutControlItemAdja1.Size = new System.Drawing.Size(158, 41);
             layoutControlItemAdja1.Text = "邻星1";
             layoutControlItemAdja1.TextLocation = DevExpress.Utils.Locations.Top;
             layoutControlItemAdja1.TextSize = new System.Drawing.Size(48, 14);
@@ -278,9 +286,9 @@
             // layoutControlItemAdja2
             // 
             layoutControlItemAdja2.Control = txtAdja2Sat;
-            layoutControlItemAdja2.Location = new System.Drawing.Point(328, 156);
+            layoutControlItemAdja2.Location = new System.Drawing.Point(315, 105);
             layoutControlItemAdja2.Name = "layoutControlItemAdja2";
-            layoutControlItemAdja2.Size = new System.Drawing.Size(166, 41);
+            layoutControlItemAdja2.Size = new System.Drawing.Size(206, 41);
             layoutControlItemAdja2.Text = "邻星2";
             layoutControlItemAdja2.TextLocation = DevExpress.Utils.Locations.Top;
             layoutControlItemAdja2.TextSize = new System.Drawing.Size(48, 14);
@@ -292,7 +300,7 @@
             layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem5 });
             layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
             layoutControlGroup1.Name = "layoutControlGroup1";
-            layoutControlGroup1.Size = new System.Drawing.Size(494, 56);
+            layoutControlGroup1.Size = new System.Drawing.Size(521, 56);
             // 
             // layoutControlItem1
             // 
@@ -302,7 +310,7 @@
             layoutControlItem1.MinSize = new System.Drawing.Size(118, 56);
             layoutControlItem1.Name = "layoutControlItem1";
             layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 7);
-            layoutControlItem1.Size = new System.Drawing.Size(256, 56);
+            layoutControlItem1.Size = new System.Drawing.Size(246, 56);
             layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem1.Text = "任务名称";
             layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
@@ -313,11 +321,11 @@
             layoutControlItem5.Control = txtTaskType;
             layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             layoutControlItem5.CustomizationFormText = "定位模式";
-            layoutControlItem5.Location = new System.Drawing.Point(256, 0);
+            layoutControlItem5.Location = new System.Drawing.Point(246, 0);
             layoutControlItem5.MinSize = new System.Drawing.Size(88, 37);
             layoutControlItem5.Name = "layoutControlItem5";
             layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 2);
-            layoutControlItem5.Size = new System.Drawing.Size(238, 56);
+            layoutControlItem5.Size = new System.Drawing.Size(275, 56);
             layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem5.Text = " ";
             layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
@@ -326,25 +334,74 @@
             // layoutControlItem7
             // 
             layoutControlItem7.Control = btnFreq;
-            layoutControlItem7.Location = new System.Drawing.Point(284, 197);
-            layoutControlItem7.MaxSize = new System.Drawing.Size(110, 37);
-            layoutControlItem7.MinSize = new System.Drawing.Size(110, 37);
+            layoutControlItem7.Location = new System.Drawing.Point(235, 146);
+            layoutControlItem7.MaxSize = new System.Drawing.Size(100, 37);
+            layoutControlItem7.MinSize = new System.Drawing.Size(100, 37);
             layoutControlItem7.Name = "layoutControlItem7";
             layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 12, 12, 2);
-            layoutControlItem7.Size = new System.Drawing.Size(110, 37);
+            layoutControlItem7.Size = new System.Drawing.Size(100, 37);
             layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
             layoutControlItem7.TextVisible = false;
             // 
+            // emptySpaceItem1
+            // 
+            emptySpaceItem1.AllowHotTrack = false;
+            emptySpaceItem1.Location = new System.Drawing.Point(0, 146);
+            emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
+            emptySpaceItem1.Name = "emptySpaceItem1";
+            emptySpaceItem1.Size = new System.Drawing.Size(235, 37);
+            emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // layAsSave
+            // 
+            layAsSave.Control = btnAsSave;
+            layAsSave.Location = new System.Drawing.Point(435, 146);
+            layAsSave.MaxSize = new System.Drawing.Size(86, 37);
+            layAsSave.MinSize = new System.Drawing.Size(86, 37);
+            layAsSave.Name = "layAsSave";
+            layAsSave.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            layAsSave.Size = new System.Drawing.Size(86, 37);
+            layAsSave.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layAsSave.TextSize = new System.Drawing.Size(0, 0);
+            layAsSave.TextVisible = false;
+            // 
             // dxErrorProvider
             // 
             dxErrorProvider.ContainerControl = this;
             // 
+            // layoutControlItem6
+            // 
+            layoutControlItem6.Control = btnSave;
+            layoutControlItem6.Location = new System.Drawing.Point(421, 146);
+            layoutControlItem6.MaxSize = new System.Drawing.Size(100, 37);
+            layoutControlItem6.MinSize = new System.Drawing.Size(100, 37);
+            layoutControlItem6.Name = "layoutControlItem3";
+            layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            layoutControlItem6.Size = new System.Drawing.Size(100, 37);
+            layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem6.TextVisible = false;
+            // 
+            // layoutControlItem8
+            // 
+            layoutControlItem8.Control = btnSave;
+            layoutControlItem8.Location = new System.Drawing.Point(421, 146);
+            layoutControlItem8.MaxSize = new System.Drawing.Size(100, 37);
+            layoutControlItem8.MinSize = new System.Drawing.Size(100, 37);
+            layoutControlItem8.Name = "layoutControlItem3";
+            layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            layoutControlItem8.Size = new System.Drawing.Size(100, 37);
+            layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem8.TextVisible = false;
+            // 
             // TaskEditor
             // 
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            ClientSize = new System.Drawing.Size(514, 254);
+            ClientSize = new System.Drawing.Size(541, 203);
             Controls.Add(layoutControl1);
             FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             Name = "TaskEditor";
@@ -362,7 +419,6 @@
             ((System.ComponentModel.ISupportInitialize)gridView2).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtTaskType.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)Root).EndInit();
-            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
@@ -372,7 +428,11 @@
             ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layAsSave).EndInit();
             ((System.ComponentModel.ISupportInitialize)dxErrorProvider).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
             ResumeLayout(false);
         }
 
@@ -402,5 +462,9 @@
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
         private DevExpress.XtraEditors.SimpleButton btnFreq;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraEditors.SimpleButton btnAsSave;
+        private DevExpress.XtraLayout.LayoutControlItem layAsSave;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
     }
 }

+ 3 - 12
DW5S.App/EditForms/TaskEditor.cs

@@ -42,20 +42,10 @@ namespace DW5S.App.EditForms
             InitializeComponent();
             this.layoutControl1.UseDefault();
             this.Text = "添加任务";
+            layAsSave.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             info = new TaskViewModel();
             this.StartPosition = FormStartPosition.CenterParent;
-            //加载DW类型
-            //var values = Enum.GetValues(typeof(EnumPosType));
-            //foreach (var item in values)
-            //{
-            //    this.txtPosType.Properties.Items.Add(new RadioGroupItem(Convert.ToInt32(item), ((EnumPosType)item).GetEnumDisplayName()));
-            //}
-
-            //values = Enum.GetValues(typeof(EnumTaskType));
-            //foreach (var item in values)
-            //{
-            //    this.txtTaskType.Properties.Items.Add(new RadioGroupItem(Convert.ToInt32(item), ((EnumTaskType)item).GetEnumDisplayName()));
-            //}
+           
             this.txtTaskType.Properties.AddEnum<EnumTaskType>();
             this.txtTaskType.SelectedIndex = 0;
             this.txtTaskType_SelectedIndexChanged(this, EventArgs.Empty);
@@ -69,6 +59,7 @@ namespace DW5S.App.EditForms
             this.Text = $"编辑任务[{info.TaskName}]";
             this.info = info;
             this.selectedItem = taskSigList;
+            layAsSave.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
         }
 
         private async void TaskEditor_Load(object sender, EventArgs e)

+ 29 - 23
DW5S.App/EditForms/TaskTemplate.Designer.cs

@@ -29,24 +29,25 @@
         private void InitializeComponent()
         {
             layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
             btnOk = new DevExpress.XtraEditors.SimpleButton();
             btnCancle = new DevExpress.XtraEditors.SimpleButton();
             Root = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
             layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
             layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)radioGroup1.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)radioGroup1.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
             SuspendLayout();
             // 
             // layoutControl1
             // 
+            layoutControl1.BackColor = System.Drawing.SystemColors.Control;
             layoutControl1.Controls.Add(radioGroup1);
             layoutControl1.Controls.Add(btnOk);
             layoutControl1.Controls.Add(btnCancle);
@@ -54,13 +55,28 @@
             layoutControl1.Location = new System.Drawing.Point(0, 0);
             layoutControl1.Name = "layoutControl1";
             layoutControl1.Root = Root;
-            layoutControl1.Size = new System.Drawing.Size(244, 233);
+            layoutControl1.Size = new System.Drawing.Size(244, 214);
             layoutControl1.TabIndex = 0;
             layoutControl1.Text = "layoutControl1";
             // 
+            // radioGroup1
+            // 
+            radioGroup1.Location = new System.Drawing.Point(12, 12);
+            radioGroup1.MaximumSize = new System.Drawing.Size(0, 160);
+            radioGroup1.MinimumSize = new System.Drawing.Size(0, 160);
+            radioGroup1.Name = "radioGroup1";
+            radioGroup1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control;
+            radioGroup1.Properties.Appearance.Options.UseBackColor = true;
+            radioGroup1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+            radioGroup1.Properties.Columns = 1;
+            radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { new DevExpress.XtraEditors.Controls.RadioGroupItem(0, "无模板"), new DevExpress.XtraEditors.Controls.RadioGroupItem(1, "两星一地有参定位任务模板"), new DevExpress.XtraEditors.Controls.RadioGroupItem(2, "两星一地无参定位任务模板") });
+            radioGroup1.Size = new System.Drawing.Size(220, 160);
+            radioGroup1.StyleController = layoutControl1;
+            radioGroup1.TabIndex = 8;
+            // 
             // btnOk
             // 
-            btnOk.Location = new System.Drawing.Point(123, 199);
+            btnOk.Location = new System.Drawing.Point(123, 176);
             btnOk.Name = "btnOk";
             btnOk.Size = new System.Drawing.Size(109, 22);
             btnOk.StyleController = layoutControl1;
@@ -70,7 +86,7 @@
             // 
             // btnCancle
             // 
-            btnCancle.Location = new System.Drawing.Point(12, 199);
+            btnCancle.Location = new System.Drawing.Point(12, 176);
             btnCancle.Name = "btnCancle";
             btnCancle.Size = new System.Drawing.Size(107, 22);
             btnCancle.StyleController = layoutControl1;
@@ -84,43 +100,33 @@
             Root.GroupBordersVisible = false;
             Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6, layoutControlItem7, layoutControlItem8 });
             Root.Name = "Root";
-            Root.Size = new System.Drawing.Size(244, 233);
+            Root.Size = new System.Drawing.Size(244, 214);
             Root.TextVisible = false;
             // 
             // layoutControlItem6
             // 
             layoutControlItem6.Control = btnCancle;
-            layoutControlItem6.Location = new System.Drawing.Point(0, 187);
+            layoutControlItem6.Location = new System.Drawing.Point(0, 164);
             layoutControlItem6.Name = "layoutControlItem6";
-            layoutControlItem6.Size = new System.Drawing.Size(111, 26);
+            layoutControlItem6.Size = new System.Drawing.Size(111, 30);
             layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
             layoutControlItem6.TextVisible = false;
             // 
             // layoutControlItem7
             // 
             layoutControlItem7.Control = btnOk;
-            layoutControlItem7.Location = new System.Drawing.Point(111, 187);
+            layoutControlItem7.Location = new System.Drawing.Point(111, 164);
             layoutControlItem7.Name = "layoutControlItem7";
-            layoutControlItem7.Size = new System.Drawing.Size(113, 26);
+            layoutControlItem7.Size = new System.Drawing.Size(113, 30);
             layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
             layoutControlItem7.TextVisible = false;
             // 
-            // radioGroup1
-            // 
-            radioGroup1.Location = new System.Drawing.Point(12, 12);
-            radioGroup1.Name = "radioGroup1";
-            radioGroup1.Properties.Columns = 1;
-            radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { new DevExpress.XtraEditors.Controls.RadioGroupItem(0, "无模板"), new DevExpress.XtraEditors.Controls.RadioGroupItem(1, "三星定位任务模板"), new DevExpress.XtraEditors.Controls.RadioGroupItem(2, "两星一地定位任务模板"), new DevExpress.XtraEditors.Controls.RadioGroupItem(3, "星地测向融合定位任务模板") });
-            radioGroup1.Size = new System.Drawing.Size(220, 183);
-            radioGroup1.StyleController = layoutControl1;
-            radioGroup1.TabIndex = 8;
-            // 
             // layoutControlItem8
             // 
             layoutControlItem8.Control = radioGroup1;
             layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             layoutControlItem8.Name = "layoutControlItem8";
-            layoutControlItem8.Size = new System.Drawing.Size(224, 187);
+            layoutControlItem8.Size = new System.Drawing.Size(224, 164);
             layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             layoutControlItem8.TextVisible = false;
             // 
@@ -128,7 +134,7 @@
             // 
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            ClientSize = new System.Drawing.Size(244, 233);
+            ClientSize = new System.Drawing.Size(244, 214);
             Controls.Add(layoutControl1);
             FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             Name = "TaskTemplate";
@@ -136,10 +142,10 @@
             Load += CdbEditor_Load;
             ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
             layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)radioGroup1.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)Root).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
-            ((System.ComponentModel.ISupportInitialize)radioGroup1.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
             ResumeLayout(false);
         }

+ 3 - 3
DW5S.App/EditForms/TaskTemplate.resx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -18,7 +18,7 @@
     <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
     <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
         <value>[base64 mime encoded serialized .NET Framework object]</value>
     </data>
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+ 40 - 26
DW5S.App/UserControl/CtrlHome.cs

@@ -458,37 +458,51 @@ namespace DW5S.App.UserControl
                 try
                 {
                     TaskViewModel addItem;
-                    TaskEditor frm = new TaskEditor();
-                    if (frm.ShowDialog() != DialogResult.OK) return;
-                    addItem = frm.info;
-                    var addItemSignal = frm.selectedItem;
-                    if (addItem.PosType == EnumPosType.X1D1CX)
+                    EditForms.TaskTemplate taskfrm = new EditForms.TaskTemplate();
+                    if (taskfrm.ShowDialog() != DialogResult.OK)
                     {
-                        addItem.Adja2Sat = null;
+                        return;
                     }
-                    var unitOfWork = IocContainer.UnitOfWork;
-                    var repsTask = unitOfWork.Of<TaskInfo>();
-                    var taskInfo = await repsTask.AddOrUpdateAsync(addItem.To<TaskInfo>());
-                    await unitOfWork.SaveAsync();
-                    addItem.Id = taskInfo.Id;
-                    List<TaskSig> sigList = new List<TaskSig>();
-                    foreach (var item in addItemSignal)
+                    if (taskfrm.SelectedTemplate == 0)
                     {
-                        TaskSig taskSig = new TaskSig
+                        TaskEditor frm = new TaskEditor();
+                        if (frm.ShowDialog() != DialogResult.OK) return;
+                        addItem = frm.info;
+                        var addItemSignal = frm.selectedItem;
+                        if (addItem.PosType == EnumPosType.X1D1CX)
                         {
-                            TaskInfoID = taskInfo.Id,
-                            SigInfoID = item.Id,
-                            FreqUpHz = item.FreqUpHz,
-                            FreqDownHz = item.FreqDownHz,
-                        };
-                        sigList.Add(taskSig);
+                            addItem.Adja2Sat = null;
+                        }
+                        var unitOfWork = IocContainer.UnitOfWork;
+                        var repsTask = unitOfWork.Of<TaskInfo>();
+                        var taskInfo = await repsTask.AddOrUpdateAsync(addItem.To<TaskInfo>());
+                        await unitOfWork.SaveAsync();
+                        addItem.Id = taskInfo.Id;
+                        List<TaskSig> sigList = new List<TaskSig>();
+                        foreach (var item in addItemSignal)
+                        {
+                            TaskSig taskSig = new TaskSig
+                            {
+                                TaskInfoID = taskInfo.Id,
+                                SigInfoID = item.Id,
+                                FreqUpHz = item.FreqUpHz,
+                                FreqDownHz = item.FreqDownHz,
+                            };
+                            sigList.Add(taskSig);
+                        }
+                        var repsTaskSig = unitOfWork.Of<TaskSig>();
+                        await repsTaskSig.AddOrUpdateAsync(sigList);
+                        await unitOfWork.SaveAsync();
+                        list.Insert(0, addItem);
+                        gridView1.RefreshData();
+                        gridView1.FocusedRowHandle = 0;
+
                     }
-                    var repsTaskSig = unitOfWork.Of<TaskSig>();
-                    await repsTaskSig.AddOrUpdateAsync(sigList);
-                    await unitOfWork.SaveAsync();
-                    list.Insert(0, addItem);
-                    gridView1.RefreshData();
-                    gridView1.FocusedRowHandle = 0;
+                    else 
+                    {
+                        
+                    }
+                    
                 }
                 catch (Exception ex)
                 {