Skip to content

Commit

Permalink
FlightPlanner: expose gdal opacity (map tools)
Browse files Browse the repository at this point in the history
  • Loading branch information
@meee1
meee1 committed Jan 12, 2023
1 parent 092e4a5 commit ace16ca
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 35 deletions.
18 changes: 17 additions & 1 deletion GCSViews/FlightPlanner.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions GCSViews/FlightPlanner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
80 changes: 46 additions & 34 deletions GCSViews/FlightPlanner.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@
<value>Commands</value>
</data>
<data name="&gt;&gt;Commands.Type" xml:space="preserve">
<value>MissionPlanner.Controls.MyDataGridView, MissionPlanner, Version=1.3.8237.31843, Culture=neutral, PublicKeyToken=null</value>
<value>MissionPlanner.Controls.MyDataGridView, MissionPlanner, Version=1.3.8412.38456, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;Commands.Parent" xml:space="preserve">
<value>panelWaypoints</value>
Expand Down Expand Up @@ -1800,7 +1800,7 @@
<value>17, 17</value>
</metadata>
<data name="deleteWPToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="deleteWPToolStripMenuItem.Text" xml:space="preserve">
<value>Delete WP</value>
Expand All @@ -1812,13 +1812,13 @@
<value>At Current Position</value>
</data>
<data name="insertWpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="insertWpToolStripMenuItem.Text" xml:space="preserve">
<value>Insert Wp</value>
</data>
<data name="insertSplineWPToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="insertSplineWPToolStripMenuItem.Text" xml:space="preserve">
<value>Insert Spline WP</value>
Expand All @@ -1842,7 +1842,7 @@
<value>Circles</value>
</data>
<data name="loiterToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="loiterToolStripMenuItem.Text" xml:space="preserve">
<value>Loiter</value>
Expand All @@ -1860,43 +1860,43 @@
<value>WP #</value>
</data>
<data name="jumpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 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>140, 22</value>
<value>155, 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>140, 22</value>
<value>155, 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>140, 22</value>
<value>155, 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>140, 22</value>
<value>155, 22</value>
</data>
<data name="setROIToolStripMenuItem.Text" xml:space="preserve">
<value>DO_SET_ROI</value>
</data>
<data name="clearMissionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 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>137, 6</value>
<value>152, 6</value>
</data>
<data name="addPolygonPointToolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
<value>204, 22</value>
Expand Down Expand Up @@ -1947,7 +1947,7 @@
<value>Area</value>
</data>
<data name="polygonToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="polygonToolStripMenuItem.Text" xml:space="preserve">
<value>Polygon</value>
Expand Down Expand Up @@ -1989,7 +1989,7 @@
<value>Clear</value>
</data>
<data name="geoFenceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="geoFenceToolStripMenuItem.Text" xml:space="preserve">
<value>Geo-Fence</value>
Expand Down Expand Up @@ -2031,7 +2031,7 @@
<value>Load Rally from File</value>
</data>
<data name="rallyPointsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="rallyPointsToolStripMenuItem.Text" xml:space="preserve">
<value>Rally Points</value>
Expand Down Expand Up @@ -2073,61 +2073,67 @@
<value>Survey (Grid)</value>
</data>
<data name="autoWPToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="autoWPToolStripMenuItem.Text" xml:space="preserve">
<value>Auto WP</value>
</data>
<data name="ContextMeasure.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 22</value>
<value>180, 22</value>
</data>
<data name="ContextMeasure.Text" xml:space="preserve">
<value>Measure Distance</value>
</data>
<data name="rotateMapToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 22</value>
<value>180, 22</value>
</data>
<data name="rotateMapToolStripMenuItem.Text" xml:space="preserve">
<value>Rotate Map</value>
</data>
<data name="zoomToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 22</value>
<value>180, 22</value>
</data>
<data name="zoomToToolStripMenuItem.Text" xml:space="preserve">
<value>Zoom To</value>
</data>
<data name="prefetchToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 22</value>
<value>180, 22</value>
</data>
<data name="prefetchToolStripMenuItem.Text" xml:space="preserve">
<value>Prefetch</value>
</data>
<data name="prefetchWPPathToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 22</value>
<value>180, 22</value>
</data>
<data name="prefetchWPPathToolStripMenuItem.Text" xml:space="preserve">
<value>Prefetch WP Path</value>
</data>
<data name="kMLOverlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 22</value>
<value>180, 22</value>
</data>
<data name="kMLOverlayToolStripMenuItem.Text" xml:space="preserve">
<value>KML Overlay</value>
</data>
<data name="elevationGraphToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 22</value>
<value>180, 22</value>
</data>
<data name="elevationGraphToolStripMenuItem.Text" xml:space="preserve">
<value>Elevation Graph</value>
</data>
<data name="reverseWPsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>167, 22</value>
<value>180, 22</value>
</data>
<data name="reverseWPsToolStripMenuItem.Text" xml:space="preserve">
<value>Reverse WPs</value>
</data>
<data name="gDALOpacityToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="gDALOpacityToolStripMenuItem.Text" xml:space="preserve">
<value>GDAL Opacity</value>
</data>
<data name="mapToolToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="mapToolToolStripMenuItem.Text" xml:space="preserve">
<value>Map Tool</value>
Expand Down Expand Up @@ -2163,7 +2169,7 @@
<value>Load SHP File</value>
</data>
<data name="fileLoadSaveToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="fileLoadSaveToolStripMenuItem.Text" xml:space="preserve">
<value>File Load/Save</value>
Expand All @@ -2187,43 +2193,43 @@
<value>Edit</value>
</data>
<data name="pOIToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="pOIToolStripMenuItem.Text" xml:space="preserve">
<value>POI</value>
</data>
<data name="trackerHomeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="trackerHomeToolStripMenuItem.Text" xml:space="preserve">
<value>Tracker Home</value>
</data>
<data name="modifyAltToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="modifyAltToolStripMenuItem.Text" xml:space="preserve">
<value>Modify Alt</value>
</data>
<data name="enterUTMCoordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="enterUTMCoordToolStripMenuItem.Text" xml:space="preserve">
<value>Enter UTM Coord</value>
</data>
<data name="switchDockingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="switchDockingToolStripMenuItem.Text" xml:space="preserve">
<value>Switch Docking</value>
</data>
<data name="setHomeHereToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
<value>155, 22</value>
</data>
<data name="setHomeHereToolStripMenuItem.Text" xml:space="preserve">
<value>Set Home Here</value>
</data>
<data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>141, 494</value>
<value>156, 516</value>
</data>
<data name="&gt;&gt;contextMenuStrip1.Name" xml:space="preserve">
<value>contextMenuStrip1</value>
Expand Down Expand Up @@ -2433,7 +2439,7 @@
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>55</value>
<value>53</value>
</metadata>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
Expand Down Expand Up @@ -3113,6 +3119,12 @@
<data name="&gt;&gt;zoomToHomeToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;gDALOpacityToolStripMenuItem.Name" xml:space="preserve">
<value>gDALOpacityToolStripMenuItem</value>
</data>
<data name="&gt;&gt;gDALOpacityToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>FlightPlanner</value>
</data>
Expand Down

0 comments on commit ace16ca

Please sign in to comment.