From 61e218bf6b6964e94678b0a9a534e04d15c56d2f Mon Sep 17 00:00:00 2001 From: beuchatp <beuchatp@control.ee.ethz.ch> Date: Tue, 31 Oct 2017 23:23:03 +0100 Subject: [PATCH] Adapted license header to match with the ETH Zurich requirements (for Student GUI) --- .../GUI_Qt/studentGUI/include/MainWindow.h | 31 ++++++++++++++----- .../GUI_Qt/studentGUI/include/rosNodeThread.h | 31 ++++++++++++++----- .../GUI_Qt/studentGUI/src/MainWindow.cpp | 31 ++++++++++++++----- .../d_fall_pps/GUI_Qt/studentGUI/src/main.cpp | 31 ++++++++++++++----- .../GUI_Qt/studentGUI/src/rosNodeThread.cpp | 31 ++++++++++++++----- 5 files changed, 115 insertions(+), 40 deletions(-) diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h index a5d98085..5cb99d86 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h @@ -1,19 +1,34 @@ -// Main window of the Student's GUI -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Main window of the Student's GUI +// +// ---------------------------------------------------------------------------------- + #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread.h b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread.h index a33e0f82..19356124 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread.h @@ -1,19 +1,34 @@ -// Takes care of creating a ros node thread. -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Takes care of creating a ros node thread. +// +// ---------------------------------------------------------------------------------- + #ifndef ___ROSNODETHREAD_H___ #define ___ROSNODETHREAD_H___ diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp index ce54c47b..24c01a5e 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp @@ -1,19 +1,34 @@ -// Main window of the Student's GUI -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Main window of the Student's GUI +// +// ---------------------------------------------------------------------------------- + #include "MainWindow.h" #include "ui_MainWindow.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp index a200956f..27bdde98 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp @@ -1,19 +1,34 @@ -// Main program of the Student's GUI -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Main program of the Student's GUI +// +// ---------------------------------------------------------------------------------- + #include "MainWindow.h" #include <QApplication> diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread.cpp index 75296ca7..ce3b6182 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread.cpp @@ -1,19 +1,34 @@ -// Takes care of creating a ros node thread. -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Takes care of creating a ros node thread. +// +// ---------------------------------------------------------------------------------- + #include "rosNodeThread.h" -- GitLab