Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qgroundcontrol
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

306c978c

Commit 306c978c authored 14 years ago by pixhawk

Downloads
- Plain Diff

Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol

parents 95ad5350 8b414e7d

Branches

No related tags found

Loading

Changes 16

Expand all Hide whitespace changes

Inline Side-by-side

Showing

qgroundcontrol.pro 15 additions, 4 deletions

qgroundcontrol.pro
src/Core.cc 2 additions, 2 deletions

src/Core.cc
src/uas/UAS.cc 15 additions, 3 deletions

src/uas/UAS.cc
src/uas/UAS.h 15 additions, 0 deletions

src/uas/UAS.h
src/uas/UASInterface.h 8 additions, 0 deletions

src/uas/UASInterface.h
src/ui/MainWindow.cc 3 additions, 1 deletion

src/ui/MainWindow.cc
src/ui/MainWindow.h 2 additions, 1 deletion

src/ui/MainWindow.h
src/ui/MainWindow.ui 22 additions, 33 deletions

src/ui/MainWindow.ui
src/ui/map3D/CheetahGL.cc 59352 additions, 0 deletions

src/ui/map3D/CheetahGL.cc
src/ui/map3D/CheetahGL.h 8 additions, 0 deletions

src/ui/map3D/CheetahGL.h
src/ui/map3D/CheetahModel.cc 24 additions, 0 deletions

src/ui/map3D/CheetahModel.cc
src/ui/map3D/CheetahModel.h 18 additions, 0 deletions

src/ui/map3D/CheetahModel.h
src/ui/map3D/Q3DWidget.cc 846 additions, 0 deletions

src/ui/map3D/Q3DWidget.cc
src/ui/map3D/Q3DWidget.h 179 additions, 0 deletions

src/ui/map3D/Q3DWidget.h
src/ui/map3D/QMap3DWidget.cc 357 additions, 0 deletions

src/ui/map3D/QMap3DWidget.cc
src/ui/map3D/QMap3DWidget.h 63 additions, 0 deletions

src/ui/map3D/QMap3DWidget.h

with 60929 additions and 44 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment