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

3D View upgrade and fixes: Visualizing the world imagery in 3D View #11214

Merged
merged 6 commits into from
Apr 19, 2024

Conversation

omid-esrafilian
Copy link
Contributor

@omid-esrafilian omid-esrafilian commented Mar 7, 2024

The following changes have been made to the 3D View:

  • World imagery corresponding to the .osm file is also visualized in the 3D View along with the buildings (the imagery data changes based on the map provider specified in the Application Settings -> Maps).
  • The RTL and the waypoints sequence number are added to the 3D View
  • The MapScale widget is not visible while the 3D View is open
  • qmldirs for Viewer3D are moved to the src/QmlControls directory. All the Viewer3D modules can now be recognized by Qt Creator.
  • Rearranged the qml files/folders and CMakeList for each directory is added.
  • Fixed issue regarding Ardupilot for visualizing the mission

An example of the new changes is illustrated in the figure below:

Screenshot from 2024-03-07 22-55-36

@omid-esrafilian omid-esrafilian force-pushed the 3D_View_with_imagery branch 5 times, most recently from 0c38a40 to 1acbe89 Compare March 13, 2024 22:06
@SebastianViollaz
Copy link

For some reasson im unable to compile the code in the branch:
image

image

How could you compile it?

@omid-esrafilian
Copy link
Contributor Author

omid-esrafilian commented Mar 14, 2024

@SebastianViollaz
It is the same as building the QGC code. Please follow the following steps:

  1. git clone --recursive -j8 https://github.com/omid-esrafilian/qgroundcontrol-viewer3D.git
  2. cd qgroundcontrol-viewer3D
  3. git checkout 3D_View_with_imagery
  4. git submodule update --recursive

Then you can open and build the project using Qt Creator.

@SebastianViollaz
Copy link

I find this:

Here an overview of the mission:
image

Null value in item
image
I see a null value in the Take Off item

image

It seems like the "L" is showed too but a null value too.

No map loaded
As you can see in the previews photos the map isn't load properly. IN the 2D view is OK but no in 3D.
I change the source from Bing to Google and the problem solved. I don known if the problem is the source or what because in the 2D view is properly showed.
image

ROI not showed
As you can see in this image the ROI is no longer visible in the 3D view.
image
image

This is the flight plan that i'm using so you can test it
LaVerbena_V2.zip

@omid-esrafilian
Copy link
Contributor Author

@SebastianViollaz
Thanks much for the feedback.
Can you please also share with me the osm file you use, then I can test the whole scenarios and find out what is the problem.

@SebastianViollaz
Copy link

LaVervena.zip
This is the OSM file

@omid-esrafilian
Copy link
Contributor Author

@SebastianViollaz
And which flight control do you use?

@SebastianViollaz
Copy link

SebastianViollaz commented Mar 18, 2024

Im testing with the SITL Ardupilot sim (master version) https://github.com/ArduPilot/ardupilot. (Arducopter)
I'm in linux 22.04LTS (That could be the problem)
I have a non sim Arducopter, i let you known any news when i test it with this feature.

@SebastianViollaz
Copy link

I think that in the mission that i provied i don use the ROI that is in the tool side bar in the plan editor.
I add a mission item that change it command to the ROI (That because with the ROI that is in the tools bar an error is given). THis error was recently fixed in the master version #11159 if you marge maybe you can solve the problem of the ROI not showed

@omid-esrafilian omid-esrafilian changed the title 3D View upgrade: Visualizing the world imagery in 3D View 3D View upgrade and fixes: Visualizing the world imagery in 3D View Mar 18, 2024
@omid-esrafilian
Copy link
Contributor Author

@SebastianViollaz
The problem was that Ardupilot uses "MAV_CMD_DO_SET_ROI" to set the ROI which is Deprecated.
I have also included the latest changes from the upstream master branch.
Additionally, you should be able to use Bing as the map provider now.
Can you please test the code and see if the issues are solved?

@SebastianViollaz
Copy link

Tested, properly working for me

@omid-esrafilian
Copy link
Contributor Author

@SebastianViollaz
Perfect. Thanks much for the feedback.

@omid-esrafilian omid-esrafilian force-pushed the 3D_View_with_imagery branch 5 times, most recently from 5f3b3c5 to 8541e82 Compare March 31, 2024 18:51
@omid-esrafilian omid-esrafilian force-pushed the 3D_View_with_imagery branch 3 times, most recently from bf2e92c to e2b5117 Compare April 1, 2024 12:20
@@ -253,13 +253,20 @@ SettingsPage {
text: qsTr("Select File")

onClicked: {
var filename = qsTr(_viewer3DOsmFilePath.rawValue);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The qsTr here seems wrong. Unless I'm misunderstanding something qsTr should be used with string literals not variables.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DonLakeFlyer
Thanks for your comment. I just fixed that.

@DonLakeFlyer
Copy link
Contributor

@HTRamsey Can you look at the docs failure? I Quick Look by me seems to indicate that the check for a push has been removed and things which should be push only are running on pulls.

@omid-esrafilian
Copy link
Contributor Author

@DonLakeFlyer
The CI builds seem to work without error now, after rebasing with upstream/master.

@DonLakeFlyer
Copy link
Contributor

Great, thanks

@DonLakeFlyer DonLakeFlyer merged commit 3297352 into mavlink:master Apr 19, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants