aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mission Planner 1.2.22

Browse Source 
fix speed modification scale
fix typo on antenna Tracker
setup for ThemeManager.cs
new auto hide menu
This commit is contained in:
Michael Oborne 2012-11-25 21:50:49 +08:00
parent a87394fff2
commit b82c454418
15 changed files with 1133 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/ArdupilotMegaPlanner/Antenna/Tracker.resx
View File

@ -714,13 +714,13 @@
<value>94, 40</value>
</data>
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
<value>403, 13</value>
<value>393, 13</value>
</data>
<data name="label12.TabIndex" type="System.Int32, mscorlib">
<value>28</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>Miss using this interface can cause servo damage, use with caution!!!</value>
<value>Misusing this interface can cause servo damage, use with caution!!!</value>
</data>
<data name="&gt;&gt;label12.Name" xml:space="preserve">
<value>label12</value>
@ -750,7 +750,7 @@
<value>BUT_connect</value>
</data>
<data name="&gt;&gt;BUT_connect.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4711.34225, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.22193, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_connect.Parent" xml:space="preserve">
<value>$this</value>
@ -828,7 +828,7 @@
<value>BUT_find</value>
</data>
<data name="&gt;&gt;BUT_find.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4711.34225, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.22193, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_find.Parent" xml:space="preserve">
<value>$this</value>

4
Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageView.cs
View File

@ -21,8 +21,8 @@ namespace ArdupilotMega.Controls.BackstageView
private Color _buttonsAreaPencilColor = Color.DarkGray;
private Color _selectedTextColor = Color.White;
private Color _unSelectedTextColor = Color.Gray;
private Color _highlightColor1 = Color.DarkBlue;
private Color _highlightColor2 = Color.Blue;
private Color _highlightColor1 = SystemColors.Highlight;
private Color _highlightColor2 = SystemColors.MenuHighlight;
private readonly List<BackstageViewItem> _items = new List<BackstageViewItem>();
private BackstageViewPage _activePage;

4
Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageViewButton.cs
View File

@ -13,8 +13,8 @@ namespace ArdupilotMega.Controls.BackstageView
internal Color PencilBorderColor = Color.White;
internal Color SelectedTextColor = Color.White;
internal Color UnSelectedTextColor = Color.Gray;
internal Color HighlightColor1 = Color.DarkBlue;
internal Color HighlightColor2 = Color.Blue;
internal Color HighlightColor1 = SystemColors.Highlight;
internal Color HighlightColor2 = SystemColors.MenuHighlight;
private bool _isMouseOver;
//internal Color HighlightColor1 = Color.FromArgb(0x94, 0xc1, 0x1f);

4
Tools/ArdupilotMegaPlanner/Controls/MyLabel.cs
View File

@ -18,8 +18,8 @@ namespace ArdupilotMega.Controls
int noofchars = 0;
bool autosize = false;
SolidBrush s = new SolidBrush(Color.White);
SolidBrush b = new SolidBrush(Color.Black);
SolidBrush s = new SolidBrush(SystemColors.ControlText);
SolidBrush b = new SolidBrush(SystemColors.Control);
StringFormat stringFormat = new StringFormat();

3
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs generated
View File

@ -182,7 +182,6 @@
//
// SubMainLeft.Panel2
//
this.SubMainLeft.Panel2.BackColor = System.Drawing.Color.Transparent;
this.SubMainLeft.Panel2.Controls.Add(this.tabControl1);
//
// hud1
@ -1031,7 +1030,6 @@
//
resources.ApplyResources(this.tabStatus, "tabStatus");
this.tabStatus.Name = "tabStatus";
this.tabStatus.UseVisualStyleBackColor = true;
//
// tabTLogs
//
@ -1081,7 +1079,6 @@
// tracklog
//
resources.ApplyResources(this.tracklog, "tracklog");
this.tracklog.BackColor = System.Drawing.SystemColors.Control;
this.tracklog.Maximum = 100;
this.tracklog.Name = "tracklog";
this.tracklog.Scroll += new System.EventHandler(this.tracklog_Scroll);

14
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs
View File

@ -325,6 +325,8 @@ namespace ArdupilotMega.GCSViews
tabStatus.Width = x;
ThemeManager.ApplyThemeTo(tabStatus);
// tabStatus.ResumeLayout();
}
@ -1314,18 +1316,18 @@ namespace ArdupilotMega.GCSViews
// QUAD
if (MainV2.comPort.param.ContainsKey("WP_SPEED_MAX"))
{
modifyandSetSpeed.Value = (decimal)(float)MainV2.comPort.param["WP_SPEED_MAX"];
modifyandSetSpeed.Value = (decimal)((float)MainV2.comPort.param["WP_SPEED_MAX"] / 100.0);
} // plane with airspeed
else if (MainV2.comPort.param.ContainsKey("TRIM_ARSPD_CM") && MainV2.comPort.param.ContainsKey("ARSPD_ENABLE")
&& MainV2.comPort.param.ContainsKey("ARSPD_USE") && (float)MainV2.comPort.param["ARSPD_ENABLE"] == 1
&& (float)MainV2.comPort.param["ARSPD_USE"] == 1)
{
modifyandSetSpeed.Value = (decimal)(float)MainV2.comPort.param["TRIM_ARSPD_CM"];
modifyandSetSpeed.Value = (decimal)((float)MainV2.comPort.param["TRIM_ARSPD_CM"] / 100.0);
} // plane without airspeed
else if (MainV2.comPort.param.ContainsKey("TRIM_THROTTLE") && MainV2.comPort.param.ContainsKey("ARSPD_USE")
&& (float)MainV2.comPort.param["ARSPD_USE"] == 0)
{
modifyandSetSpeed.Value = (decimal)(float)MainV2.comPort.param["TRIM_THROTTLE"];
modifyandSetSpeed.Value = (decimal)(float)MainV2.comPort.param["TRIM_THROTTLE"]; // percent
}
MainV2.comPort.ParamListChanged += FlightData_ParentChanged;
@ -2500,7 +2502,7 @@ print 'Roll complete'
int newalt = (int)modifyandSetAlt.Value;
try
{
MainV2.comPort.setNewWPAlt(new Locationwp() { alt = newalt });
MainV2.comPort.setNewWPAlt(new Locationwp() { alt = newalt / MainV2.cs.multiplierdist });
}
catch { CustomMessageBox.Show("Error sending command"); }
//MainV2.comPort.setNextWPTargetAlt((ushort)MainV2.cs.wpno, newalt);
@ -2522,7 +2524,7 @@ print 'Roll complete'
{
try
{
MainV2.comPort.setParam("WP_SPEED_MAX", (float)modifyandSetSpeed.Value);
MainV2.comPort.setParam("WP_SPEED_MAX", ((float)modifyandSetSpeed.Value * 100.0f));
}
catch { CustomMessageBox.Show("Error sending command"); }
} // plane with airspeed
@ -2532,7 +2534,7 @@ print 'Roll complete'
{
try
{
MainV2.comPort.setParam("TRIM_ARSPD_CM", (float)modifyandSetSpeed.Value);
MainV2.comPort.setParam("TRIM_ARSPD_CM", ((float)modifyandSetSpeed.Value * 100.0f));
}
catch { CustomMessageBox.Show("Error sending command"); }
} // plane without airspeed

84
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx
View File

@ -244,7 +244,7 @@
<value>hud1</value>
</data>
<data name="&gt;&gt;hud1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;hud1.Parent" xml:space="preserve">
<value>SubMainLeft.Panel1</value>
@ -283,7 +283,7 @@
<value>quickView6</value>
</data>
<data name="&gt;&gt;quickView6.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView6.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -307,7 +307,7 @@
<value>quickView5</value>
</data>
<data name="&gt;&gt;quickView5.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView5.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -331,7 +331,7 @@
<value>quickView4</value>
</data>
<data name="&gt;&gt;quickView4.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView4.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -355,7 +355,7 @@
<value>quickView3</value>
</data>
<data name="&gt;&gt;quickView3.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView3.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -379,7 +379,7 @@
<value>quickView2</value>
</data>
<data name="&gt;&gt;quickView2.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView2.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -409,7 +409,7 @@
<value>quickView1</value>
</data>
<data name="&gt;&gt;quickView1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;quickView1.Parent" xml:space="preserve">
<value>tabQuick</value>
@ -457,7 +457,7 @@
<value>modifyandSetSpeed</value>
</data>
<data name="&gt;&gt;modifyandSetSpeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;modifyandSetSpeed.Parent" xml:space="preserve">
<value>tabActions</value>
@ -478,7 +478,7 @@
<value>modifyandSetAlt</value>
</data>
<data name="&gt;&gt;modifyandSetAlt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;modifyandSetAlt.Parent" xml:space="preserve">
<value>tabActions</value>
@ -511,7 +511,7 @@
<value>BUT_ARM</value>
</data>
<data name="&gt;&gt;BUT_ARM.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_ARM.Parent" xml:space="preserve">
<value>tabActions</value>
@ -538,7 +538,7 @@
<value>BUT_script</value>
</data>
<data name="&gt;&gt;BUT_script.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_script.Parent" xml:space="preserve">
<value>tabActions</value>
@ -568,7 +568,7 @@
<value>BUT_joystick</value>
</data>
<data name="&gt;&gt;BUT_joystick.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_joystick.Parent" xml:space="preserve">
<value>tabActions</value>
@ -598,7 +598,7 @@
<value>BUT_quickmanual</value>
</data>
<data name="&gt;&gt;BUT_quickmanual.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_quickmanual.Parent" xml:space="preserve">
<value>tabActions</value>
@ -628,7 +628,7 @@
<value>BUT_quickrtl</value>
</data>
<data name="&gt;&gt;BUT_quickrtl.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_quickrtl.Parent" xml:space="preserve">
<value>tabActions</value>
@ -658,7 +658,7 @@
<value>BUT_quickauto</value>
</data>
<data name="&gt;&gt;BUT_quickauto.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_quickauto.Parent" xml:space="preserve">
<value>tabActions</value>
@ -712,7 +712,7 @@
<value>BUT_setwp</value>
</data>
<data name="&gt;&gt;BUT_setwp.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_setwp.Parent" xml:space="preserve">
<value>tabActions</value>
@ -763,7 +763,7 @@
<value>BUT_setmode</value>
</data>
<data name="&gt;&gt;BUT_setmode.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_setmode.Parent" xml:space="preserve">
<value>tabActions</value>
@ -793,7 +793,7 @@
<value>BUT_clear_track</value>
</data>
<data name="&gt;&gt;BUT_clear_track.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_clear_track.Parent" xml:space="preserve">
<value>tabActions</value>
@ -844,7 +844,7 @@
<value>BUT_Homealt</value>
</data>
<data name="&gt;&gt;BUT_Homealt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_Homealt.Parent" xml:space="preserve">
<value>tabActions</value>
@ -874,7 +874,7 @@
<value>BUT_RAWSensor</value>
</data>
<data name="&gt;&gt;BUT_RAWSensor.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_RAWSensor.Parent" xml:space="preserve">
<value>tabActions</value>
@ -904,7 +904,7 @@
<value>BUTrestartmission</value>
</data>
<data name="&gt;&gt;BUTrestartmission.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUTrestartmission.Parent" xml:space="preserve">
<value>tabActions</value>
@ -934,7 +934,7 @@
<value>BUTactiondo</value>
</data>
<data name="&gt;&gt;BUTactiondo.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUTactiondo.Parent" xml:space="preserve">
<value>tabActions</value>
@ -988,7 +988,7 @@
<value>Gvspeed</value>
</data>
<data name="&gt;&gt;Gvspeed.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Gvspeed.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -1018,7 +1018,7 @@
<value>Gheading</value>
</data>
<data name="&gt;&gt;Gheading.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Gheading.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -1048,7 +1048,7 @@
<value>Galt</value>
</data>
<data name="&gt;&gt;Galt.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Galt.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -1081,7 +1081,7 @@
<value>Gspeed</value>
</data>
<data name="&gt;&gt;Gspeed.Type" xml:space="preserve">
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Gspeed.Parent" xml:space="preserve">
<value>tabGauges</value>
@ -1165,7 +1165,7 @@
<value>lbl_playbackspeed</value>
</data>
<data name="&gt;&gt;lbl_playbackspeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_playbackspeed.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1192,7 +1192,7 @@
<value>lbl_logpercent</value>
</data>
<data name="&gt;&gt;lbl_logpercent.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_logpercent.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1219,7 +1219,7 @@
<value>NUM_playbackspeed</value>
</data>
<data name="&gt;&gt;NUM_playbackspeed.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;NUM_playbackspeed.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1246,7 +1246,7 @@
<value>BUT_log2kml</value>
</data>
<data name="&gt;&gt;BUT_log2kml.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_log2kml.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1300,7 +1300,7 @@
<value>BUT_playlog</value>
</data>
<data name="&gt;&gt;BUT_playlog.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_playlog.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1327,7 +1327,7 @@
<value>BUT_loadtelem</value>
</data>
<data name="&gt;&gt;BUT_loadtelem.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_loadtelem.Parent" xml:space="preserve">
<value>tabTLogs</value>
@ -1513,7 +1513,7 @@
<value>lbl_winddir</value>
</data>
<data name="&gt;&gt;lbl_winddir.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_winddir.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1543,7 +1543,7 @@
<value>lbl_windvel</value>
</data>
<data name="&gt;&gt;lbl_windvel.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_windvel.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1576,7 +1576,7 @@
<value>lbl_hdop</value>
</data>
<data name="&gt;&gt;lbl_hdop.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_hdop.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1609,7 +1609,7 @@
<value>lbl_sats</value>
</data>
<data name="&gt;&gt;lbl_sats.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lbl_sats.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1781,7 +1781,7 @@
<value>gMapControl1</value>
</data>
<data name="&gt;&gt;gMapControl1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;gMapControl1.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@ -1844,7 +1844,7 @@
<value>TXT_lat</value>
</data>
<data name="&gt;&gt;TXT_lat.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TXT_lat.Parent" xml:space="preserve">
<value>panel1</value>
@ -1901,7 +1901,7 @@
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>panel1</value>
@ -1931,7 +1931,7 @@
<value>TXT_long</value>
</data>
<data name="&gt;&gt;TXT_long.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TXT_long.Parent" xml:space="preserve">
<value>panel1</value>
@ -1961,7 +1961,7 @@
<value>TXT_alt</value>
</data>
<data name="&gt;&gt;TXT_alt.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TXT_alt.Parent" xml:space="preserve">
<value>panel1</value>
@ -2276,6 +2276,6 @@
<value>FlightData</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4708.37963, Culture=neutral, PublicKeyToken=null</value>
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4712.38843, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

224
Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.Designer.cs generated
View File

@ -34,25 +34,14 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
this.CHK_altmode = new System.Windows.Forms.CheckBox();
this.CHK_holdalt = new System.Windows.Forms.CheckBox();
this.Commands = new System.Windows.Forms.DataGridView();
this.Command = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.Param1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Param2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Param3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Param4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Lat = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Lon = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Alt = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Delete = new System.Windows.Forms.DataGridViewButtonColumn();
this.Up = new System.Windows.Forms.DataGridViewImageColumn();
this.Down = new System.Windows.Forms.DataGridViewImageColumn();
this.CHK_geheight = new System.Windows.Forms.CheckBox();
this.TXT_WPRad = new System.Windows.Forms.TextBox();
this.TXT_DefaultAlt = new System.Windows.Forms.TextBox();
@ -145,6 +134,17 @@
this.panelBASE = new System.Windows.Forms.Panel();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.Command = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.Param1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Param2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Param3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Param4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Lat = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Lon = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Alt = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Delete = new System.Windows.Forms.DataGridViewButtonColumn();
this.Up = new System.Windows.Forms.DataGridViewImageColumn();
this.Down = new System.Windows.Forms.DataGridViewImageColumn();
((System.ComponentModel.ISupportInitialize)(this.Commands)).BeginInit();
this.panel5.SuspendLayout();
this.panel1.SuspendLayout();
@ -217,91 +217,6 @@
this.Commands.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.Commands_RowsAdded);
this.Commands.RowValidating += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.Commands_RowValidating);
//
// Command
//
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69)))));
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
this.Command.DefaultCellStyle = dataGridViewCellStyle2;
this.Command.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox;
resources.ApplyResources(this.Command, "Command");
this.Command.Name = "Command";
//
// Param1
//
this.Param1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Param1, "Param1");
this.Param1.Name = "Param1";
this.Param1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Param1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Param2
//
this.Param2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Param2, "Param2");
this.Param2.Name = "Param2";
this.Param2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Param2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Param3
//
this.Param3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Param3, "Param3");
this.Param3.Name = "Param3";
this.Param3.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Param3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Param4
//
this.Param4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Param4, "Param4");
this.Param4.Name = "Param4";
this.Param4.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Param4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Lat
//
this.Lat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Lat, "Lat");
this.Lat.Name = "Lat";
this.Lat.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Lon
//
this.Lon.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Lon, "Lon");
this.Lon.Name = "Lon";
this.Lon.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Alt
//
this.Alt.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Alt, "Alt");
this.Alt.Name = "Alt";
this.Alt.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Delete
//
resources.ApplyResources(this.Delete, "Delete");
this.Delete.Name = "Delete";
this.Delete.Text = "X";
//
// Up
//
this.Up.DefaultCellStyle = dataGridViewCellStyle3;
resources.ApplyResources(this.Up, "Up");
this.Up.Image = global::ArdupilotMega.Properties.Resources.up;
this.Up.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
this.Up.Name = "Up";
//
// Down
//
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.Down.DefaultCellStyle = dataGridViewCellStyle4;
resources.ApplyResources(this.Down, "Down");
this.Down.Image = global::ArdupilotMega.Properties.Resources.down;
this.Down.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
this.Down.Name = "Down";
//
// CHK_geheight
//
resources.ApplyResources(this.CHK_geheight, "CHK_geheight");
@ -599,7 +514,6 @@
//
// panelMap
//
this.panelMap.BackColor = System.Drawing.Color.Transparent;
this.panelMap.Controls.Add(this.lbl_distance);
this.panelMap.Controls.Add(this.lbl_homedist);
this.panelMap.Controls.Add(this.lbl_prevdist);
@ -615,19 +529,16 @@
// lbl_distance
//
resources.ApplyResources(this.lbl_distance, "lbl_distance");
this.lbl_distance.ForeColor = System.Drawing.Color.White;
this.lbl_distance.Name = "lbl_distance";
//
// lbl_homedist
//
resources.ApplyResources(this.lbl_homedist, "lbl_homedist");
this.lbl_homedist.ForeColor = System.Drawing.Color.White;
this.lbl_homedist.Name = "lbl_homedist";
//
// lbl_prevdist
//
resources.ApplyResources(this.lbl_prevdist, "lbl_prevdist");
this.lbl_prevdist.ForeColor = System.Drawing.Color.White;
this.lbl_prevdist.Name = "lbl_prevdist";
//
// MainMap
@ -981,7 +892,6 @@
// trackBar1
//
resources.ApplyResources(this.trackBar1, "trackBar1");
this.trackBar1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(39)))), ((int)(((byte)(40)))));
this.trackBar1.LargeChange = 50;
this.trackBar1.Maximum = 19D;
this.trackBar1.Minimum = 1D;
@ -995,7 +905,6 @@
// label11
//
resources.ApplyResources(this.label11, "label11");
this.label11.ForeColor = System.Drawing.Color.White;
this.label11.Name = "label11";
//
// panelBASE
@ -1013,6 +922,91 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// Command
//
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69)))));
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
this.Command.DefaultCellStyle = dataGridViewCellStyle2;
this.Command.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox;
resources.ApplyResources(this.Command, "Command");
this.Command.Name = "Command";
//
// Param1
//
this.Param1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Param1, "Param1");
this.Param1.Name = "Param1";
this.Param1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Param1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Param2
//
this.Param2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Param2, "Param2");
this.Param2.Name = "Param2";
this.Param2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Param2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Param3
//
this.Param3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Param3, "Param3");
this.Param3.Name = "Param3";
this.Param3.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Param3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Param4
//
this.Param4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Param4, "Param4");
this.Param4.Name = "Param4";
this.Param4.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Param4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Lat
//
this.Lat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Lat, "Lat");
this.Lat.Name = "Lat";
this.Lat.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Lon
//
this.Lon.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Lon, "Lon");
this.Lon.Name = "Lon";
this.Lon.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Alt
//
this.Alt.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
resources.ApplyResources(this.Alt, "Alt");
this.Alt.Name = "Alt";
this.Alt.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// Delete
//
resources.ApplyResources(this.Delete, "Delete");
this.Delete.Name = "Delete";
this.Delete.Text = "X";
//
// Up
//
this.Up.DefaultCellStyle = dataGridViewCellStyle3;
resources.ApplyResources(this.Up, "Up");
this.Up.Image = global::ArdupilotMega.Properties.Resources.up;
this.Up.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
this.Up.Name = "Up";
//
// Down
//
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.Down.DefaultCellStyle = dataGridViewCellStyle4;
resources.ApplyResources(this.Down, "Down");
this.Down.Image = global::ArdupilotMega.Properties.Resources.down;
this.Down.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
this.Down.Name = "Down";
//
// FlightPlanner
//
resources.ApplyResources(this, "$this");
@ -1104,17 +1098,6 @@
private System.Windows.Forms.ToolStripMenuItem jumpwPToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem deleteWPToolStripMenuItem;
private System.Windows.Forms.DataGridViewComboBoxColumn Command;
private System.Windows.Forms.DataGridViewTextBoxColumn Param1;
private System.Windows.Forms.DataGridViewTextBoxColumn Param2;
private System.Windows.Forms.DataGridViewTextBoxColumn Param3;
private System.Windows.Forms.DataGridViewTextBoxColumn Param4;
private System.Windows.Forms.DataGridViewTextBoxColumn Lat;
private System.Windows.Forms.DataGridViewTextBoxColumn Lon;
private System.Windows.Forms.DataGridViewTextBoxColumn Alt;
private System.Windows.Forms.DataGridViewButtonColumn Delete;
private System.Windows.Forms.DataGridViewImageColumn Up;
private System.Windows.Forms.DataGridViewImageColumn Down;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ToolStripMenuItem geoFenceToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem GeoFencedownloadToolStripMenuItem;
@ -1150,5 +1133,16 @@
private System.Windows.Forms.ToolStripMenuItem loadAndAppendToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem savePolygonToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem loadPolygonToolStripMenuItem;
private System.Windows.Forms.DataGridViewComboBoxColumn Command;
private System.Windows.Forms.DataGridViewTextBoxColumn Param1;
private System.Windows.Forms.DataGridViewTextBoxColumn Param2;
private System.Windows.Forms.DataGridViewTextBoxColumn Param3;
private System.Windows.Forms.DataGridViewTextBoxColumn Param4;
private System.Windows.Forms.DataGridViewTextBoxColumn Lat;
private System.Windows.Forms.DataGridViewTextBoxColumn Lon;
private System.Windows.Forms.DataGridViewTextBoxColumn Alt;
private System.Windows.Forms.DataGridViewButtonColumn Delete;
private System.Windows.Forms.DataGridViewImageColumn Up;
private System.Windows.Forms.DataGridViewImageColumn Down;
}
}

212
Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.resx
View File

@ -192,12 +192,12 @@
<data name="Command.HeaderText" xml:space="preserve">
<value>Command</value>
</data>
<data name="Command.MinimumWidth" type="System.Int32, mscorlib">
<value>30</value>
</data>
<data name="Command.ToolTipText" xml:space="preserve">
<value>APM Command</value>
</data>
<data name="Command.Width" type="System.Int32, mscorlib">
<value>150</value>
</data>
<metadata name="Param1.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -205,10 +205,10 @@
<value>P1</value>
</data>
<data name="Param1.MinimumWidth" type="System.Int32, mscorlib">
<value>40</value>
<value>30</value>
</data>
<data name="Param1.Width" type="System.Int32, mscorlib">
<value>40</value>
<value>30</value>
</data>
<metadata name="Param2.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -217,10 +217,10 @@
<value>P2</value>
</data>
<data name="Param2.MinimumWidth" type="System.Int32, mscorlib">
<value>40</value>
<value>30</value>
</data>
<data name="Param2.Width" type="System.Int32, mscorlib">
<value>40</value>
<value>30</value>
</data>
<metadata name="Param3.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -229,10 +229,10 @@
<value>P3</value>
</data>
<data name="Param3.MinimumWidth" type="System.Int32, mscorlib">
<value>40</value>
<value>30</value>
</data>
<data name="Param3.Width" type="System.Int32, mscorlib">
<value>40</value>
<value>30</value>
</data>
<metadata name="Param4.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -241,10 +241,10 @@
<value>P4</value>
</data>
<data name="Param4.MinimumWidth" type="System.Int32, mscorlib">
<value>40</value>
<value>30</value>
</data>
<data name="Param4.Width" type="System.Int32, mscorlib">
<value>40</value>
<value>30</value>
</data>
<metadata name="Lat.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -253,10 +253,10 @@
<value>Lat</value>
</data>
<data name="Lat.MinimumWidth" type="System.Int32, mscorlib">
<value>40</value>
<value>60</value>
</data>
<data name="Lat.Width" type="System.Int32, mscorlib">
<value>40</value>
<value>60</value>
</data>
<metadata name="Lon.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -265,10 +265,10 @@
<value>Lon</value>
</data>
<data name="Lon.MinimumWidth" type="System.Int32, mscorlib">
<value>40</value>
<value>60</value>
</data>
<data name="Lon.Width" type="System.Int32, mscorlib">
<value>40</value>
<value>60</value>
</data>
<metadata name="Alt.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -277,10 +277,10 @@
<value>Alt</value>
</data>
<data name="Alt.MinimumWidth" type="System.Int32, mscorlib">
<value>40</value>
<value>60</value>
</data>
<data name="Alt.Width" type="System.Int32, mscorlib">
<value>40</value>
<value>60</value>
</data>
<metadata name="Delete.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -556,7 +556,7 @@
<value>BUT_write</value>
</data>
<data name="&gt;&gt;BUT_write.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.38701, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.30460, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_write.Parent" xml:space="preserve">
<value>panel5</value>
@ -583,7 +583,7 @@
<value>BUT_read</value>
</data>
<data name="&gt;&gt;BUT_read.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.38701, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.30460, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_read.Parent" xml:space="preserve">
<value>panel5</value>
@ -1147,7 +1147,7 @@
<value>BUT_Add</value>
</data>
<data name="&gt;&gt;BUT_Add.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4708.38701, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4712.30460, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_Add.Parent" xml:space="preserve">
<value>panelWaypoints</value>
@ -1333,7 +1333,7 @@
<value>17, 17</value>
</metadata>
<data name="deleteWPToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="deleteWPToolStripMenuItem.Text" xml:space="preserve">
<value>Delete WP</value>
@ -1357,7 +1357,7 @@
<value>Circles</value>
</data>
<data name="loiterToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="loiterToolStripMenuItem.Text" xml:space="preserve">
<value>Loiter</value>
@ -1375,43 +1375,43 @@
<value>WP #</value>
</data>
<data name="jumpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="jumpToolStripMenuItem.Text" xml:space="preserve">
<value>Jump</value>
</data>
<data name="rTLToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="rTLToolStripMenuItem.Text" xml:space="preserve">
<value>RTL</value>
</data>
<data name="landToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="landToolStripMenuItem.Text" xml:space="preserve">
<value>Land</value>
</data>
<data name="takeoffToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="takeoffToolStripMenuItem.Text" xml:space="preserve">
<value>Takeoff</value>
</data>
<data name="setROIToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="setROIToolStripMenuItem.Text" xml:space="preserve">
<value>Set ROI</value>
</data>
<data name="clearMissionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="clearMissionToolStripMenuItem.Text" xml:space="preserve">
<value>Clear Mission</value>
</data>
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>149, 6</value>
<value>147, 6</value>
</data>
<data name="addPolygonPointToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
@ -1438,7 +1438,7 @@
<value>Load Polygon</value>
</data>
<data name="polygonToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="polygonToolStripMenuItem.Text" xml:space="preserve">
<value>Draw Polygon</value>
@ -1483,7 +1483,7 @@
<value>Save to File</value>
</data>
<data name="geoFenceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="geoFenceToolStripMenuItem.Text" xml:space="preserve">
<value>Geo-Fence</value>
@ -1507,7 +1507,7 @@
<value>GridV2</value>
</data>
<data name="autoWPToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="autoWPToolStripMenuItem.Text" xml:space="preserve">
<value>Auto WP</value>
@ -1561,7 +1561,7 @@
<value>Reverse WPs</value>
</data>
<data name="mapToolToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="mapToolToolStripMenuItem.Text" xml:space="preserve">
<value>Map Tool</value>
@ -1585,19 +1585,19 @@
<value>Save WP File</value>
</data>
<data name="fileLoadSaveToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="fileLoadSaveToolStripMenuItem.Text" xml:space="preserve">
<value>File Load/Save</value>
</data>
<data name="trackerHomeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="trackerHomeToolStripMenuItem.Text" xml:space="preserve">
<value>Tracker Home</value>
</data>
<data name="flyToHereToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="flyToHereToolStripMenuItem.Text" xml:space="preserve">
<value>Fly To Here</value>
@ -1606,7 +1606,7 @@
<value>False</value>
</data>
<data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>153, 362</value>
<value>151, 340</value>
</data>
<data name="&gt;&gt;contextMenuStrip1.Name" xml:space="preserve">
<value>contextMenuStrip1</value>
@ -1772,7 +1772,7 @@
<value>MainMap</value>
</data>
<data name="&gt;&gt;MainMap.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4708.38701, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4712.30460, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;MainMap.Parent" xml:space="preserve">
<value>panelMap</value>
@ -1802,7 +1802,7 @@
<value>trackBar1</value>
</data>
<data name="&gt;&gt;trackBar1.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4708.38701, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4712.30460, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;trackBar1.Parent" xml:space="preserve">
<value>panelMap</value>
@ -1909,72 +1909,6 @@
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>747, 461</value>
</data>
<data name="&gt;&gt;Command.Name" xml:space="preserve">
<value>Command</value>
</data>
<data name="&gt;&gt;Command.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Param1.Name" xml:space="preserve">
<value>Param1</value>
</data>
<data name="&gt;&gt;Param1.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Param2.Name" xml:space="preserve">
<value>Param2</value>
</data>
<data name="&gt;&gt;Param2.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Param3.Name" xml:space="preserve">
<value>Param3</value>
</data>
<data name="&gt;&gt;Param3.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Param4.Name" xml:space="preserve">
<value>Param4</value>
</data>
<data name="&gt;&gt;Param4.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Lat.Name" xml:space="preserve">
<value>Lat</value>
</data>
<data name="&gt;&gt;Lat.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Lon.Name" xml:space="preserve">
<value>Lon</value>
</data>
<data name="&gt;&gt;Lon.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Alt.Name" xml:space="preserve">
<value>Alt</value>
</data>
<data name="&gt;&gt;Alt.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Delete.Name" xml:space="preserve">
<value>Delete</value>
</data>
<data name="&gt;&gt;Delete.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewButtonColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Up.Name" xml:space="preserve">
<value>Up</value>
</data>
<data name="&gt;&gt;Up.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Down.Name" xml:space="preserve">
<value>Down</value>
</data>
<data name="&gt;&gt;Down.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;dataGridViewImageColumn1.Name" xml:space="preserve">
<value>dataGridViewImageColumn1</value>
</data>
@ -2275,10 +2209,76 @@
<data name="&gt;&gt;timer1.Type" xml:space="preserve">
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Command.Name" xml:space="preserve">
<value>Command</value>
</data>
<data name="&gt;&gt;Command.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Param1.Name" xml:space="preserve">
<value>Param1</value>
</data>
<data name="&gt;&gt;Param1.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Param2.Name" xml:space="preserve">
<value>Param2</value>
</data>
<data name="&gt;&gt;Param2.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Param3.Name" xml:space="preserve">
<value>Param3</value>
</data>
<data name="&gt;&gt;Param3.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Param4.Name" xml:space="preserve">
<value>Param4</value>
</data>
<data name="&gt;&gt;Param4.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Lat.Name" xml:space="preserve">
<value>Lat</value>
</data>
<data name="&gt;&gt;Lat.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Lon.Name" xml:space="preserve">
<value>Lon</value>
</data>
<data name="&gt;&gt;Lon.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Alt.Name" xml:space="preserve">
<value>Alt</value>
</data>
<data name="&gt;&gt;Alt.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Delete.Name" xml:space="preserve">
<value>Delete</value>
</data>
<data name="&gt;&gt;Delete.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewButtonColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Up.Name" xml:space="preserve">
<value>Up</value>
</data>
<data name="&gt;&gt;Up.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Down.Name" xml:space="preserve">
<value>Down</value>
</data>
<data name="&gt;&gt;Down.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>FlightPlanner</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4708.38701, Culture=neutral, PublicKeyToken=null</value>
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4712.30460, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

