mirror of https://github.com/ArduPilot/ardupilot
APM Planner 1.1.9
mavlink update firmware wait increased. for dataflash clearing geofence now working
This commit is contained in:
parent
f243944e01
commit
04150823e2
File diff suppressed because it is too large
Load Diff
|
@ -1,120 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<root>
|
|
||||||
<!--
|
|
||||||
Microsoft ResX Schema
|
|
||||||
|
|
||||||
Version 2.0
|
|
||||||
|
|
||||||
The primary goals of this format is to allow a simple XML format
|
|
||||||
that is mostly human readable. The generation and parsing of the
|
|
||||||
various data types are done through the TypeConverter classes
|
|
||||||
associated with the data types.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
... ado.net/XML headers & schema ...
|
|
||||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
|
||||||
<resheader name="version">2.0</resheader>
|
|
||||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
|
||||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
|
||||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
|
||||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
|
||||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
|
||||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
|
||||||
</data>
|
|
||||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
|
||||||
<comment>This is a comment</comment>
|
|
||||||
</data>
|
|
||||||
|
|
||||||
There are any number of "resheader" rows that contain simple
|
|
||||||
name/value pairs.
|
|
||||||
|
|
||||||
Each data row contains a name, and value. The row also contains a
|
|
||||||
type or mimetype. Type corresponds to a .NET class that support
|
|
||||||
text/value conversion through the TypeConverter architecture.
|
|
||||||
Classes that don't support this are serialized and stored with the
|
|
||||||
mimetype set.
|
|
||||||
|
|
||||||
The mimetype is used for serialized objects, and tells the
|
|
||||||
ResXResourceReader how to depersist the object. This is currently not
|
|
||||||
extensible. For a given mimetype the value must be set accordingly:
|
|
||||||
|
|
||||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
|
||||||
that the ResXResourceWriter will generate, however the reader can
|
|
||||||
read any of the formats listed below.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.binary.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.soap.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
|
||||||
value : The object must be serialized into a byte array
|
|
||||||
: using a System.ComponentModel.TypeConverter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
-->
|
|
||||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:choice maxOccurs="unbounded">
|
|
||||||
<xsd:element name="metadata">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
|
||||||
<xsd:attribute ref="xml:space" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="assembly">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:attribute name="alias" type="xsd:string" />
|
|
||||||
<xsd:attribute name="name" type="xsd:string" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="data">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
|
||||||
<xsd:attribute ref="xml:space" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="resheader">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:choice>
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:schema>
|
|
||||||
<resheader name="resmimetype">
|
|
||||||
<value>text/microsoft-resx</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="version">
|
|
||||||
<value>2.0</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="reader">
|
|
||||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="writer">
|
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
</root>
|
|
|
@ -187,20 +187,36 @@
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\..\..\..\Desktop\DIYDrones\myquad\sharpkml\SharpKml\bin\Release\SharpKml.dll</HintPath>
|
<HintPath>..\..\..\..\..\Desktop\DIYDrones\myquad\sharpkml\SharpKml\bin\Release\SharpKml.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System">
|
||||||
<Reference Include="System.configuration" />
|
<Private>False</Private>
|
||||||
<Reference Include="System.Data" />
|
</Reference>
|
||||||
|
<Reference Include="System.configuration">
|
||||||
|
<Private>False</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Data">
|
||||||
|
<Private>False</Private>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Data.SQLite">
|
<Reference Include="System.Data.SQLite">
|
||||||
<HintPath>..\..\..\..\..\Desktop\DIYDrones\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\x86\System.Data.SQLite.DLL</HintPath>
|
<HintPath>..\..\..\..\..\Desktop\DIYDrones\myquad\greatmaps_e1bb830a18a3\Demo.WindowsForms\bin\Debug\x86\System.Data.SQLite.DLL</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing">
|
||||||
<Reference Include="System.Management" />
|
<Private>False</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Management">
|
||||||
|
<Private>False</Private>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Speech">
|
<Reference Include="System.Speech">
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Web" />
|
<Reference Include="System.Web">
|
||||||
<Reference Include="System.Windows.Forms" />
|
<Private>False</Private>
|
||||||
<Reference Include="System.Xml" />
|
</Reference>
|
||||||
|
<Reference Include="System.Windows.Forms">
|
||||||
|
<Private>False</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Xml">
|
||||||
|
<Private>False</Private>
|
||||||
|
</Reference>
|
||||||
<Reference Include="ZedGraph, Version=5.1.2.878, Culture=neutral, PublicKeyToken=02a83cbd123fcd60, processorArchitecture=MSIL">
|
<Reference Include="ZedGraph, Version=5.1.2.878, Culture=neutral, PublicKeyToken=02a83cbd123fcd60, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\ArdupilotSim\ArdupilotSim\bin\Release\ZedGraph.dll</HintPath>
|
<HintPath>..\..\ArdupilotSim\ArdupilotSim\bin\Release\ZedGraph.dll</HintPath>
|
||||||
|
|
|
@ -197,6 +197,12 @@ namespace ArdupilotMega
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public PointLatLngAlt(GMap.NET.PointLatLng pll)
|
||||||
|
{
|
||||||
|
this.Lat = pll.Lat;
|
||||||
|
this.Lng = pll.Lng;
|
||||||
|
}
|
||||||
|
|
||||||
public PointLatLng Point()
|
public PointLatLng Point()
|
||||||
{
|
{
|
||||||
return new PointLatLng(Lat, Lng);
|
return new PointLatLng(Lat, Lng);
|
||||||
|
|
|
@ -685,7 +685,7 @@ namespace ArdupilotMega.GCSViews
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
lbl_status.Text = "Write Done... Waiting (60 sec)";
|
lbl_status.Text = "Write Done... Waiting (90 sec)";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -698,8 +698,32 @@ namespace ArdupilotMega.GCSViews
|
||||||
|
|
||||||
Application.DoEvents();
|
Application.DoEvents();
|
||||||
|
|
||||||
System.Threading.Thread.Sleep(60000); // 10 seconds - new apvar erases eeprom on new format version, this should buy us some time.
|
try
|
||||||
|
{
|
||||||
|
((SerialPort)port).Open();
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
|
||||||
|
DateTime startwait = DateTime.Now;
|
||||||
|
|
||||||
|
while ((DateTime.Now - startwait).TotalSeconds < 90)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Console.Write(((SerialPort)port).ReadExisting().Replace("\0"," "));
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
System.Threading.Thread.Sleep(1000);
|
||||||
|
progress.Value = (int)((DateTime.Now - startwait).TotalSeconds / 90.0 * 100);
|
||||||
|
progress.Refresh();
|
||||||
|
}
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((SerialPort)port).Close();
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
|
||||||
|
progress.Value = 100;
|
||||||
lbl_status.Text = "Done";
|
lbl_status.Text = "Done";
|
||||||
}
|
}
|
||||||
catch (Exception ex) { lbl_status.Text = "Failed upload"; MessageBox.Show("Check port settings or Port in use? " + ex.ToString()); port.Close(); }
|
catch (Exception ex) { lbl_status.Text = "Failed upload"; MessageBox.Show("Check port settings or Port in use? " + ex.ToString()); port.Close(); }
|
||||||
|
|
|
@ -60,6 +60,7 @@ namespace ArdupilotMega.GCSViews
|
||||||
CurveItem list10curve;
|
CurveItem list10curve;
|
||||||
|
|
||||||
internal static GMapOverlay kmlpolygons;
|
internal static GMapOverlay kmlpolygons;
|
||||||
|
internal static GMapOverlay geofence;
|
||||||
|
|
||||||
bool huddropout = false;
|
bool huddropout = false;
|
||||||
bool huddropoutresize = false;
|
bool huddropoutresize = false;
|
||||||
|
@ -92,9 +93,6 @@ namespace ArdupilotMega.GCSViews
|
||||||
myhud = hud1;
|
myhud = hud1;
|
||||||
MainHcopy = MainH;
|
MainHcopy = MainH;
|
||||||
|
|
||||||
int checkme;
|
|
||||||
//Control.CheckForIllegalCrossThreadCalls = false; // so can update display from another thread
|
|
||||||
|
|
||||||
// setup default tuning graph
|
// setup default tuning graph
|
||||||
if (MainV2.config["Tuning_Graph_Selected"] != null)
|
if (MainV2.config["Tuning_Graph_Selected"] != null)
|
||||||
{
|
{
|
||||||
|
@ -164,6 +162,9 @@ namespace ArdupilotMega.GCSViews
|
||||||
kmlpolygons = new GMapOverlay(gMapControl1, "kmlpolygons");
|
kmlpolygons = new GMapOverlay(gMapControl1, "kmlpolygons");
|
||||||
gMapControl1.Overlays.Add(kmlpolygons);
|
gMapControl1.Overlays.Add(kmlpolygons);
|
||||||
|
|
||||||
|
geofence = new GMapOverlay(gMapControl1, "geofence");
|
||||||
|
gMapControl1.Overlays.Add(geofence);
|
||||||
|
|
||||||
polygons = new GMapOverlay(gMapControl1, "polygons");
|
polygons = new GMapOverlay(gMapControl1, "polygons");
|
||||||
gMapControl1.Overlays.Add(polygons);
|
gMapControl1.Overlays.Add(polygons);
|
||||||
|
|
||||||
|
|
|
@ -31,14 +31,14 @@
|
||||||
{
|
{
|
||||||
this.components = new System.ComponentModel.Container();
|
this.components = new System.ComponentModel.Container();
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlightPlanner));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlightPlanner));
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
this.CHK_altmode = new System.Windows.Forms.CheckBox();
|
this.CHK_altmode = new System.Windows.Forms.CheckBox();
|
||||||
this.CHK_holdalt = new System.Windows.Forms.CheckBox();
|
this.CHK_holdalt = new System.Windows.Forms.CheckBox();
|
||||||
this.Commands = new System.Windows.Forms.DataGridView();
|
this.Commands = new System.Windows.Forms.DataGridView();
|
||||||
|
@ -114,7 +114,7 @@
|
||||||
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
this.ContextMeasure = new System.Windows.Forms.ToolStripMenuItem();
|
this.ContextMeasure = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.rotateMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.rotateMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.gridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.polygonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.addPolygonPointToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.addPolygonPointToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.clearPolygonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.clearPolygonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.clearMissionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.clearMissionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
@ -123,6 +123,9 @@
|
||||||
this.panelBASE = new System.Windows.Forms.Panel();
|
this.panelBASE = new System.Windows.Forms.Panel();
|
||||||
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
||||||
this.timer1 = new System.Windows.Forms.Timer(this.components);
|
this.timer1 = new System.Windows.Forms.Timer(this.components);
|
||||||
|
this.geoFenceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.GeoFenceuploadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.GeoFencedownloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.Commands)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.Commands)).BeginInit();
|
||||||
this.panel5.SuspendLayout();
|
this.panel5.SuspendLayout();
|
||||||
this.panel1.SuspendLayout();
|
this.panel1.SuspendLayout();
|
||||||
|
@ -154,14 +157,14 @@
|
||||||
//
|
//
|
||||||
this.Commands.AllowUserToAddRows = false;
|
this.Commands.AllowUserToAddRows = false;
|
||||||
resources.ApplyResources(this.Commands, "Commands");
|
resources.ApplyResources(this.Commands, "Commands");
|
||||||
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||||
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
|
dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control;
|
||||||
dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
|
dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||||
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||||
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||||
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.Commands.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
|
this.Commands.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
|
||||||
this.Commands.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
this.Commands.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||||
this.Command,
|
this.Command,
|
||||||
this.Param1,
|
this.Param1,
|
||||||
|
@ -175,17 +178,17 @@
|
||||||
this.Up,
|
this.Up,
|
||||||
this.Down});
|
this.Down});
|
||||||
this.Commands.Name = "Commands";
|
this.Commands.Name = "Commands";
|
||||||
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||||
dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
|
dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control;
|
||||||
dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
|
dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||||
dataGridViewCellStyle5.Format = "N0";
|
dataGridViewCellStyle21.Format = "N0";
|
||||||
dataGridViewCellStyle5.NullValue = "0";
|
dataGridViewCellStyle21.NullValue = "0";
|
||||||
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||||
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||||
this.Commands.RowHeadersDefaultCellStyle = dataGridViewCellStyle5;
|
this.Commands.RowHeadersDefaultCellStyle = dataGridViewCellStyle21;
|
||||||
dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
|
dataGridViewCellStyle22.ForeColor = System.Drawing.Color.Black;
|
||||||
this.Commands.RowsDefaultCellStyle = dataGridViewCellStyle6;
|
this.Commands.RowsDefaultCellStyle = dataGridViewCellStyle22;
|
||||||
this.Commands.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellContentClick);
|
this.Commands.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellContentClick);
|
||||||
this.Commands.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellEndEdit);
|
this.Commands.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.Commands_CellEndEdit);
|
||||||
this.Commands.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.Commands_DataError);
|
this.Commands.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.Commands_DataError);
|
||||||
|
@ -197,9 +200,9 @@
|
||||||
//
|
//
|
||||||
// Command
|
// Command
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69)))));
|
dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(67)))), ((int)(((byte)(68)))), ((int)(((byte)(69)))));
|
||||||
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
|
dataGridViewCellStyle18.ForeColor = System.Drawing.Color.White;
|
||||||
this.Command.DefaultCellStyle = dataGridViewCellStyle2;
|
this.Command.DefaultCellStyle = dataGridViewCellStyle18;
|
||||||
this.Command.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox;
|
this.Command.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox;
|
||||||
resources.ApplyResources(this.Command, "Command");
|
resources.ApplyResources(this.Command, "Command");
|
||||||
this.Command.Name = "Command";
|
this.Command.Name = "Command";
|
||||||
|
@ -265,7 +268,7 @@
|
||||||
//
|
//
|
||||||
// Up
|
// Up
|
||||||
//
|
//
|
||||||
this.Up.DefaultCellStyle = dataGridViewCellStyle3;
|
this.Up.DefaultCellStyle = dataGridViewCellStyle19;
|
||||||
resources.ApplyResources(this.Up, "Up");
|
resources.ApplyResources(this.Up, "Up");
|
||||||
this.Up.Image = global::ArdupilotMega.Properties.Resources.up;
|
this.Up.Image = global::ArdupilotMega.Properties.Resources.up;
|
||||||
this.Up.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
this.Up.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
||||||
|
@ -273,8 +276,8 @@
|
||||||
//
|
//
|
||||||
// Down
|
// Down
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||||
this.Down.DefaultCellStyle = dataGridViewCellStyle4;
|
this.Down.DefaultCellStyle = dataGridViewCellStyle20;
|
||||||
resources.ApplyResources(this.Down, "Down");
|
resources.ApplyResources(this.Down, "Down");
|
||||||
this.Down.Image = global::ArdupilotMega.Properties.Resources.down;
|
this.Down.Image = global::ArdupilotMega.Properties.Resources.down;
|
||||||
this.Down.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
this.Down.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
||||||
|
@ -418,8 +421,8 @@
|
||||||
//
|
//
|
||||||
// dataGridViewImageColumn1
|
// dataGridViewImageColumn1
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||||
this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle7;
|
this.dataGridViewImageColumn1.DefaultCellStyle = dataGridViewCellStyle23;
|
||||||
resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1");
|
resources.ApplyResources(this.dataGridViewImageColumn1, "dataGridViewImageColumn1");
|
||||||
this.dataGridViewImageColumn1.Image = global::ArdupilotMega.Properties.Resources.up;
|
this.dataGridViewImageColumn1.Image = global::ArdupilotMega.Properties.Resources.up;
|
||||||
this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
||||||
|
@ -427,8 +430,8 @@
|
||||||
//
|
//
|
||||||
// dataGridViewImageColumn2
|
// dataGridViewImageColumn2
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||||
this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle8;
|
this.dataGridViewImageColumn2.DefaultCellStyle = dataGridViewCellStyle24;
|
||||||
resources.ApplyResources(this.dataGridViewImageColumn2, "dataGridViewImageColumn2");
|
resources.ApplyResources(this.dataGridViewImageColumn2, "dataGridViewImageColumn2");
|
||||||
this.dataGridViewImageColumn2.Image = global::ArdupilotMega.Properties.Resources.down;
|
this.dataGridViewImageColumn2.Image = global::ArdupilotMega.Properties.Resources.down;
|
||||||
this.dataGridViewImageColumn2.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
this.dataGridViewImageColumn2.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Stretch;
|
||||||
|
@ -722,8 +725,9 @@
|
||||||
this.toolStripSeparator1,
|
this.toolStripSeparator1,
|
||||||
this.ContextMeasure,
|
this.ContextMeasure,
|
||||||
this.rotateMapToolStripMenuItem,
|
this.rotateMapToolStripMenuItem,
|
||||||
this.gridToolStripMenuItem,
|
this.polygonToolStripMenuItem,
|
||||||
this.clearMissionToolStripMenuItem});
|
this.clearMissionToolStripMenuItem,
|
||||||
|
this.geoFenceToolStripMenuItem});
|
||||||
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
||||||
resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1");
|
resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1");
|
||||||
//
|
//
|
||||||
|
@ -797,13 +801,13 @@
|
||||||
resources.ApplyResources(this.rotateMapToolStripMenuItem, "rotateMapToolStripMenuItem");
|
resources.ApplyResources(this.rotateMapToolStripMenuItem, "rotateMapToolStripMenuItem");
|
||||||
this.rotateMapToolStripMenuItem.Click += new System.EventHandler(this.rotateMapToolStripMenuItem_Click);
|
this.rotateMapToolStripMenuItem.Click += new System.EventHandler(this.rotateMapToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// gridToolStripMenuItem
|
// polygonToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.gridToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.polygonToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
this.addPolygonPointToolStripMenuItem,
|
this.addPolygonPointToolStripMenuItem,
|
||||||
this.clearPolygonToolStripMenuItem});
|
this.clearPolygonToolStripMenuItem});
|
||||||
this.gridToolStripMenuItem.Name = "gridToolStripMenuItem";
|
this.polygonToolStripMenuItem.Name = "polygonToolStripMenuItem";
|
||||||
resources.ApplyResources(this.gridToolStripMenuItem, "gridToolStripMenuItem");
|
resources.ApplyResources(this.polygonToolStripMenuItem, "polygonToolStripMenuItem");
|
||||||
//
|
//
|
||||||
// addPolygonPointToolStripMenuItem
|
// addPolygonPointToolStripMenuItem
|
||||||
//
|
//
|
||||||
|
@ -859,6 +863,26 @@
|
||||||
this.timer1.Interval = 1000;
|
this.timer1.Interval = 1000;
|
||||||
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
|
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
|
||||||
//
|
//
|
||||||
|
// geoFenceToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.geoFenceToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
|
this.GeoFenceuploadToolStripMenuItem,
|
||||||
|
this.GeoFencedownloadToolStripMenuItem});
|
||||||
|
this.geoFenceToolStripMenuItem.Name = "geoFenceToolStripMenuItem";
|
||||||
|
resources.ApplyResources(this.geoFenceToolStripMenuItem, "geoFenceToolStripMenuItem");
|
||||||
|
//
|
||||||
|
// GeoFenceuploadToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.GeoFenceuploadToolStripMenuItem.Name = "GeoFenceuploadToolStripMenuItem";
|
||||||
|
resources.ApplyResources(this.GeoFenceuploadToolStripMenuItem, "GeoFenceuploadToolStripMenuItem");
|
||||||
|
this.GeoFenceuploadToolStripMenuItem.Click += new System.EventHandler(this.GeoFenceuploadToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// GeoFencedownloadToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.GeoFencedownloadToolStripMenuItem.Name = "GeoFencedownloadToolStripMenuItem";
|
||||||
|
resources.ApplyResources(this.GeoFencedownloadToolStripMenuItem, "GeoFencedownloadToolStripMenuItem");
|
||||||
|
this.GeoFencedownloadToolStripMenuItem.Click += new System.EventHandler(this.GeoFencedownloadToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
// FlightPlanner
|
// FlightPlanner
|
||||||
//
|
//
|
||||||
resources.ApplyResources(this, "$this");
|
resources.ApplyResources(this, "$this");
|
||||||
|
@ -946,7 +970,7 @@
|
||||||
private System.Windows.Forms.ToolTip toolTip1;
|
private System.Windows.Forms.ToolTip toolTip1;
|
||||||
private System.Windows.Forms.ToolStripMenuItem rotateMapToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem rotateMapToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem clearMissionToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem clearMissionToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem gridToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem polygonToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem addPolygonPointToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem addPolygonPointToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem clearPolygonToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem clearPolygonToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem loiterToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem loiterToolStripMenuItem;
|
||||||
|
@ -973,5 +997,8 @@
|
||||||
private MyButton BUT_zoomto;
|
private MyButton BUT_zoomto;
|
||||||
private MyButton BUT_loadkml;
|
private MyButton BUT_loadkml;
|
||||||
private System.Windows.Forms.Timer timer1;
|
private System.Windows.Forms.Timer timer1;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem geoFenceToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem GeoFenceuploadToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem GeoFencedownloadToolStripMenuItem;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -447,6 +447,9 @@ namespace ArdupilotMega.GCSViews
|
||||||
kmlpolygons = new GMapOverlay(MainMap, "kmlpolygons");
|
kmlpolygons = new GMapOverlay(MainMap, "kmlpolygons");
|
||||||
MainMap.Overlays.Add(kmlpolygons);
|
MainMap.Overlays.Add(kmlpolygons);
|
||||||
|
|
||||||
|
geofence = new GMapOverlay(MainMap, "geofence");
|
||||||
|
MainMap.Overlays.Add(geofence);
|
||||||
|
|
||||||
routes = new GMapOverlay(MainMap, "routes");
|
routes = new GMapOverlay(MainMap, "routes");
|
||||||
MainMap.Overlays.Add(routes);
|
MainMap.Overlays.Add(routes);
|
||||||
|
|
||||||
|
@ -1814,7 +1817,11 @@ namespace ArdupilotMega.GCSViews
|
||||||
// polygons
|
// polygons
|
||||||
GMapPolygon polygon;
|
GMapPolygon polygon;
|
||||||
GMapPolygon drawnpolygon;
|
GMapPolygon drawnpolygon;
|
||||||
|
GMapPolygon gf;
|
||||||
|
|
||||||
GMapOverlay kmlpolygons;
|
GMapOverlay kmlpolygons;
|
||||||
|
GMapOverlay geofence;
|
||||||
|
|
||||||
|
|
||||||
// layers
|
// layers
|
||||||
GMapOverlay top;
|
GMapOverlay top;
|
||||||
|
@ -2948,5 +2955,71 @@ namespace ArdupilotMega.GCSViews
|
||||||
}
|
}
|
||||||
catch { }
|
catch { }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void GeoFenceuploadToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
//FENCE_TOTAL
|
||||||
|
if (MainV2.comPort.param["FENCE_ACTION"] == null)
|
||||||
|
{
|
||||||
|
MessageBox.Show("Not Supported");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MainV2.comPort.param["FENCE_ACTION"].ToString() != "0")
|
||||||
|
MainV2.comPort.setParam("FENCE_ACTION", 0);
|
||||||
|
|
||||||
|
MainV2.comPort.setParam("FENCE_TOTAL", drawnpolygon.Points.Count);
|
||||||
|
|
||||||
|
byte a = 0;
|
||||||
|
|
||||||
|
foreach (var pll in drawnpolygon.Points)
|
||||||
|
{
|
||||||
|
MainV2.comPort.setFencePoint(a, new PointLatLngAlt(pll), (byte)drawnpolygon.Points.Count);
|
||||||
|
a++;
|
||||||
|
}
|
||||||
|
|
||||||
|
drawnpolygons.Polygons.Clear();
|
||||||
|
drawnpolygons.Markers.Clear();
|
||||||
|
|
||||||
|
MainMap.Invalidate();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void GeoFencedownloadToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
int count = 1;
|
||||||
|
|
||||||
|
if (MainV2.comPort.param["FENCE_ACTION"] == null || MainV2.comPort.param["FENCE_TOTAL"] == null)
|
||||||
|
{
|
||||||
|
MessageBox.Show("Not Supported");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (int.Parse(MainV2.comPort.param["FENCE_TOTAL"].ToString()) == 0)
|
||||||
|
{
|
||||||
|
MessageBox.Show("Nothing to download");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
geofence.Polygons.Clear();
|
||||||
|
|
||||||
|
List<PointLatLng> polygonPoints = new List<PointLatLng>();
|
||||||
|
|
||||||
|
gf = new GMapPolygon(polygonPoints, "geofence");
|
||||||
|
gf.Stroke = new Pen(Color.Pink, 5);
|
||||||
|
geofence.Polygons.Add(gf);
|
||||||
|
|
||||||
|
FlightData.geofence.Polygons.Clear();
|
||||||
|
FlightData.geofence.Polygons.Add(gf);
|
||||||
|
|
||||||
|
for (int a = 0; a < count; a++)
|
||||||
|
{
|
||||||
|
PointLatLngAlt plla = MainV2.comPort.getFencePoint(a, ref count);
|
||||||
|
gf.Points.Add(new PointLatLng(plla.Lat, plla.Lng));
|
||||||
|
}
|
||||||
|
|
||||||
|
MainMap.UpdatePolygonLocalPosition(gf);
|
||||||
|
|
||||||
|
MainMap.Invalidate();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -537,6 +537,75 @@
|
||||||
<data name="panel5.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
<data name="panel5.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||||
<value>Bottom, Right</value>
|
<value>Bottom, Right</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name=">>BUT_write.Name" xml:space="preserve">
|
||||||
|
<value>BUT_write</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_write.Type" xml:space="preserve">
|
||||||
|
<value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_write.Parent" xml:space="preserve">
|
||||||
|
<value>panel5</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_write.ZOrder" xml:space="preserve">
|
||||||
|
<value>0</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_read.Name" xml:space="preserve">
|
||||||
|
<value>BUT_read</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_read.Type" xml:space="preserve">
|
||||||
|
<value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_read.Parent" xml:space="preserve">
|
||||||
|
<value>panel5</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_read.ZOrder" xml:space="preserve">
|
||||||
|
<value>1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>SaveFile.Name" xml:space="preserve">
|
||||||
|
<value>SaveFile</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>SaveFile.Type" xml:space="preserve">
|
||||||
|
<value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>SaveFile.Parent" xml:space="preserve">
|
||||||
|
<value>panel5</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>SaveFile.ZOrder" xml:space="preserve">
|
||||||
|
<value>2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_loadwpfile.Name" xml:space="preserve">
|
||||||
|
<value>BUT_loadwpfile</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_loadwpfile.Type" xml:space="preserve">
|
||||||
|
<value>ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_loadwpfile.Parent" xml:space="preserve">
|
||||||
|
<value>panel5</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BUT_loadwpfile.ZOrder" xml:space="preserve">
|
||||||
|
<value>3</value>
|
||||||
|
</data>
|
||||||
|
<data name="panel5.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
|
<value>8, 250</value>
|
||||||
|
</data>
|
||||||
|
<data name="panel5.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>117, 114</value>
|
||||||
|
</data>
|
||||||
|
<data name="panel5.TabIndex" type="System.Int32, mscorlib">
|
||||||
|
<value>29</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel5.Name" xml:space="preserve">
|
||||||
|
<value>panel5</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel5.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel5.Parent" xml:space="preserve">
|
||||||
|
<value>panelAction</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel5.ZOrder" xml:space="preserve">
|
||||||
|
<value>1</value>
|
||||||
|
</data>
|
||||||
<data name="BUT_write.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
<data name="BUT_write.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||||
<value>NoControl</value>
|
<value>NoControl</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -645,30 +714,114 @@
|
||||||
<data name=">>BUT_loadwpfile.ZOrder" xml:space="preserve">
|
<data name=">>BUT_loadwpfile.ZOrder" xml:space="preserve">
|
||||||
<value>3</value>
|
<value>3</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="panel5.Location" type="System.Drawing.Point, System.Drawing">
|
|
||||||
<value>8, 250</value>
|
|
||||||
</data>
|
|
||||||
<data name="panel5.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>117, 114</value>
|
|
||||||
</data>
|
|
||||||
<data name="panel5.TabIndex" type="System.Int32, mscorlib">
|
|
||||||
<value>29</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel5.Name" xml:space="preserve">
|
|
||||||
<value>panel5</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel5.Type" xml:space="preserve">
|
|
||||||
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel5.Parent" xml:space="preserve">
|
|
||||||
<value>panelAction</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel5.ZOrder" xml:space="preserve">
|
|
||||||
<value>1</value>
|
|
||||||
</data>
|
|
||||||
<data name="panel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
<data name="panel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||||
<value>Bottom, Right</value>
|
<value>Bottom, Right</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name=">>label4.Name" xml:space="preserve">
|
||||||
|
<value>label4</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label4.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label4.Parent" xml:space="preserve">
|
||||||
|
<value>panel1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label4.ZOrder" xml:space="preserve">
|
||||||
|
<value>0</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label3.Name" xml:space="preserve">
|
||||||
|
<value>label3</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label3.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label3.Parent" xml:space="preserve">
|
||||||
|
<value>panel1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label3.ZOrder" xml:space="preserve">
|
||||||
|
<value>1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label2.Name" xml:space="preserve">
|
||||||
|
<value>label2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label2.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label2.Parent" xml:space="preserve">
|
||||||
|
<value>panel1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label2.ZOrder" xml:space="preserve">
|
||||||
|
<value>2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>Label1.Name" xml:space="preserve">
|
||||||
|
<value>Label1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>Label1.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>Label1.Parent" xml:space="preserve">
|
||||||
|
<value>panel1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>Label1.ZOrder" xml:space="preserve">
|
||||||
|
<value>3</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homealt.Name" xml:space="preserve">
|
||||||
|
<value>TXT_homealt</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homealt.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homealt.Parent" xml:space="preserve">
|
||||||
|
<value>panel1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homealt.ZOrder" xml:space="preserve">
|
||||||
|
<value>4</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homelng.Name" xml:space="preserve">
|
||||||
|
<value>TXT_homelng</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homelng.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homelng.Parent" xml:space="preserve">
|
||||||
|
<value>panel1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homelng.ZOrder" xml:space="preserve">
|
||||||
|
<value>5</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homelat.Name" xml:space="preserve">
|
||||||
|
<value>TXT_homelat</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homelat.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homelat.Parent" xml:space="preserve">
|
||||||
|
<value>panel1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_homelat.ZOrder" xml:space="preserve">
|
||||||
|
<value>6</value>
|
||||||
|
</data>
|
||||||
|
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
|
<value>8, 365</value>
|
||||||
|
</data>
|
||||||
|
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>117, 89</value>
|
||||||
|
</data>
|
||||||
|
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
|
||||||
|
<value>31</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel1.Name" xml:space="preserve">
|
||||||
|
<value>panel1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel1.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel1.Parent" xml:space="preserve">
|
||||||
|
<value>panelAction</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel1.ZOrder" xml:space="preserve">
|
||||||
|
<value>2</value>
|
||||||
|
</data>
|
||||||
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
|
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -852,27 +1005,6 @@
|
||||||
<data name=">>TXT_homelat.ZOrder" xml:space="preserve">
|
<data name=">>TXT_homelat.ZOrder" xml:space="preserve">
|
||||||
<value>6</value>
|
<value>6</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
|
|
||||||
<value>8, 365</value>
|
|
||||||
</data>
|
|
||||||
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>117, 89</value>
|
|
||||||
</data>
|
|
||||||
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
|
|
||||||
<value>31</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel1.Name" xml:space="preserve">
|
|
||||||
<value>panel1</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel1.Type" xml:space="preserve">
|
|
||||||
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel1.Parent" xml:space="preserve">
|
|
||||||
<value>panelAction</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel1.ZOrder" xml:space="preserve">
|
|
||||||
<value>2</value>
|
|
||||||
</data>
|
|
||||||
<data name="dataGridViewImageColumn1.HeaderText" xml:space="preserve">
|
<data name="dataGridViewImageColumn1.HeaderText" xml:space="preserve">
|
||||||
<value>Up</value>
|
<value>Up</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -912,6 +1044,111 @@
|
||||||
<data name="panel2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
<data name="panel2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||||
<value>Bottom, Right</value>
|
<value>Bottom, Right</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name=">>label7.Name" xml:space="preserve">
|
||||||
|
<value>label7</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label7.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label7.Parent" xml:space="preserve">
|
||||||
|
<value>panel2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label7.ZOrder" xml:space="preserve">
|
||||||
|
<value>0</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label8.Name" xml:space="preserve">
|
||||||
|
<value>label8</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label8.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label8.Parent" xml:space="preserve">
|
||||||
|
<value>panel2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label8.ZOrder" xml:space="preserve">
|
||||||
|
<value>1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label9.Name" xml:space="preserve">
|
||||||
|
<value>label9</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label9.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label9.Parent" xml:space="preserve">
|
||||||
|
<value>panel2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label9.ZOrder" xml:space="preserve">
|
||||||
|
<value>2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label10.Name" xml:space="preserve">
|
||||||
|
<value>label10</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label10.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label10.Parent" xml:space="preserve">
|
||||||
|
<value>panel2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>label10.ZOrder" xml:space="preserve">
|
||||||
|
<value>3</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mousealt.Name" xml:space="preserve">
|
||||||
|
<value>TXT_mousealt</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mousealt.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mousealt.Parent" xml:space="preserve">
|
||||||
|
<value>panel2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mousealt.ZOrder" xml:space="preserve">
|
||||||
|
<value>4</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mouselong.Name" xml:space="preserve">
|
||||||
|
<value>TXT_mouselong</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mouselong.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mouselong.Parent" xml:space="preserve">
|
||||||
|
<value>panel2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mouselong.ZOrder" xml:space="preserve">
|
||||||
|
<value>5</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mouselat.Name" xml:space="preserve">
|
||||||
|
<value>TXT_mouselat</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mouselat.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mouselat.Parent" xml:space="preserve">
|
||||||
|
<value>panel2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>TXT_mouselat.ZOrder" xml:space="preserve">
|
||||||
|
<value>6</value>
|
||||||
|
</data>
|
||||||
|
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
|
<value>8, 130</value>
|
||||||
|
</data>
|
||||||
|
<data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>114, 79</value>
|
||||||
|
</data>
|
||||||
|
<data name="panel2.TabIndex" type="System.Int32, mscorlib">
|
||||||
|
<value>38</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel2.Name" xml:space="preserve">
|
||||||
|
<value>panel2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel2.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel2.Parent" xml:space="preserve">
|
||||||
|
<value>panelAction</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>panel2.ZOrder" xml:space="preserve">
|
||||||
|
<value>3</value>
|
||||||
|
</data>
|
||||||
<data name="label7.AutoSize" type="System.Boolean, mscorlib">
|
<data name="label7.AutoSize" type="System.Boolean, mscorlib">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -1095,27 +1332,9 @@
|
||||||
<data name=">>TXT_mouselat.ZOrder" xml:space="preserve">
|
<data name=">>TXT_mouselat.ZOrder" xml:space="preserve">
|
||||||
<value>6</value>
|
<value>6</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
|
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>8, 130</value>
|
<value>172, 17</value>
|
||||||
</data>
|
</metadata>
|
||||||
<data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>114, 79</value>
|
|
||||||
</data>
|
|
||||||
<data name="panel2.TabIndex" type="System.Int32, mscorlib">
|
|
||||||
<value>38</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel2.Name" xml:space="preserve">
|
|
||||||
<value>panel2</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel2.Type" xml:space="preserve">
|
|
||||||
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel2.Parent" xml:space="preserve">
|
|
||||||
<value>panelAction</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>panel2.ZOrder" xml:space="preserve">
|
|
||||||
<value>3</value>
|
|
||||||
</data>
|
|
||||||
<data name="comboBoxMapType.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
<data name="comboBoxMapType.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||||
<value>Bottom, Right</value>
|
<value>Bottom, Right</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -1128,9 +1347,6 @@
|
||||||
<data name="comboBoxMapType.TabIndex" type="System.Int32, mscorlib">
|
<data name="comboBoxMapType.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>42</value>
|
<value>42</value>
|
||||||
</data>
|
</data>
|
||||||
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
|
||||||
<value>172, 17</value>
|
|
||||||
</metadata>
|
|
||||||
<data name="comboBoxMapType.ToolTip" xml:space="preserve">
|
<data name="comboBoxMapType.ToolTip" xml:space="preserve">
|
||||||
<value>Change the current map type</value>
|
<value>Change the current map type</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -1605,42 +1821,12 @@
|
||||||
<data name="deleteWPToolStripMenuItem.Text" xml:space="preserve">
|
<data name="deleteWPToolStripMenuItem.Text" xml:space="preserve">
|
||||||
<value>Delete WP</value>
|
<value>Delete WP</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="loiterForeverToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>113, 22</value>
|
|
||||||
</data>
|
|
||||||
<data name="loiterForeverToolStripMenuItem.Text" xml:space="preserve">
|
|
||||||
<value>Forever</value>
|
|
||||||
</data>
|
|
||||||
<data name="loitertimeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>113, 22</value>
|
|
||||||
</data>
|
|
||||||
<data name="loitertimeToolStripMenuItem.Text" xml:space="preserve">
|
|
||||||
<value>Time</value>
|
|
||||||
</data>
|
|
||||||
<data name="loitercirclesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>113, 22</value>
|
|
||||||
</data>
|
|
||||||
<data name="loitercirclesToolStripMenuItem.Text" xml:space="preserve">
|
|
||||||
<value>Circles</value>
|
|
||||||
</data>
|
|
||||||
<data name="loiterToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="loiterToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>167, 22</value>
|
<value>167, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="loiterToolStripMenuItem.Text" xml:space="preserve">
|
<data name="loiterToolStripMenuItem.Text" xml:space="preserve">
|
||||||
<value>Loiter</value>
|
<value>Loiter</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="jumpstartToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>102, 22</value>
|
|
||||||
</data>
|
|
||||||
<data name="jumpstartToolStripMenuItem.Text" xml:space="preserve">
|
|
||||||
<value>Start</value>
|
|
||||||
</data>
|
|
||||||
<data name="jumpwPToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>102, 22</value>
|
|
||||||
</data>
|
|
||||||
<data name="jumpwPToolStripMenuItem.Text" xml:space="preserve">
|
|
||||||
<value>WP #</value>
|
|
||||||
</data>
|
|
||||||
<data name="jumpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="jumpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>167, 22</value>
|
<value>167, 22</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -1662,23 +1848,11 @@
|
||||||
<data name="rotateMapToolStripMenuItem.Text" xml:space="preserve">
|
<data name="rotateMapToolStripMenuItem.Text" xml:space="preserve">
|
||||||
<value>Rotate Map</value>
|
<value>Rotate Map</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="addPolygonPointToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="polygonToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>174, 22</value>
|
|
||||||
</data>
|
|
||||||
<data name="addPolygonPointToolStripMenuItem.Text" xml:space="preserve">
|
|
||||||
<value>Add Polygon Point</value>
|
|
||||||
</data>
|
|
||||||
<data name="clearPolygonToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>174, 22</value>
|
|
||||||
</data>
|
|
||||||
<data name="clearPolygonToolStripMenuItem.Text" xml:space="preserve">
|
|
||||||
<value>Clear Polygon</value>
|
|
||||||
</data>
|
|
||||||
<data name="gridToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>167, 22</value>
|
<value>167, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="gridToolStripMenuItem.Text" xml:space="preserve">
|
<data name="polygonToolStripMenuItem.Text" xml:space="preserve">
|
||||||
<value>Grid Polygon</value>
|
<value>Draw Polygon</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="clearMissionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="clearMissionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>167, 22</value>
|
<value>167, 22</value>
|
||||||
|
@ -1686,8 +1860,26 @@
|
||||||
<data name="clearMissionToolStripMenuItem.Text" xml:space="preserve">
|
<data name="clearMissionToolStripMenuItem.Text" xml:space="preserve">
|
||||||
<value>Clear Mission</value>
|
<value>Clear Mission</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="GeoFenceuploadToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>152, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="GeoFenceuploadToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Upload</value>
|
||||||
|
</data>
|
||||||
|
<data name="GeoFencedownloadToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>152, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="GeoFencedownloadToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Download</value>
|
||||||
|
</data>
|
||||||
|
<data name="geoFenceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>167, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="geoFenceToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Geo-Fence</value>
|
||||||
|
</data>
|
||||||
<data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>168, 164</value>
|
<value>168, 208</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>contextMenuStrip1.Name" xml:space="preserve">
|
<data name=">>contextMenuStrip1.Name" xml:space="preserve">
|
||||||
<value>contextMenuStrip1</value>
|
<value>contextMenuStrip1</value>
|
||||||
|
@ -1951,6 +2143,48 @@
|
||||||
<data name=">>panelMap.ZOrder" xml:space="preserve">
|
<data name=">>panelMap.ZOrder" xml:space="preserve">
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="loiterForeverToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>113, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="loiterForeverToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Forever</value>
|
||||||
|
</data>
|
||||||
|
<data name="loitertimeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>113, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="loitertimeToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Time</value>
|
||||||
|
</data>
|
||||||
|
<data name="loitercirclesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>113, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="loitercirclesToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Circles</value>
|
||||||
|
</data>
|
||||||
|
<data name="jumpstartToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>102, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="jumpstartToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Start</value>
|
||||||
|
</data>
|
||||||
|
<data name="jumpwPToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>102, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="jumpwPToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>WP #</value>
|
||||||
|
</data>
|
||||||
|
<data name="addPolygonPointToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>174, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="addPolygonPointToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Add Polygon Point</value>
|
||||||
|
</data>
|
||||||
|
<data name="clearPolygonToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>174, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="clearPolygonToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Clear Polygon</value>
|
||||||
|
</data>
|
||||||
<data name="panelBASE.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
<data name="panelBASE.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||||
<value>Fill</value>
|
<value>Fill</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -1975,6 +2209,9 @@
|
||||||
<data name=">>panelBASE.ZOrder" xml:space="preserve">
|
<data name=">>panelBASE.ZOrder" xml:space="preserve">
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</data>
|
</data>
|
||||||
|
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>172, 17</value>
|
||||||
|
</metadata>
|
||||||
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>269, 17</value>
|
<value>269, 17</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
@ -2134,10 +2371,10 @@
|
||||||
<data name=">>rotateMapToolStripMenuItem.Type" xml:space="preserve">
|
<data name=">>rotateMapToolStripMenuItem.Type" xml:space="preserve">
|
||||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>gridToolStripMenuItem.Name" xml:space="preserve">
|
<data name=">>polygonToolStripMenuItem.Name" xml:space="preserve">
|
||||||
<value>gridToolStripMenuItem</value>
|
<value>polygonToolStripMenuItem</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>gridToolStripMenuItem.Type" xml:space="preserve">
|
<data name=">>polygonToolStripMenuItem.Type" xml:space="preserve">
|
||||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>addPolygonPointToolStripMenuItem.Name" xml:space="preserve">
|
<data name=">>addPolygonPointToolStripMenuItem.Name" xml:space="preserve">
|
||||||
|
@ -2170,6 +2407,24 @@
|
||||||
<data name=">>timer1.Type" xml:space="preserve">
|
<data name=">>timer1.Type" xml:space="preserve">
|
||||||
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name=">>geoFenceToolStripMenuItem.Name" xml:space="preserve">
|
||||||
|
<value>geoFenceToolStripMenuItem</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>geoFenceToolStripMenuItem.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>GeoFenceuploadToolStripMenuItem.Name" xml:space="preserve">
|
||||||
|
<value>GeoFenceuploadToolStripMenuItem</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>GeoFenceuploadToolStripMenuItem.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>GeoFencedownloadToolStripMenuItem.Name" xml:space="preserve">
|
||||||
|
<value>GeoFencedownloadToolStripMenuItem</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>GeoFencedownloadToolStripMenuItem.Type" xml:space="preserve">
|
||||||
|
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
<data name=">>$this.Name" xml:space="preserve">
|
<data name=">>$this.Name" xml:space="preserve">
|
||||||
<value>FlightPlanner</value>
|
<value>FlightPlanner</value>
|
||||||
</data>
|
</data>
|
||||||
|
|
|
@ -295,7 +295,7 @@ namespace ArdupilotMega
|
||||||
((HorizontalProgressBar)this.Controls.Find("hbar" + name, false)[0]).Value = MainV2.joystick.isButtonPressed(f) ? 100 : 0;
|
((HorizontalProgressBar)this.Controls.Find("hbar" + name, false)[0]).Value = MainV2.joystick.isButtonPressed(f) ? 100 : 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex) { }
|
catch { } // this is for buttons - silent fail
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -966,7 +966,7 @@ namespace ArdupilotMega
|
||||||
byte[] buffer = new byte[4096];
|
byte[] buffer = new byte[4096];
|
||||||
using (FileStream streamReader = File.OpenRead(filename))
|
using (FileStream streamReader = File.OpenRead(filename))
|
||||||
{
|
{
|
||||||
StreamUtils.Copy(streamReader, zipStream, buffer);
|
StreamUtils.Copy(streamReader, zipStream, buffer);
|
||||||
}
|
}
|
||||||
zipStream.CloseEntry();
|
zipStream.CloseEntry();
|
||||||
|
|
||||||
|
|
|
@ -2252,6 +2252,95 @@ namespace ArdupilotMega
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public PointLatLngAlt getFencePoint(int no, ref int total)
|
||||||
|
{
|
||||||
|
byte[] buffer;
|
||||||
|
|
||||||
|
MainV2.givecomport = true;
|
||||||
|
|
||||||
|
PointLatLngAlt plla = new PointLatLngAlt();
|
||||||
|
__mavlink_fence_fetch_point_t req = new __mavlink_fence_fetch_point_t();
|
||||||
|
|
||||||
|
req.idx = (byte)no;
|
||||||
|
req.target_component = compid;
|
||||||
|
req.target_system = sysid;
|
||||||
|
|
||||||
|
// request point
|
||||||
|
generatePacket(MAVLINK_MSG_ID_FENCE_FETCH_POINT, req);
|
||||||
|
|
||||||
|
DateTime start = DateTime.Now;
|
||||||
|
int retrys = 3;
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
if (!(start.AddMilliseconds(500) > DateTime.Now))
|
||||||
|
{
|
||||||
|
if (retrys > 0)
|
||||||
|
{
|
||||||
|
Console.WriteLine("getFencePoint Retry " + retrys + " - giv com " + MainV2.givecomport);
|
||||||
|
generatePacket(MAVLINK_MSG_ID_FENCE_FETCH_POINT, req);
|
||||||
|
start = DateTime.Now;
|
||||||
|
retrys--;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
MainV2.givecomport = false;
|
||||||
|
throw new Exception("Timeout on read - getFencePoint");
|
||||||
|
}
|
||||||
|
|
||||||
|
buffer = readPacket();
|
||||||
|
if (buffer.Length > 5)
|
||||||
|
{
|
||||||
|
if (buffer[5] == MAVLINK_MSG_ID_FENCE_POINT)
|
||||||
|
{
|
||||||
|
MainV2.givecomport = false;
|
||||||
|
|
||||||
|
__mavlink_fence_point_t fp = new __mavlink_fence_point_t();
|
||||||
|
|
||||||
|
object structtemp = (object)fp;
|
||||||
|
|
||||||
|
ByteArrayToStructure(buffer, ref structtemp, 6);
|
||||||
|
|
||||||
|
fp = (__mavlink_fence_point_t)(structtemp);
|
||||||
|
|
||||||
|
plla.Lat = fp.lat;
|
||||||
|
plla.Lng = fp.lng;
|
||||||
|
plla.Tag = fp.idx.ToString();
|
||||||
|
|
||||||
|
total = fp.count;
|
||||||
|
|
||||||
|
return plla;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool setFencePoint(byte index, PointLatLngAlt plla,byte fencepointcount)
|
||||||
|
{
|
||||||
|
__mavlink_fence_point_t fp = new __mavlink_fence_point_t();
|
||||||
|
|
||||||
|
fp.idx = index;
|
||||||
|
fp.count = fencepointcount;
|
||||||
|
fp.lat = (float)plla.Lat;
|
||||||
|
fp.lng = (float)plla.Lng;
|
||||||
|
fp.target_component = compid;
|
||||||
|
fp.target_system = sysid;
|
||||||
|
|
||||||
|
int retry = 3;
|
||||||
|
|
||||||
|
while (retry > 0)
|
||||||
|
{
|
||||||
|
generatePacket(MAVLINK_MSG_ID_FENCE_POINT, fp);
|
||||||
|
int counttemp = 0;
|
||||||
|
PointLatLngAlt newfp = getFencePoint(fp.idx, ref counttemp);
|
||||||
|
|
||||||
|
if (newfp.Lat == plla.Lat && newfp.Lng == fp.lng)
|
||||||
|
return true;
|
||||||
|
retry--;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
byte[] readlogPacket()
|
byte[] readlogPacket()
|
||||||
{
|
{
|
||||||
byte[] temp = new byte[300];
|
byte[] temp = new byte[300];
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,106 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Drawing;
|
|
||||||
using System.Data;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Windows.Forms;
|
|
||||||
|
|
||||||
|
|
||||||
using System.Drawing.Drawing2D;
|
|
||||||
|
|
||||||
namespace ArdupilotMega
|
|
||||||
{
|
|
||||||
class MyButton : Button
|
|
||||||
{
|
|
||||||
bool mouseover = false;
|
|
||||||
bool mousedown = false;
|
|
||||||
|
|
||||||
protected override void OnPaint(PaintEventArgs pevent)
|
|
||||||
{
|
|
||||||
//base.OnPaint(pevent);
|
|
||||||
|
|
||||||
Graphics gr = pevent.Graphics;
|
|
||||||
|
|
||||||
Rectangle outside = new Rectangle(0,0,this.Width,this.Height);
|
|
||||||
|
|
||||||
LinearGradientBrush linear = new LinearGradientBrush(outside,Color.FromArgb(0x94,0xc1,0x1f),Color.FromArgb(0xcd,0xe2,0x96),LinearGradientMode.Vertical);
|
|
||||||
|
|
||||||
Pen mypen = new Pen(Color.FromArgb(0x79,0x94,0x29),2);
|
|
||||||
|
|
||||||
gr.FillRectangle(linear,outside);
|
|
||||||
|
|
||||||
gr.DrawRectangle(mypen,outside);
|
|
||||||
|
|
||||||
SolidBrush mybrush = new SolidBrush(Color.FromArgb(0x40,0x57,0x04));
|
|
||||||
|
|
||||||
if (mouseover)
|
|
||||||
{
|
|
||||||
SolidBrush brush = new SolidBrush(Color.FromArgb(73, 0x2b, 0x3a, 0x03));
|
|
||||||
|
|
||||||
gr.FillRectangle(brush, 0, 0, this.Width, this.Height);
|
|
||||||
}
|
|
||||||
if (mousedown)
|
|
||||||
{
|
|
||||||
SolidBrush brush = new SolidBrush(Color.FromArgb(73, 0x2b, 0x3a, 0x03));
|
|
||||||
|
|
||||||
gr.FillRectangle(brush, 0, 0, this.Width, this.Height);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this.Enabled)
|
|
||||||
{
|
|
||||||
SolidBrush brush = new SolidBrush(Color.FromArgb(150, 0x2b, 0x3a, 0x03));
|
|
||||||
|
|
||||||
gr.FillRectangle(brush, 0, 0, this.Width, this.Height);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
StringFormat stringFormat = new StringFormat();
|
|
||||||
stringFormat.Alignment = StringAlignment.Center;
|
|
||||||
stringFormat.LineAlignment = StringAlignment.Center;
|
|
||||||
|
|
||||||
string display = this.Text;
|
|
||||||
int amppos = display.IndexOf('&');
|
|
||||||
if (amppos != -1)
|
|
||||||
display = display.Remove(amppos,1);
|
|
||||||
|
|
||||||
gr.DrawString(display, this.Font, mybrush, outside, stringFormat);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnClick(EventArgs e)
|
|
||||||
{
|
|
||||||
base.OnClick(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnPaintBackground(PaintEventArgs pevent)
|
|
||||||
{
|
|
||||||
//base.OnPaintBackground(pevent);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnMouseEnter(EventArgs e)
|
|
||||||
{
|
|
||||||
mouseover = true;
|
|
||||||
base.OnMouseEnter(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnMouseLeave(EventArgs e)
|
|
||||||
{
|
|
||||||
mouseover = false;
|
|
||||||
base.OnMouseLeave(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnMouseDown(MouseEventArgs mevent)
|
|
||||||
{
|
|
||||||
mousedown = true;
|
|
||||||
base.OnMouseDown(mevent);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnMouseUp(MouseEventArgs mevent)
|
|
||||||
{
|
|
||||||
mousedown = false;
|
|
||||||
base.OnMouseUp(mevent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,88 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Drawing;
|
|
||||||
using System.Data;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Windows.Forms;
|
|
||||||
|
|
||||||
namespace ArdupilotMega
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// profiling showed that the built in Label function was using alot ot call time.
|
|
||||||
/// </summary>
|
|
||||||
public partial class MyLabel : Control //: Label
|
|
||||||
{
|
|
||||||
string label = "";
|
|
||||||
int noofchars = 0;
|
|
||||||
bool autosize = false;
|
|
||||||
|
|
||||||
[System.ComponentModel.Browsable(true)]
|
|
||||||
public bool resize { get { return autosize; } set { autosize = value; } }
|
|
||||||
|
|
||||||
public MyLabel()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string Text
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return label;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (value == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (label == value)
|
|
||||||
return;
|
|
||||||
|
|
||||||
label = value;
|
|
||||||
|
|
||||||
if (noofchars != label.Length && resize)
|
|
||||||
{
|
|
||||||
noofchars = label.Length;
|
|
||||||
Size textSize = TextRenderer.MeasureText(value, this.Font);
|
|
||||||
this.Width = textSize.Width;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.Invalidate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
SolidBrush s = new SolidBrush(Color.White);
|
|
||||||
SolidBrush b = new SolidBrush(Color.Black);
|
|
||||||
|
|
||||||
StringFormat stringFormat = new StringFormat();
|
|
||||||
|
|
||||||
protected override void OnPaint(PaintEventArgs e)
|
|
||||||
{
|
|
||||||
stringFormat.Alignment = StringAlignment.Near;
|
|
||||||
stringFormat.LineAlignment = StringAlignment.Center;
|
|
||||||
|
|
||||||
s = new SolidBrush(ForeColor);
|
|
||||||
|
|
||||||
e.Graphics.DrawString(label, this.Font, s, new PointF(0, this.Height / 2.0f), stringFormat);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnPaintBackground(PaintEventArgs pevent)
|
|
||||||
{
|
|
||||||
b = new SolidBrush(BackColor);
|
|
||||||
|
|
||||||
pevent.Graphics.FillRectangle(b, this.ClientRectangle);
|
|
||||||
|
|
||||||
base.OnPaintBackground(pevent);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void WndProc(ref Message m) // seems to crash here on linux... so try ignore it
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
base.WndProc(ref m);
|
|
||||||
}
|
|
||||||
catch { }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Windows.Forms;
|
|
||||||
|
|
||||||
namespace ArdupilotMega
|
|
||||||
{
|
|
||||||
class MyTrackBar : TrackBar
|
|
||||||
{
|
|
||||||
public new double Maximum { get { return base.Maximum / 100.0; } set { base.Maximum = (int)(value * 100); } }
|
|
||||||
public new double Minimum { get { return base.Minimum / 100.0; } set { base.Minimum = (int)(value * 100); } }
|
|
||||||
public new double Value { get { return base.Value / 100.0; } set { base.Value = (int)(value * 100); } }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -34,5 +34,5 @@ using System.Resources;
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.0.0.0")]
|
[assembly: AssemblyVersion("1.0.0.0")]
|
||||||
[assembly: AssemblyFileVersion("1.1.8")]
|
[assembly: AssemblyFileVersion("1.1.9")]
|
||||||
[assembly: NeutralResourcesLanguageAttribute("")]
|
[assembly: NeutralResourcesLanguageAttribute("")]
|
||||||
|
|
|
@ -1,10 +1,25 @@
|
||||||
$dir = "C:/Users/hog/Documents/Arduino/libraries/GCS_MAVLink/include/common/";
|
$dir = "C:/Users/hog/Desktop/DIYDrones/ardupilot-mega/libraries/GCS_MAVLink/include/common/";
|
||||||
$dir2 = "C:/Users/hog/Documents/Arduino/libraries/GCS_MAVLink/include/ardupilotmega/";
|
$dir2 = "C:/Users/hog/Desktop/DIYDrones/ardupilot-mega/libraries/GCS_MAVLink/include/ardupilotmega/";
|
||||||
|
|
||||||
|
$fname = "MAVLinkTypes0.9.cs";
|
||||||
|
|
||||||
|
&doit();
|
||||||
|
|
||||||
# mavlink 1.0 with old structs
|
# mavlink 1.0 with old structs
|
||||||
$dir = "C:/Users/hog/Desktop/DIYDrones/ardupilot-mega/libraries/GCS_MAVLink/include_v1.0/common/";
|
$dir = "C:/Users/hog/Desktop/DIYDrones/ardupilot-mega/libraries/GCS_MAVLink/include_v1.0/common/";
|
||||||
$dir2 = "C:/Users/hog/Desktop/DIYDrones/ardupilot-mega/libraries/GCS_MAVLink/include_v1.0/ardupilotmega/";
|
$dir2 = "C:/Users/hog/Desktop/DIYDrones/ardupilot-mega/libraries/GCS_MAVLink/include_v1.0/ardupilotmega/";
|
||||||
|
|
||||||
|
$fname = "MAVLinkTypes.cs";
|
||||||
|
|
||||||
|
&doit();
|
||||||
|
|
||||||
|
<STDIN>;
|
||||||
|
|
||||||
|
exit;
|
||||||
|
|
||||||
|
sub doit
|
||||||
|
{
|
||||||
|
|
||||||
opendir(DIR,$dir) || die print $!;
|
opendir(DIR,$dir) || die print $!;
|
||||||
@files2 = readdir(DIR);
|
@files2 = readdir(DIR);
|
||||||
closedir(DIR);
|
closedir(DIR);
|
||||||
|
@ -18,10 +33,12 @@ push(@files,@files2);
|
||||||
|
|
||||||
push(@files,"../mavlink_types.h");
|
push(@files,"../mavlink_types.h");
|
||||||
|
|
||||||
open(OUT,">MAVLinkTypes.cs");
|
open(OUT,">$fname");
|
||||||
|
|
||||||
$crcs = 0;
|
$crcs = 0;
|
||||||
|
|
||||||
|
%done = {};
|
||||||
|
|
||||||
print OUT <<EOF;
|
print OUT <<EOF;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
@ -135,6 +152,8 @@ EOF
|
||||||
|
|
||||||
close OUT;
|
close OUT;
|
||||||
|
|
||||||
<STDIN>;
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
1;
|
1;
|
Loading…
Reference in New Issue