Merge branch 'cs1' into 'master' (8c168c17) · Commits · dfall / dfall-system

Commit 8c168c17 authored 4 years ago by beuchatp

Merge branch 'cs1' into 'master'

Added CS1 controller, plus additional improvements

See merge request dfall/dfall-system!15

parents 609a63d1 ddf3f968

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

dfall_ws/src/dfall_pkg/CMakeLists.txt 18 additions, 1 deletion

dfall_ws/src/dfall_pkg/CMakeLists.txt
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro 10 additions, 1 deletion

...ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/controllerstatusbanner.ui 257 additions, 0 deletions

...pkg/GUI_Qt/flyingAgentGUI/forms/controllerstatusbanner.ui
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui 387 additions, 8 deletions

...c/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/csonecontrollertab.ui 1285 additions, 0 deletions

...all_pkg/GUI_Qt/flyingAgentGUI/forms/csonecontrollertab.ui
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui 12 additions, 0 deletions

...l_pkg/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui 126 additions, 76 deletions

...UI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui 13 additions, 1 deletion

...s/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui 12 additions, 0 deletions

...l_pkg/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/Constants_for_Qt_compile.h 21 additions, 0 deletions

.../GUI_Qt/flyingAgentGUI/include/Constants_for_Qt_compile.h
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/controllerstatusbanner.h 87 additions, 0 deletions

...kg/GUI_Qt/flyingAgentGUI/include/controllerstatusbanner.h
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/controllertabs.h 16 additions, 4 deletions

.../dfall_pkg/GUI_Qt/flyingAgentGUI/include/controllertabs.h
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/csonecontrollertab.h 295 additions, 0 deletions

...ll_pkg/GUI_Qt/flyingAgentGUI/include/csonecontrollertab.h
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/enablecontrollerloadyamlbar.h 3 additions, 1 deletion

...I_Qt/flyingAgentGUI/include/enablecontrollerloadyamlbar.h
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/mainwindow.h 1 addition, 0 deletions

.../src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/mainwindow.h
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/remotecontrollertab.h 0 additions, 5 deletions

...l_pkg/GUI_Qt/flyingAgentGUI/include/remotecontrollertab.h
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp 6 additions, 6 deletions

...all_pkg/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllerstatusbanner.cpp 79 additions, 0 deletions

..._pkg/GUI_Qt/flyingAgentGUI/src/controllerstatusbanner.cpp
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp 132 additions, 28 deletions

...rc/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp
dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp 6 additions, 6 deletions

...rc/dfall_pkg/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp

with 2766 additions and 137 deletions

Please register or to comment

Admin message

Merge branch 'cs1' into 'master'