849
Tools/ArdupilotMegaPlanner/GCSViews/Simulation.resx
View File

File diff suppressed because it is too large Load Diff

47
Tools/ArdupilotMegaPlanner/MainV2.Designer.cs generated
View File

@ -40,23 +40,23 @@
this.MenuHelp = new System.Windows.Forms.ToolStripButton();
this.MenuConnect = new System.Windows.Forms.ToolStripButton();
this.toolStripConnectionControl = new ArdupilotMega.Controls.ToolStripConnectionControl();
this.menu = new ArdupilotMega.Controls.MyButton();
this.panel1 = new System.Windows.Forms.Panel();
this.MainMenu.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// MyView
//
this.MyView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(39)))), ((int)(((byte)(40)))));
this.MyView.Dock = System.Windows.Forms.DockStyle.Fill;
this.MyView.ForeColor = System.Drawing.Color.White;
this.MyView.Location = new System.Drawing.Point(0, 76);
this.MyView.Location = new System.Drawing.Point(0, 23);
this.MyView.Margin = new System.Windows.Forms.Padding(0);
this.MyView.Name = "MyView";
this.MyView.Size = new System.Drawing.Size(1008, 461);
this.MyView.Size = new System.Drawing.Size(1008, 514);
this.MyView.TabIndex = 3;
//
// MainMenu
//
this.MainMenu.BackColor = System.Drawing.SystemColors.Control;
this.MainMenu.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("MainMenu.BackgroundImage")));
this.MainMenu.GripMargin = new System.Windows.Forms.Padding(0);
this.MainMenu.ImageScalingSize = new System.Drawing.Size(76, 76);
@ -70,12 +70,12 @@
this.MenuHelp,
this.MenuConnect,
this.toolStripConnectionControl});
this.MainMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
this.MainMenu.Location = new System.Drawing.Point(0, 0);
this.MainMenu.Name = "MainMenu";
this.MainMenu.Padding = new System.Windows.Forms.Padding(0);
this.MainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
this.MainMenu.Size = new System.Drawing.Size(1008, 76);
this.MainMenu.Size = new System.Drawing.Size(900, 76);
this.MainMenu.Stretch = false;
this.MainMenu.TabIndex = 5;
this.MainMenu.Text = "menuStrip1";
this.MainMenu.MouseLeave += new System.EventHandler(this.MainMenu_MouseLeave);
@ -206,14 +206,39 @@
this.toolStripConnectionControl.Name = "toolStripConnectionControl";
this.toolStripConnectionControl.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0);
this.toolStripConnectionControl.Size = new System.Drawing.Size(233, 76);
this.toolStripConnectionControl.MouseLeave += new System.EventHandler(this.MainMenu_MouseLeave);
//
// menu
//
this.menu.Dock = System.Windows.Forms.DockStyle.Top;
this.menu.Location = new System.Drawing.Point(0, 0);
this.menu.Name = "menu";
this.menu.Size = new System.Drawing.Size(1008, 23);
this.menu.TabIndex = 6;
this.menu.Text = "Menu";
this.menu.UseVisualStyleBackColor = true;
this.menu.MouseEnter += new System.EventHandler(this.menu_MouseEnter);
//
// panel1
//
this.panel1.Controls.Add(this.MainMenu);
this.panel1.Location = new System.Drawing.Point(43, 46);
this.panel1.MaximumSize = new System.Drawing.Size(99999, 76);
this.panel1.MinimumSize = new System.Drawing.Size(900, 76);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(900, 76);
this.panel1.TabIndex = 7;
this.panel1.Visible = false;
this.panel1.MouseLeave += new System.EventHandler(this.MainMenu_MouseLeave);
//
// MainV2
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1008, 537);
this.Controls.Add(this.panel1);
this.Controls.Add(this.MyView);
this.Controls.Add(this.MainMenu);
this.Controls.Add(this.menu);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true;
this.MainMenuStrip = this.MainMenu;
@ -224,12 +249,12 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainV2_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainV2_FormClosed);
this.Load += new System.EventHandler(this.MainV2_Load);
this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.MainV2_MouseMove);
this.Resize += new System.EventHandler(this.MainV2_Resize);
this.MainMenu.ResumeLayout(false);
this.MainMenu.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
@ -248,5 +273,7 @@
private System.Windows.Forms.ToolStripButton MenuHelp;
private Controls.ToolStripConnectionControl toolStripConnectionControl;
private Controls.MyButton menu;
private System.Windows.Forms.Panel panel1;
}
}

20
Tools/ArdupilotMegaPlanner/MainV2.cs
View File

@ -2323,13 +2323,25 @@ namespace ArdupilotMega
private void MainMenu_MouseLeave(object sender, EventArgs e)
{
//MainMenu.Visible = false;
if (Control.MousePosition.Y < MainMenu.Bottom)
return;
this.SuspendLayout();
panel1.Visible = false;
this.ResumeLayout();
}
private void MainV2_MouseMove(object sender, MouseEventArgs e)
void menu_MouseEnter(object sender, EventArgs e)
{
// if (e.Y < 50)
// MainMenu.Visible = true;
this.SuspendLayout();
panel1.Location = new Point(0,0);
panel1.Visible = true;
panel1.Width = menu.Width;
panel1.BringToFront();
this.ResumeLayout();
}
}
}

331
Tools/ArdupilotMegaPlanner/Msi/installer.wxs
View File

