Merge branch 'add_checkbox_and_scale_box_CF' into pps_project (8cc10520) · Commits · authierj / dfall-system · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dfall-system
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

Admin message

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

8cc10520

Commit 8cc10520 authored 7 years ago by roangel

Downloads
- Plain Diff

Merge branch 'add_checkbox_and_scale_box_CF' into pps_project

parents 970f9262 f1507545

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro.user 1 addition, 1 deletion

...ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro.user
pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFly.h 2 additions, 0 deletions

pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFly.h
pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h 4 additions, 0 deletions

...src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h
pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp 6 additions, 1 deletion

pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp
pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp 55 additions, 5 deletions

...s/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui 279 additions, 298 deletions

...ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/marker.cpp 1 addition, 1 deletion

pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/marker.cpp
pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp 1 addition, 1 deletion

.../src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp
pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp 22 additions, 5 deletions

pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp

with 371 additions and 312 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