Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JIC PicViewer #1437

Merged
merged 3 commits into from
Oct 22, 2024
Merged

JIC PicViewer #1437

merged 3 commits into from
Oct 22, 2024

Conversation

rmackay9
Copy link
Contributor

@rmackay9 rmackay9 commented Aug 14, 2024

This PR adds a new offline picture viewer to MAVProxy for use in the Japan Innovation Challenge.

The design (and some code) borrows heavily from the Canberra UAV team's CUAV tool

How-to-use:

  • MAVPicViewer application is installed along with MAVProxy (much like MAVExplorer)
  • Use the MAVPicViewer icon to start the application (if visible) or start the mavpicviewer.py script. Once started 3 windows should appear:
    • Mosaic shows thumbnails of all images
    • Image Viewer shows the current image and allows users to set a single POI per image
    • SlipMap shows a map of the area with the current image's area highlighted in green. This improves the reviewers situational awareness

The Mosaic view (shown below) allows users to move through the images using the arrow keys. The selected image is shown with a green border. Images with a POI defined appear with a red border.

The Camera/Vehicle and POI locations are shown and if the image provides temperature the max temperature is shown along with the pixel coordinate.

The menu includes, "Open folder", "Show All", "Show POI", "Settings" (for setting the FOV) and "Quit"
mavpicviewer-mosaic

The Image view shows the currently selected image. The user can also move to the next or previous image using the left and right arrow keys. A single POI can be selected by clicking-and-holding the left mouse button, moving the mouse and then releasing the left-mouse-button. The POI appears in red on the image. This same POI is also shown on the map. If the image provides thermal data then the hottest pixel is shown with a yellow square. This yellow square can be toggled on and off in case it gets in the way
mavpicviewer-image

The Map view shows a projection of the current Image on the map in green. If a POI has been defined it appears as a red square. As the user moves through images the Map updates.
mavpicviewer-map

The application can be started on windows using the MAVPicViewer icon from the start menu.
image

Enhancements planned:

  • support saving the current image including POI to a new image
  • allow users to click on the map and have the Image and Mosaic views jump to the closest image
  • improve visibility of the POI's lat,lon (and also the cursor's lat,lon)
  • reduce the Mosaic so that it only shows images with POI defined

video demonstration: https://youtu.be/Uf72fXjat3A

Any and all feedback is very welcome

@tridge tridge removed the DevCallEU label Aug 14, 2024
@rmackay9 rmackay9 force-pushed the jic-picviewer branch 2 times, most recently from 63f45de to 3cdb8af Compare September 1, 2024 12:19
@rmackay9 rmackay9 added enhancement and removed WIP labels Oct 4, 2024
@rmackay9 rmackay9 changed the title JIC PicViewer (WIP) JIC PicViewer Oct 4, 2024
@rmackay9 rmackay9 force-pushed the jic-picviewer branch 5 times, most recently from 118c93f to cfa0c72 Compare October 8, 2024 05:42
@stephendade
Copy link
Contributor

@rmackay9, you asked about using your custom icon for mavpicviewer: You'll want to take a look at ./windows/mavproxy.iss, which builds the MAVProxy installer exe. Within that, I've defined the icons for the start menu entries for MAVProxy and MAVExplorer.

@rmackay9 rmackay9 force-pushed the jic-picviewer branch 3 times, most recently from 5d39c13 to 9f171e0 Compare October 16, 2024 02:19
tridge
tridge previously requested changes Oct 19, 2024
MAVProxy/modules/lib/mp_menu.py Show resolved Hide resolved
@rmackay9 rmackay9 dismissed tridge’s stale review October 21, 2024 03:58

Issue identified by Tridge has been fixed, thanks!

@tridge tridge merged commit b7d20f7 into ArduPilot:master Oct 22, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants