Skip to content

Commit 1341c0f

Browse files
committed
FlightData: add right axis in tuning #2788
1 parent d52e936 commit 1341c0f

File tree

2 files changed

+93
-10
lines changed

2 files changed

+93
-10
lines changed

GCSViews/FlightData.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GCSViews/FlightData.cs

Lines changed: 92 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -240,30 +240,30 @@ public FlightData()
240240
string desc = MainV2.comPort.MAV.cs.GetNameandUnit(name);
241241
using (var cb = new CheckBox {Name = name, Checked = true, Text = desc})
242242
{
243-
chk_box_CheckedChanged(cb, EventArgs.Empty);
243+
chk_box_tunningCheckedChanged(cb, EventArgs.Empty);
244244
}
245245
}
246246
}
247247
else
248248
{
249249
using (var cb = new CheckBox {Name = "roll", Checked = true})
250250
{
251-
chk_box_CheckedChanged(cb, EventArgs.Empty);
251+
chk_box_tunningCheckedChanged(cb, EventArgs.Empty);
252252
}
253253

254254
using (var cb = new CheckBox {Name = "pitch", Checked = true})
255255
{
256-
chk_box_CheckedChanged(cb, EventArgs.Empty);
256+
chk_box_tunningCheckedChanged(cb, EventArgs.Empty);
257257
}
258258

259259
using (var cb = new CheckBox {Name = "nav_roll", Checked = true})
260260
{
261-
chk_box_CheckedChanged(cb, EventArgs.Empty);
261+
chk_box_tunningCheckedChanged(cb, EventArgs.Empty);
262262
}
263263

264264
using (var cb = new CheckBox {Name = "nav_pitch", Checked = true})
265265
{
266-
chk_box_CheckedChanged(cb, EventArgs.Empty);
266+
chk_box_tunningCheckedChanged(cb, EventArgs.Empty);
267267
}
268268
}
269269

@@ -542,7 +542,7 @@ public void CreateChart(ZedGraphControl zgc)
542542
GraphPane myPane = zgc.GraphPane;
543543

544544
// Set the titles and axis labels
545-
myPane.Title.Text = "Tuning";
545+
myPane.Title.Text = "Tuning - Double click to change items";
546546
myPane.XAxis.Title.Text = "Time (s)";
547547
myPane.YAxis.Title.Text = "Unit";
548548

@@ -1681,7 +1681,7 @@ private void CHK_autopan_CheckedChanged(object sender, EventArgs e)
16811681
//GCSViews.FlightPlanner.instance.autopan = CHK_autopan.Checked;
16821682
}
16831683

1684-
void chk_box_CheckedChanged(object sender, EventArgs e)
1684+
void chk_box_tunningCheckedChanged(object sender, EventArgs e)
16851685
{
16861686
ThemeManager.ApplyThemeTo((Control) sender);
16871687

@@ -1697,6 +1697,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
16971697
list1curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list1, Color.Red,
16981698
SymbolType.None);
16991699
list1curve.Tag = ((CheckBox) sender).Name;
1700+
if (tuningwasrightclick)
1701+
{
1702+
list1curve.Label.Text += " R";
1703+
list1curve.IsY2Axis = true;
1704+
list1curve.YAxisIndex = 0;
1705+
zg1.GraphPane.Y2Axis.IsVisible = true;
1706+
}
17001707
}
17011708
}
17021709
else if (list2item == null)
@@ -1707,6 +1714,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
17071714
list2curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list2, Color.Blue,
17081715
SymbolType.None);
17091716
list2curve.Tag = ((CheckBox) sender).Name;
1717+
if (tuningwasrightclick)
1718+
{
1719+
list2curve.Label.Text += " R";
1720+
list2curve.IsY2Axis = true;
1721+
list2curve.YAxisIndex = 0;
1722+
zg1.GraphPane.Y2Axis.IsVisible = true;
1723+
}
17101724
}
17111725
}
17121726
else if (list3item == null)
@@ -1717,6 +1731,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
17171731
list3curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list3, Color.Green,
17181732
SymbolType.None);
17191733
list3curve.Tag = ((CheckBox) sender).Name;
1734+
if (tuningwasrightclick)
1735+
{
1736+
list3curve.Label.Text += " R";
1737+
list3curve.IsY2Axis = true;
1738+
list3curve.YAxisIndex = 0;
1739+
zg1.GraphPane.Y2Axis.IsVisible = true;
1740+
}
17201741
}
17211742
}
17221743
else if (list4item == null)
@@ -1727,6 +1748,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
17271748
list4curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list4, Color.Orange,
17281749
SymbolType.None);
17291750
list4curve.Tag = ((CheckBox) sender).Name;
1751+
if (tuningwasrightclick)
1752+
{
1753+
list4curve.Label.Text += " R";
1754+
list4curve.IsY2Axis = true;
1755+
list4curve.YAxisIndex = 0;
1756+
zg1.GraphPane.Y2Axis.IsVisible = true;
1757+
}
17301758
}
17311759
}
17321760
else if (list5item == null)
@@ -1737,6 +1765,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
17371765
list5curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list5, Color.Yellow,
17381766
SymbolType.None);
17391767
list5curve.Tag = ((CheckBox) sender).Name;
1768+
if (tuningwasrightclick)
1769+
{
1770+
list5curve.Label.Text += " R";
1771+
list5curve.IsY2Axis = true;
1772+
list5curve.YAxisIndex = 0;
1773+
zg1.GraphPane.Y2Axis.IsVisible = true;
1774+
}
17401775
}
17411776
}
17421777
else if (list6item == null)
@@ -1747,6 +1782,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
17471782
list6curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list6, Color.Magenta,
17481783
SymbolType.None);
17491784
list6curve.Tag = ((CheckBox) sender).Name;
1785+
if (tuningwasrightclick)
1786+
{
1787+
list6curve.Label.Text += " R";
1788+
list6curve.IsY2Axis = true;
1789+
list6curve.YAxisIndex = 0;
1790+
zg1.GraphPane.Y2Axis.IsVisible = true;
1791+
}
17501792
}
17511793
}
17521794
else if (list7item == null)
@@ -1757,6 +1799,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
17571799
list7curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list7, Color.Purple,
17581800
SymbolType.None);
17591801
list7curve.Tag = ((CheckBox) sender).Name;
1802+
if (tuningwasrightclick)
1803+
{
1804+
list7curve.Label.Text += " R";
1805+
list7curve.IsY2Axis = true;
1806+
list7curve.YAxisIndex = 0;
1807+
zg1.GraphPane.Y2Axis.IsVisible = true;
1808+
}
17601809
}
17611810
}
17621811
else if (list8item == null)
@@ -1767,6 +1816,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
17671816
list8curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list8, Color.LimeGreen,
17681817
SymbolType.None);
17691818
list8curve.Tag = ((CheckBox) sender).Name;
1819+
if (tuningwasrightclick)
1820+
{
1821+
list8curve.Label.Text += " R";
1822+
list8curve.IsY2Axis = true;
1823+
list8curve.YAxisIndex = 0;
1824+
zg1.GraphPane.Y2Axis.IsVisible = true;
1825+
}
17701826
}
17711827
}
17721828
else if (list9item == null)
@@ -1777,6 +1833,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
17771833
list9curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list9, Color.Cyan,
17781834
SymbolType.None);
17791835
list9curve.Tag = ((CheckBox) sender).Name;
1836+
if (tuningwasrightclick)
1837+
{
1838+
list9curve.Label.Text += " R";
1839+
list9curve.IsY2Axis = true;
1840+
list9curve.YAxisIndex = 0;
1841+
zg1.GraphPane.Y2Axis.IsVisible = true;
1842+
}
17801843
}
17811844
}
17821845
else if (list10item == null)
@@ -1787,6 +1850,13 @@ void chk_box_CheckedChanged(object sender, EventArgs e)
17871850
list10curve = zg1.GraphPane.AddCurve(((CheckBox) sender).Text, list10, Color.Violet,
17881851
SymbolType.None);
17891852
list10curve.Tag = ((CheckBox) sender).Name;
1853+
if (tuningwasrightclick)
1854+
{
1855+
list10curve.Label.Text += " R";
1856+
list10curve.IsY2Axis = true;
1857+
list10curve.YAxisIndex = 0;
1858+
zg1.GraphPane.Y2Axis.IsVisible = true;
1859+
}
17901860
}
17911861
}
17921862
else
@@ -4576,7 +4646,7 @@ void tfr_GotTFRs(object sender, EventArgs e)
45764646
});
45774647
}
45784648

4579-
private void timer1_Tick(object sender, EventArgs e)
4649+
private void ZedGraphTimer_Tick(object sender, EventArgs e)
45804650
{
45814651
try
45824652
{
@@ -5060,7 +5130,8 @@ private void zg1_DoubleClick(object sender, EventArgs e)
50605130
chk_box.Tag = "custom";
50615131
chk_box.Location = new Point(5 + (i / row_count) * (max_length + 5), 2 + (i % row_count) * row_height);
50625132
chk_box.Size = new Size(120, 20);
5063-
chk_box.CheckedChanged += chk_box_CheckedChanged;
5133+
chk_box.CheckedChanged += chk_box_tunningCheckedChanged;
5134+
chk_box.MouseDown += Chk_box_tunningMouseDown;
50645135
chk_box.AutoSize = true;
50655136

50665137
selectform.Controls.Add(chk_box);
@@ -5081,6 +5152,17 @@ private void zg1_DoubleClick(object sender, EventArgs e)
50815152
selectform.Show();
50825153
}
50835154

5155+
private void Chk_box_tunningMouseDown(object sender, MouseEventArgs e)
5156+
{
5157+
tuningwasrightclick = e.Button == MouseButtons.Right;
5158+
if (tuningwasrightclick)
5159+
{
5160+
var chk = sender as CheckBox;
5161+
if (chk != null)
5162+
chk.Checked = !chk.Checked;
5163+
}
5164+
}
5165+
50845166
private void Zoomlevel_ValueChanged(object sender, EventArgs e)
50855167
{
50865168
try
@@ -5296,6 +5378,7 @@ private void setBatteryCellCountToolStripMenuItem_Click(object sender, EventArgs
52965378
hud1.batterycellcount = iCellCount;
52975379
}
52985380
private bool tabQuickDetached = false;
5381+
private bool tuningwasrightclick;
52995382

53005383
private void undockDockToolStripMenuItem_Click(object sender, EventArgs e)
53015384
{

0 commit comments

Comments
 (0)