@ -2,14 +2,14 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:difx="http://schemas.microsoft.com/wix/DifxAppExtension" xmlns:iis='http://schemas.microsoft.com/wix/IIsExtension' >
<Product Id="*" Name="Mission Planner" Language="1033" Version="1.2.20" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<Product Id="*" Name="Mission Planner" Language="1033" Version="1.2.21" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<Package Description="Mission Planner Installer" Comments="Mission Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" />
<Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
<UpgradeVersion OnlyDetect="yes" Minimum="1.2.20" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.2.20" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
<UpgradeVersion OnlyDetect="yes" Minimum="1.2.21" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
<UpgradeVersion OnlyDetect="no" Maximum="1.2.21" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
</Upgrade>
<InstallExecuteSequence>
@ -31,7 +31,7 @@
<Permission User="Everyone" GenericAll="yes" />
</CreateFolder>
</Component>
<Component Id="_comp1" Guid="d911f6e2-f253-439c-8dd9-5e5831b601aa">
<Component Id="_comp1" Guid="e654b084-6bd9-4884-ae1c-6d559ee7ccb1">
<File Id="_2" Source="..\bin\release\.gdbinit" />
<File Id="_3" Source="..\bin\release\.gitignore" />
<File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
@ -74,187 +74,186 @@
<File Id="_41" Source="..\bin\release\mavcmd.xml" />
<File Id="_42" Source="..\bin\release\MAVLink.xml" />
<File Id="_43" Source="..\bin\release\MetaDataExtractor.dll" />
<File Id="_44" Source="..\bin\release\Microsoft.DirectX.DirectInput.dll" />
<File Id="_45" Source="..\bin\release\Microsoft.DirectX.dll" />
<File Id="_46" Source="..\bin\release\Microsoft.Dynamic.dll" />
<File Id="_47" Source="..\bin\release\Microsoft.Scripting.Core.dll" />
<File Id="_48" Source="..\bin\release\Microsoft.Scripting.Debugging.dll" />
<File Id="_49" Source="..\bin\release\Microsoft.Scripting.dll" />
<File Id="_50" Source="..\bin\release\Microsoft.Scripting.ExtensionAttribute.dll" />
<File Id="_51" Source="..\bin\release\netDxf.dll" />
<File Id="_52" Source="..\bin\release\OpenTK.dll" />
<File Id="_53" Source="..\bin\release\OpenTK.dll.config" />
<File Id="_54" Source="..\bin\release\OpenTK.GLControl.dll" />
<File Id="_55" Source="..\bin\release\ParameterMetaData.xml" />
<File Id="_56" Source="..\bin\release\px4uploader.exe" />
<File Id="_57" Source="..\bin\release\px4uploader.exe.config" />
<File Id="_58" Source="..\bin\release\px4uploader.pdb" />
<File Id="_59" Source="..\bin\release\quadhil.xml" />
<File Id="_60" Source="..\bin\release\runme" />
<File Id="_61" Source="..\bin\release\serialsent.raw" />
<File Id="_62" Source="..\bin\release\SharpKml.dll" />
<File Id="_63" Source="..\bin\release\SharpKml.pdb" />
<File Id="_64" Source="..\bin\release\SharpKml.xml" />
<File Id="_65" Source="..\bin\release\System.Data.SQLite.dll" />
<File Id="_66" Source="..\bin\release\System.Reactive.dll" />
<File Id="_67" Source="..\bin\release\System.Reactive.xml" />
<File Id="_68" Source="..\bin\release\System.Speech.dll" />
<File Id="_69" Source="..\bin\release\Transitions.dll" />
<File Id="_70" Source="..\bin\release\Updater.exe" />
<File Id="_71" Source="..\bin\release\Updater.exe.config" />
<File Id="_72" Source="..\bin\release\Updater.pdb" />
<File Id="_73" Source="..\bin\release\version.exe" />
<File Id="_74" Source="..\bin\release\version.txt" />
<File Id="_75" Source="..\bin\release\ZedGraph.dll" />
<File Id="_44" Source="..\bin\release\Microsoft.DirectX.dll" />
<File Id="_45" Source="..\bin\release\Microsoft.Dynamic.dll" />
<File Id="_46" Source="..\bin\release\Microsoft.Scripting.Core.dll" />
<File Id="_47" Source="..\bin\release\Microsoft.Scripting.Debugging.dll" />
<File Id="_48" Source="..\bin\release\Microsoft.Scripting.dll" />
<File Id="_49" Source="..\bin\release\Microsoft.Scripting.ExtensionAttribute.dll" />
<File Id="_50" Source="..\bin\release\netDxf.dll" />
<File Id="_51" Source="..\bin\release\OpenTK.dll" />
<File Id="_52" Source="..\bin\release\OpenTK.dll.config" />
<File Id="_53" Source="..\bin\release\OpenTK.GLControl.dll" />
<File Id="_54" Source="..\bin\release\ParameterMetaData.xml" />
<File Id="_55" Source="..\bin\release\px4uploader.exe" />
<File Id="_56" Source="..\bin\release\px4uploader.exe.config" />
<File Id="_57" Source="..\bin\release\px4uploader.pdb" />
<File Id="_58" Source="..\bin\release\quadhil.xml" />
<File Id="_59" Source="..\bin\release\runme" />
<File Id="_60" Source="..\bin\release\serialsent.raw" />
<File Id="_61" Source="..\bin\release\SharpKml.dll" />
<File Id="_62" Source="..\bin\release\SharpKml.pdb" />
<File Id="_63" Source="..\bin\release\SharpKml.xml" />
<File Id="_64" Source="..\bin\release\System.Data.SQLite.dll" />
<File Id="_65" Source="..\bin\release\System.Reactive.dll" />
<File Id="_66" Source="..\bin\release\System.Reactive.xml" />
<File Id="_67" Source="..\bin\release\System.Speech.dll" />
<File Id="_68" Source="..\bin\release\Transitions.dll" />
<File Id="_69" Source="..\bin\release\Updater.exe" />
<File Id="_70" Source="..\bin\release\Updater.exe.config" />
<File Id="_71" Source="..\bin\release\Updater.pdb" />
<File Id="_72" Source="..\bin\release\version.exe" />
<File Id="_73" Source="..\bin\release\version.txt" />
<File Id="_74" Source="..\bin\release\ZedGraph.dll" />
</Component>
<Directory Id="aircraft75" Name="aircraft">
<Component Id="_comp76" Guid="4c44492f-eb3d-4339-99b8-a1296f60bc6b">
<File Id="_77" Source="..\bin\release\aircraft\placeholder.txt" />
<Directory Id="aircraft74" Name="aircraft">
<Component Id="_comp75" Guid="402ad9db-624b-454f-a630-ff9bed2b575f">
<File Id="_76" Source="..\bin\release\aircraft\placeholder.txt" />
</Component>
<Directory Id="arducopter77" Name="arducopter">
<Component Id="_comp78" Guid="2f5c005a-1dc5-4c19-833f-b7dfc2c2b46a">
<File Id="_79" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
<File Id="_80" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
<File Id="_81" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
<File Id="_82" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
<File Id="_83" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
<File Id="_84" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
<File Id="_85" Source="..\bin\release\aircraft\arducopter\quad.nas" />
<File Id="_86" Source="..\bin\release\aircraft\arducopter\README" />
<Directory Id="arducopter76" Name="arducopter">
<Component Id="_comp77" Guid="82fcb803-f38c-4044-944e-ea93fce2a74b">
<File Id="_78" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
<File Id="_79" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
<File Id="_80" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
<File Id="_81" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
<File Id="_82" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
<File Id="_83" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
<File Id="_84" Source="..\bin\release\aircraft\arducopter\quad.nas" />
<File Id="_85" Source="..\bin\release\aircraft\arducopter\README" />
</Component>
<Directory Id="data86" Name="data">
<Component Id="_comp87" Guid="1aeed201-06b7-4cad-901b-23e8b437f683">
<File Id="_88" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
<File Id="_89" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
<File Id="_90" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
<Directory Id="data85" Name="data">
<Component Id="_comp86" Guid="474c8cf9-8968-4ca4-93db-5cd15bf81761">
<File Id="_87" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
<File Id="_88" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
<File Id="_89" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
</Component>
</Directory>
<Directory Id="Engines90" Name="Engines">
<Component Id="_comp91" Guid="6af94f2c-2da6-4991-8e26-d7d467a64883">
<File Id="_92" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
<File Id="_93" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
<Directory Id="Engines89" Name="Engines">
<Component Id="_comp90" Guid="06035b0f-d4e9-4ebc-8f82-a4e553fa37e5">
<File Id="_91" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
<File Id="_92" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
</Component>
</Directory>
<Directory Id="Models93" Name="Models">
<Component Id="_comp94" Guid="2cab236e-d8b5-418b-8f36-cdc18c02211b">
<File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
<File Id="_96" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
<File Id="_97" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
<File Id="_98" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
<File Id="_99" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
<File Id="_100" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
<File Id="_101" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
<File Id="_102" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
<File Id="_103" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
<Directory Id="Models92" Name="Models">
<Component Id="_comp93" Guid="4c664b73-72df-4090-b352-89db61bc37ac">
<File Id="_94" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
<File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
<File Id="_96" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
<File Id="_97" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
<File Id="_98" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
<File Id="_99" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
<File Id="_100" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
<File Id="_101" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
<File Id="_102" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
</Component>
</Directory>
</Directory>
<Directory Id="Rascal103" Name="Rascal">
<Component Id="_comp104" Guid="bb7432d3-b239-43c2-803f-82e83a167d5a">
<File Id="_105" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
<File Id="_106" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
<File Id="_107" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
<File Id="_108" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
<File Id="_109" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
<File Id="_110" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
<File Id="_111" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
<File Id="_112" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
<File Id="_113" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
<Directory Id="Rascal102" Name="Rascal">
<Component Id="_comp103" Guid="f7d470c1-3384-4300-8e96-56a8efb94b8a">
<File Id="_104" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
<File Id="_105" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
<File Id="_106" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
<File Id="_107" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
<File Id="_108" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
<File Id="_109" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
<File Id="_110" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
<File Id="_111" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
<File Id="_112" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
</Component>
<Directory Id="Engines113" Name="Engines">
<Component Id="_comp114" Guid="163c4bdb-3f66-49d0-972d-6939c80d7521">
<File Id="_115" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
<File Id="_116" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
<Directory Id="Engines112" Name="Engines">
<Component Id="_comp113" Guid="1f3dd3f3-232a-41ff-b06f-97630eedc0ec">
<File Id="_114" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
<File Id="_115" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
</Component>
</Directory>
<Directory Id="Models116" Name="Models">
<Component Id="_comp117" Guid="1ccc0310-315e-4b54-864b-0ba60d8b168b">
<File Id="_118" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
<File Id="_119" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
<File Id="_122" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
<File Id="_123" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
<File Id="_124" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
<Directory Id="Models115" Name="Models">
<Component Id="_comp116" Guid="64abc35f-12ca-4a30-b88c-8de846019468">
<File Id="_117" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
<File Id="_118" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
<File Id="_119" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
<File Id="_122" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
<File Id="_123" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
</Component>
</Directory>
<Directory Id="Systems124" Name="Systems">
<Component Id="_comp125" Guid="9cc1c97a-0fa5-40c4-a9fd-3d1fcf6af125">
<File Id="_126" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
<File Id="_127" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
<File Id="_128" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
<File Id="_129" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
<File Id="_130" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
<Directory Id="Systems123" Name="Systems">
<Component Id="_comp124" Guid="36cfe164-6ce3-4eae-982f-a482941e89bd">
<File Id="_125" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
<File Id="_126" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
<File Id="_127" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
<File Id="_128" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
<File Id="_129" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
</Component>
</Directory>
</Directory>
</Directory>
<Directory Id="de_DE130" Name="de-DE">
<Component Id="_comp131" Guid="fe2a53b7-109f-4754-91c2-f30d17dcf033">
<File Id="_132" Source="..\bin\release\de-DE\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="de_DE129" Name="de-DE">
<Component Id="_comp130" Guid="f5739022-37df-4486-a284-29b93ec703a8">
<File Id="_131" Source="..\bin\release\de-DE\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="es_ES132" Name="es-ES">
<Component Id="_comp133" Guid="4530dab9-2588-4650-8803-d2bdb44bd3b9">
<File Id="_134" Source="..\bin\release\es-ES\ArdupilotMegaPlanner.resources.dll" />
<File Id="_135" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="es_ES131" Name="es-ES">
<Component Id="_comp132" Guid="e55869ea-8d23-478b-b4ec-d84f3ed1eb3f">
<File Id="_133" Source="..\bin\release\es-ES\ArdupilotMegaPlanner.resources.dll" />
<File Id="_134" Source="..\bin\release\es-ES\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="fr135" Name="fr">
<Component Id="_comp136" Guid="5f3ed7e7-02d0-4db7-b6af-0e5f393770b1">
<File Id="_137" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
<File Id="_138" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="fr134" Name="fr">
<Component Id="_comp135" Guid="9b707a6d-40a4-4301-9acd-7a57f53d5821">
<File Id="_136" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
<File Id="_137" Source="..\bin\release\fr\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="it_IT138" Name="it-IT">
<Component Id="_comp139" Guid="b597bcf2-1616-48ee-911d-16b08abf2545">
<File Id="_140" Source="..\bin\release\it-IT\ArdupilotMegaPlanner.resources.dll" />
<File Id="_141" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="it_IT137" Name="it-IT">
<Component Id="_comp138" Guid="62191055-4ad4-4169-9f7a-786df342ba6e">
<File Id="_139" Source="..\bin\release\it-IT\ArdupilotMegaPlanner.resources.dll" />
<File Id="_140" Source="..\bin\release\it-IT\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="jsbsim141" Name="jsbsim">
<Component Id="_comp142" Guid="5d050855-4f5c-481a-a614-256caa3292e0">
<File Id="_143" Source="..\bin\release\jsbsim\fgout.xml" />
<File Id="_144" Source="..\bin\release\jsbsim\rascal_test.xml" />
<Directory Id="jsbsim140" Name="jsbsim">
<Component Id="_comp141" Guid="32ea63dc-d4c0-4ccd-b873-94ec4dedd5c4">
<File Id="_142" Source="..\bin\release\jsbsim\fgout.xml" />
<File Id="_143" Source="..\bin\release\jsbsim\rascal_test.xml" />
</Component>
</Directory>
<Directory Id="m3u144" Name="m3u">
<Component Id="_comp145" Guid="f71074d9-4e75-4e8a-af4d-a08137185fa6">
<File Id="_146" Source="..\bin\release\m3u\both.m3u" />
<File Id="_147" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
<File Id="_148" Source="..\bin\release\m3u\hud.m3u" />
<File Id="_149" Source="..\bin\release\m3u\map.m3u" />
<File Id="_150" Source="..\bin\release\m3u\networklink.kml" />
<Directory Id="m3u143" Name="m3u">
<Component Id="_comp144" Guid="22b935c4-97b5-49dd-a9ac-4340af9148d1">
<File Id="_145" Source="..\bin\release\m3u\both.m3u" />
<File Id="_146" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
<File Id="_147" Source="..\bin\release\m3u\hud.m3u" />
<File Id="_148" Source="..\bin\release\m3u\map.m3u" />
<File Id="_149" Source="..\bin\release\m3u\networklink.kml" />
</Component>
</Directory>
<Directory Id="pl150" Name="pl">
<Component Id="_comp151" Guid="d05e244f-9dbf-42cb-b241-fd0f0c6bdc49">
<File Id="_152" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
<File Id="_153" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="pl149" Name="pl">
<Component Id="_comp150" Guid="6a1b1941-9ca8-40a5-8b02-fe1803ddc4c8">
<File Id="_151" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
<File Id="_152" Source="..\bin\release\pl\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="Resources153" Name="Resources">
<Component Id="_comp154" Guid="c2fafcf2-c67d-4334-9f97-51a8cc613146">
<File Id="_155" Source="..\bin\release\Resources\MAVCmd.txt" />
<File Id="_156" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
<Directory Id="Resources152" Name="Resources">
<Component Id="_comp153" Guid="b02671a3-8a3e-4d48-822f-1a61600528b7">
<File Id="_154" Source="..\bin\release\Resources\MAVCmd.txt" />
<File Id="_155" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
</Component>
</Directory>
<Directory Id="ru_RU156" Name="ru-RU">
<Component Id="_comp157" Guid="d8eb7708-ee5f-4e12-90e6-3019478107fa">
<File Id="_158" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner.resources.dll" />
<File Id="_159" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="ru_RU155" Name="ru-RU">
<Component Id="_comp156" Guid="af9baa42-5893-4a93-916b-5fb2c2b54e73">
<File Id="_157" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner.resources.dll" />
<File Id="_158" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="zh_Hans159" Name="zh-Hans">
<Component Id="_comp160" Guid="319a3e9e-8b55-44ce-97c4-df60ad19c446">
<File Id="_161" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner.resources.dll" />
<File Id="_162" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="zh_Hans158" Name="zh-Hans">
<Component Id="_comp159" Guid="a574c1ec-207c-4d11-aefb-db1122cfc397">
<File Id="_160" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner.resources.dll" />
<File Id="_161" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
<Directory Id="zh_TW162" Name="zh-TW">
<Component Id="_comp163" Guid="271b6ad8-7763-4bfe-aaa7-51fe7063caf5">
<File Id="_164" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
<File Id="_165" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
<Directory Id="zh_TW161" Name="zh-TW">
<Component Id="_comp162" Guid="25e014cf-d4c7-44d9-a028-ac231129a956">
<File Id="_163" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
<File Id="_164" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner10.resources.dll" />
</Component>
</Directory>
@ -312,26 +311,26 @@
<ComponentRef Id="InstallDirPermissions" />
<ComponentRef Id="_comp1" />
<ComponentRef Id="_comp76" />
<ComponentRef Id="_comp78" />
<ComponentRef Id="_comp87" />
<ComponentRef Id="_comp91" />
<ComponentRef Id="_comp94" />
<ComponentRef Id="_comp104" />
<ComponentRef Id="_comp114" />
<ComponentRef Id="_comp117" />
<ComponentRef Id="_comp125" />
<ComponentRef Id="_comp131" />
<ComponentRef Id="_comp133" />
<ComponentRef Id="_comp136" />
<ComponentRef Id="_comp139" />
<ComponentRef Id="_comp142" />
<ComponentRef Id="_comp145" />
<ComponentRef Id="_comp151" />
<ComponentRef Id="_comp154" />
<ComponentRef Id="_comp157" />
<ComponentRef Id="_comp160" />
<ComponentRef Id="_comp163" />
<ComponentRef Id="_comp75" />
<ComponentRef Id="_comp77" />
<ComponentRef Id="_comp86" />
<ComponentRef Id="_comp90" />
<ComponentRef Id="_comp93" />
<ComponentRef Id="_comp103" />
<ComponentRef Id="_comp113" />
<ComponentRef Id="_comp116" />
<ComponentRef Id="_comp124" />
<ComponentRef Id="_comp130" />
<ComponentRef Id="_comp132" />
<ComponentRef Id="_comp135" />
<ComponentRef Id="_comp138" />
<ComponentRef Id="_comp141" />
<ComponentRef Id="_comp144" />
<ComponentRef Id="_comp150" />
<ComponentRef Id="_comp153" />
<ComponentRef Id="_comp156" />
<ComponentRef Id="_comp159" />
<ComponentRef Id="_comp162" />
<ComponentRef Id="ApplicationShortcut" />

