diff --git a/GCSViews/FlightPlanner.Designer.cs b/GCSViews/FlightPlanner.Designer.cs
index 1e82360aa7..7f7b1a070b 100644
--- a/GCSViews/FlightPlanner.Designer.cs
+++ b/GCSViews/FlightPlanner.Designer.cs
@@ -221,6 +221,7 @@ private void InitializeComponent()
this.zoomToVehicleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.zoomToMissionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.zoomToHomeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.gDALOpacityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.panel5.SuspendLayout();
this.panel1.SuspendLayout();
this.panelWaypoints.SuspendLayout();
@@ -293,6 +294,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.but_writewpfast, "but_writewpfast");
this.but_writewpfast.Name = "but_writewpfast";
+ this.but_writewpfast.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4)))));
this.but_writewpfast.UseVisualStyleBackColor = true;
this.but_writewpfast.Click += new System.EventHandler(this.but_writewpfast_Click);
//
@@ -300,6 +302,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.BUT_write, "BUT_write");
this.BUT_write.Name = "BUT_write";
+ this.BUT_write.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4)))));
this.BUT_write.UseVisualStyleBackColor = true;
this.BUT_write.Click += new System.EventHandler(this.BUT_write_Click);
//
@@ -307,6 +310,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.BUT_read, "BUT_read");
this.BUT_read.Name = "BUT_read";
+ this.BUT_read.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4)))));
this.BUT_read.UseVisualStyleBackColor = true;
this.BUT_read.Click += new System.EventHandler(this.BUT_read_Click);
//
@@ -435,6 +439,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.but_mincommands, "but_mincommands");
this.but_mincommands.Name = "but_mincommands";
+ this.but_mincommands.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4)))));
this.but_mincommands.UseVisualStyleBackColor = true;
this.but_mincommands.Click += new System.EventHandler(this.but_mincommands_Click);
//
@@ -653,6 +658,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.BUT_Add, "BUT_Add");
this.BUT_Add.Name = "BUT_Add";
+ this.BUT_Add.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4)))));
this.toolTip1.SetToolTip(this.BUT_Add, resources.GetString("BUT_Add.ToolTip"));
this.BUT_Add.UseVisualStyleBackColor = true;
this.BUT_Add.Click += new System.EventHandler(this.BUT_Add_Click);
@@ -735,6 +741,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.BUT_loadwpfile, "BUT_loadwpfile");
this.BUT_loadwpfile.Name = "BUT_loadwpfile";
+ this.BUT_loadwpfile.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4)))));
this.BUT_loadwpfile.UseVisualStyleBackColor = true;
this.BUT_loadwpfile.Click += new System.EventHandler(this.BUT_loadwpfile_Click);
//
@@ -742,6 +749,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.BUT_saveWPFile, "BUT_saveWPFile");
this.BUT_saveWPFile.Name = "BUT_saveWPFile";
+ this.BUT_saveWPFile.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4)))));
this.BUT_saveWPFile.UseVisualStyleBackColor = true;
this.BUT_saveWPFile.Click += new System.EventHandler(this.BUT_saveWPFile_Click);
//
@@ -1193,7 +1201,8 @@ private void InitializeComponent()
this.prefetchWPPathToolStripMenuItem,
this.kMLOverlayToolStripMenuItem,
this.elevationGraphToolStripMenuItem,
- this.reverseWPsToolStripMenuItem});
+ this.reverseWPsToolStripMenuItem,
+ this.gDALOpacityToolStripMenuItem});
this.mapToolToolStripMenuItem.Name = "mapToolToolStripMenuItem";
resources.ApplyResources(this.mapToolToolStripMenuItem, "mapToolToolStripMenuItem");
//
@@ -1478,6 +1487,12 @@ private void InitializeComponent()
resources.ApplyResources(this.zoomToHomeToolStripMenuItem, "zoomToHomeToolStripMenuItem");
this.zoomToHomeToolStripMenuItem.Click += new System.EventHandler(this.zoomToHomeToolStripMenuItem_Click);
//
+ // gDALOpacityToolStripMenuItem
+ //
+ this.gDALOpacityToolStripMenuItem.Name = "gDALOpacityToolStripMenuItem";
+ resources.ApplyResources(this.gDALOpacityToolStripMenuItem, "gDALOpacityToolStripMenuItem");
+ this.gDALOpacityToolStripMenuItem.Click += new System.EventHandler(this.gDALOpacityToolStripMenuItem_Click);
+ //
// FlightPlanner
//
this.BackColor = System.Drawing.SystemColors.Control;
@@ -1681,5 +1696,6 @@ private void InitializeComponent()
private DataGridViewTextBoxColumn Dist;
private DataGridViewTextBoxColumn AZ;
private DataGridViewTextBoxColumn TagData;
+ private ToolStripMenuItem gDALOpacityToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/GCSViews/FlightPlanner.cs b/GCSViews/FlightPlanner.cs
index 94a5693f73..328e5cca38 100644
--- a/GCSViews/FlightPlanner.cs
+++ b/GCSViews/FlightPlanner.cs
@@ -7960,5 +7960,12 @@ private void chk_usemavftp_CheckedChanged(object sender, EventArgs e)
{
Settings.Instance["UseMissionMAVFTP"] = chk_usemavftp.Checked.ToString();
}
+
+ private void gDALOpacityToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var ans = GDAL.GDALProvider.Instance.opacity;
+ if (InputBox.Show("Opacity 0.0-1.0", "Enter opacity (0.0-1.0)", ref ans) == DialogResult.OK)
+ GDAL.GDALProvider.Instance.opacity = double.Parse(InputBox.value);
+ }
}
}
\ No newline at end of file
diff --git a/GCSViews/FlightPlanner.resx b/GCSViews/FlightPlanner.resx
index 41131865d8..4b2dd335ae 100644
--- a/GCSViews/FlightPlanner.resx
+++ b/GCSViews/FlightPlanner.resx
@@ -1197,7 +1197,7 @@
Commands
- MissionPlanner.Controls.MyDataGridView, MissionPlanner, Version=1.3.8237.31843, Culture=neutral, PublicKeyToken=null
+ MissionPlanner.Controls.MyDataGridView, MissionPlanner, Version=1.3.8412.38456, Culture=neutral, PublicKeyToken=null
panelWaypoints
@@ -1800,7 +1800,7 @@
17, 17
- 140, 22
+ 155, 22
Delete WP
@@ -1812,13 +1812,13 @@
At Current Position
- 140, 22
+ 155, 22
Insert Wp
- 140, 22
+ 155, 22
Insert Spline WP
@@ -1842,7 +1842,7 @@
Circles
- 140, 22
+ 155, 22
Loiter
@@ -1860,43 +1860,43 @@
WP #
- 140, 22
+ 155, 22
Jump
- 140, 22
+ 155, 22
RTL
- 140, 22
+ 155, 22
Land
- 140, 22
+ 155, 22
Takeoff
- 140, 22
+ 155, 22
DO_SET_ROI
- 140, 22
+ 155, 22
Clear Mission
- 137, 6
+ 152, 6
204, 22
@@ -1947,7 +1947,7 @@
Area
- 140, 22
+ 155, 22
Polygon
@@ -1989,7 +1989,7 @@
Clear
- 140, 22
+ 155, 22
Geo-Fence
@@ -2031,7 +2031,7 @@
Load Rally from File
- 140, 22
+ 155, 22
Rally Points
@@ -2073,61 +2073,67 @@
Survey (Grid)
- 140, 22
+ 155, 22
Auto WP
- 167, 22
+ 180, 22
Measure Distance
- 167, 22
+ 180, 22
Rotate Map
- 167, 22
+ 180, 22
Zoom To
- 167, 22
+ 180, 22
Prefetch
- 167, 22
+ 180, 22
Prefetch WP Path
- 167, 22
+ 180, 22
KML Overlay
- 167, 22
+ 180, 22
Elevation Graph
- 167, 22
+ 180, 22
Reverse WPs
+
+ 180, 22
+
+
+ GDAL Opacity
+
- 140, 22
+ 155, 22
Map Tool
@@ -2163,7 +2169,7 @@
Load SHP File
- 140, 22
+ 155, 22
File Load/Save
@@ -2187,43 +2193,43 @@
Edit
- 140, 22
+ 155, 22
POI
- 140, 22
+ 155, 22
Tracker Home
- 140, 22
+ 155, 22
Modify Alt
- 140, 22
+ 155, 22
Enter UTM Coord
- 140, 22
+ 155, 22
Switch Docking
- 140, 22
+ 155, 22
Set Home Here
- 141, 494
+ 156, 516
contextMenuStrip1
@@ -2433,7 +2439,7 @@
True
- 55
+ 53
0, 0, 0, 0
@@ -3113,6 +3119,12 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ gDALOpacityToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
FlightPlanner