From 169452b8ad38e9df675c0ab53880b0bf955e358f Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Wed, 26 Apr 2023 16:30:15 -0700 Subject: [PATCH] FlightData Tuning: add pop-out button --- GCSViews/FlightData.Designer.cs | 14 ++++++++++++++ GCSViews/FlightData.cs | 27 +++++++++++++++++++++++++++ GCSViews/FlightData.resx | 32 +++++++++++++++++++++++++++++++- 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/GCSViews/FlightData.Designer.cs b/GCSViews/FlightData.Designer.cs index 4987fa1007..f105a14c8e 100644 --- a/GCSViews/FlightData.Designer.cs +++ b/GCSViews/FlightData.Designer.cs @@ -182,6 +182,7 @@ private void InitializeComponent() this.panel_persistent = new System.Windows.Forms.Panel(); this.tableMap = new System.Windows.Forms.TableLayoutPanel(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.BTN_tunning_dropout = new MissionPlanner.Controls.MyButton(); this.zg1 = new ZedGraph.ZedGraphControl(); this.contextMenuStripMap = new System.Windows.Forms.ContextMenuStrip(this.components); this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -2347,6 +2348,7 @@ private void InitializeComponent() // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.BTN_tunning_dropout); this.splitContainer1.Panel1.Controls.Add(this.zg1); // // splitContainer1.Panel2 @@ -2364,6 +2366,17 @@ private void InitializeComponent() this.splitContainer1.Panel2.Controls.Add(this.gMapControl1); this.splitContainer1.Panel2.Controls.Add(this.TRK_zoom); // + // BTN_tunning_dropout + // + this.BTN_tunning_dropout.ColorMouseDown = System.Drawing.Color.Empty; + this.BTN_tunning_dropout.ColorMouseOver = System.Drawing.Color.Empty; + this.BTN_tunning_dropout.ColorNotEnabled = System.Drawing.Color.Empty; + resources.ApplyResources(this.BTN_tunning_dropout, "BTN_tunning_dropout"); + this.BTN_tunning_dropout.Name = "BTN_tunning_dropout"; + this.BTN_tunning_dropout.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); + this.BTN_tunning_dropout.UseVisualStyleBackColor = true; + this.BTN_tunning_dropout.Click += new System.EventHandler(this.BTN_tunning_dropout_Click); + // // zg1 // resources.ApplyResources(this.zg1, "zg1"); @@ -3035,5 +3048,6 @@ private void InitializeComponent() private Controls.AuxOptions auxOptions6; private Controls.AuxOptions auxOptions7; private ToolStripMenuItem jumpToTagToolStripMenuItem; + private Controls.MyButton BTN_tunning_dropout; } } diff --git a/GCSViews/FlightData.cs b/GCSViews/FlightData.cs index 44a4f5ad77..9f06bb62f6 100644 --- a/GCSViews/FlightData.cs +++ b/GCSViews/FlightData.cs @@ -1788,6 +1788,7 @@ private void CB_tuning_CheckedChanged(object sender, EventArgs e) ZedGraphTimer.Stop(); zg1.Visible = false; } + BTN_tunning_dropout.Visible = zg1.Visible; } private void CheckAndBindPreFlightData() @@ -2628,6 +2629,7 @@ private void FlightData_Load(object sender, EventArgs e) prop = new Propagation(gMapControl1); splitContainer1.Panel1Collapsed = true; + BTN_tunning_dropout.Visible = false; try { @@ -6200,5 +6202,30 @@ private void jumpToTagToolStripMenuItem_Click(object sender, EventArgs e) CustomMessageBox.Show(Strings.CommandFailed + ex.ToString(), Strings.ERROR); } } + + void tuningdropout_FormClosed(object sender, FormClosedEventArgs e) + { + (sender as Form).SaveStartupLocation(); + ((sender as Form).Tag as Control).Controls.Add(zg1); + splitContainer1.Panel1Collapsed = false; + BTN_tunning_dropout.Visible = true; + CB_tuning.Enabled = true; + } + + private void BTN_tunning_dropout_Click(object sender, EventArgs e) + { + Form dropout = new Form(); + dropout.Text = "Tuning Dropout"; + dropout.Size = new Size(zg1.Width, zg1.Height + 20); + dropout.Tag = zg1.Parent; + dropout.Controls.Add(zg1); + dropout.FormClosed += tuningdropout_FormClosed; + dropout.RestoreStartupLocation(); + dropout.Show(); + + splitContainer1.Panel1Collapsed = true; + BTN_tunning_dropout.Visible = false; + CB_tuning.Enabled = false; + } } } diff --git a/GCSViews/FlightData.resx b/GCSViews/FlightData.resx index e3d2c28aec..0f8cc2e9f6 100644 --- a/GCSViews/FlightData.resx +++ b/GCSViews/FlightData.resx @@ -5095,6 +5095,36 @@ Horizontal + + NoControl + + + 4, 3 + + + 56, 17 + + + 0 + + + Pop Out + + + False + + + BTN_tunning_dropout + + + MissionPlanner.Controls.MyButton, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + splitContainer1.Panel1 + + + 0 + Fill @@ -5120,7 +5150,7 @@ splitContainer1.Panel1 - 0 + 1 splitContainer1.Panel1