2
Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
View File

@ -34,5 +34,5 @@ using System.Resources;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.*")]
[assembly: AssemblyFileVersion("1.2.21")]
[assembly: AssemblyFileVersion("1.2.22")]
[assembly: NeutralResourcesLanguageAttribute("")]

58
Tools/ArdupilotMegaPlanner/Utilities/ThemeManager.cs
View File

@ -29,6 +29,8 @@ namespace ArdupilotMega.Utilities
/// Standard Planner Charcoal & Green colours
/// </summary>
BurntKermit,
Test,
}
/// <summary>
@ -53,6 +55,9 @@ namespace ArdupilotMega.Utilities
break;
// More themes go here
case Themes.Test:
ApplyTestTheme(control, 0);
break;
default:
break;
@ -61,6 +66,26 @@ namespace ArdupilotMega.Utilities
}
private static void ApplyTestTheme(Control temp, int level)
{
foreach (Control ctl in temp.Controls)
{
if (ctl.GetType() == typeof(MyButton))
{
ArdupilotMega.Controls.MyButton but = (MyButton)ctl;
but.BGGradTop = SystemColors.ControlLight;
but.BGGradBot = SystemColors.ControlDark;
but.TextColor = SystemColors.ControlText;
but.Outline = SystemColors.ControlDark;
}
if (ctl.Controls.Count > 0)
ApplyTestTheme(ctl, 1);
}
}
private static void ApplyBurntKermitTheme(Control temp, int level)
{
Color BGColor = Color.FromArgb(0x26, 0x27, 0x28); // background
@ -70,45 +95,52 @@ namespace ArdupilotMega.Utilities
if (level == 0)
{
temp.BackColor = BGColor;
temp.ForeColor = TextColor;// Color.FromArgb(0xe6, 0xe8, 0xea);
temp.ForeColor = TextColor;
}
//temp.Font = new Font("Lucida Console", 8.25f);
foreach (Control ctl in temp.Controls)
{
if (ctl.GetType() == typeof(Button))
if (ctl.GetType() == typeof(Panel))
{
ctl.BackColor = BGColor;
ctl.ForeColor = TextColor;
}
else if (ctl.GetType() == typeof(GroupBox))
{
ctl.BackColor = BGColor;
ctl.ForeColor = TextColor;
}
else if (ctl.GetType() == typeof(MyLabel))
{
ctl.BackColor = BGColor;
ctl.ForeColor = TextColor;
}
else if (ctl.GetType() == typeof(Button))
{
ctl.ForeColor = Color.Black;
}
else if (ctl.GetType() == typeof(MyButton))
{
Color PrimeColor = Color.FromArgb(0x94, 0xc1, 0x1f);
ArdupilotMega.Controls.MyButton but = (MyButton)ctl;
//but.BGGradTop = Color.FromArgb(PrimeColor.R, PrimeColor.G, PrimeColor.B);
//but.BGGradBot = Color.FromArgb(255 - (int)(PrimeColor.R * 0.27), 255 - (int)(PrimeColor.G * 0.14), 255 - (int)(PrimeColor.B * 0.79));
//but.ForeColor = Color.FromArgb(0x40, 0x57, 0x04); //Color.FromArgb(255 - (int)(PrimeColor.R * 0.7), 255 - (int)(PrimeColor.G * 0.8), 255 - (int)(PrimeColor.B * 0.1));
//but.Outline = ControlBGColor;
}
else if (ctl.GetType() == typeof(TextBox))
{
ctl.BackColor = ControlBGColor;
ctl.ForeColor = TextColor;// Color.FromArgb(0xe6, 0xe8, 0xea);
ctl.ForeColor = TextColor;
TextBox txt = (TextBox)ctl;
txt.BorderStyle = BorderStyle.None;
}
else if (ctl.GetType() == typeof(DomainUpDown))
{
ctl.BackColor = ControlBGColor;
ctl.ForeColor = TextColor;// Color.FromArgb(0xe6, 0xe8, 0xea);
ctl.ForeColor = TextColor;
DomainUpDown txt = (DomainUpDown)ctl;
txt.BorderStyle = BorderStyle.None;
}
else if (ctl.GetType() == typeof(GroupBox) || ctl.GetType() == typeof(UserControl))
{
ctl.BackColor = BGColor;
ctl.ForeColor = TextColor;// Color.FromArgb(0xe6, 0xe8, 0xea);
ctl.ForeColor = TextColor;
}
else if (ctl.GetType() == typeof(ZedGraph.ZedGraphControl))
{