diff --git a/deploy/mavlinkgen_installer.nsi b/deploy/mavlinkgen_installer.nsi new file mode 100644 index 0000000000000000000000000000000000000000..1a5adb8f32bbeeb52e0f30acbbad6b7c59d44082 --- /dev/null +++ b/deploy/mavlinkgen_installer.nsi @@ -0,0 +1,35 @@ +Name "QGroundcontrol" + +OutFile "qgroundcontrol-installer-win32.exe" + +InstallDir $PROGRAMFILES\qgroundcontrol + +Page license +Page directory +Page components +Page instfiles +UninstPage uninstConfirm +UninstPage instfiles + +LicenseData ..\license.txt + +Section "" + + SetOutPath $INSTDIR + File ..\release\*.* + WriteUninstaller $INSTDIR\QGroundControl_uninstall.exe +SectionEnd + +Section "Uninstall" + Delete $INSTDIR\QGroundControl_uninstall.exe + Delete $INSTDIR\*.* + RMDir $INSTDIR + Delete "$SMPROGRAMS\QGroundControl\*.*" + RMDir "$SMPROGRAMS\QGroundControl\" +SectionEnd + +Section "create Start Menu Shortcuts" + CreateDirectory "$SMPROGRAMS\QGroundControl" + CreateShortCut "$SMPROGRAMS\QGroundControl\uninstall.lnk" "$INSTDIR\QGroundControl_uninstall.exe" "" "$INSTDIR\QGroundControl_uninstall.exe" 0 + CreateShortCut "$SMPROGRAMS\QGroundControl\QGroundControl.lnk" "$INSTDIR\qgroundcontrol.exe" "" "$INSTDIR\qgroundcontrol.exe" 0 +SectionEnd \ No newline at end of file diff --git a/qgcvideo.pro b/qgcvideo.pro new file mode 100644 index 0000000000000000000000000000000000000000..dfee8079f866c2c91ee22a06e93142df18c568f9 --- /dev/null +++ b/qgcvideo.pro @@ -0,0 +1,41 @@ +# Video streaming application for simple UDP direct byte streaming + + +QT += svg network + +TEMPLATE = app +TARGET = qgcvideo + +BASEDIR = . +BUILDDIR = build/qgcvideo +LANGUAGE = C++ + +CONFIG += release +CONFIG -= debug + +OBJECTS_DIR = $$BUILDDIR/obj +MOC_DIR = $$BUILDDIR/moc +UI_HEADERS_DIR = src/ui/generated + +macx:DESTDIR = $$BASEDIR/bin/mac + +INCLUDEPATH += . \ + src \ + src/ui \ + src/comm \ + include/ui \ + src/ui/mavlink \ + src/apps/qgcstreamer + +# Input + +HEADERS += src/apps/qgcvideo/QGCVideoApp.h + +SOURCES += \ + src/apps/qgcvideo/QGCVideoApp.cc \ + src/apps/qgcvideo/main.cc + +FORMS += \ + src/apps/qgcvideo/QGCVideoApp.ui + +RESOURCES = mavground.qrc diff --git a/src/QGC.cc b/src/QGC.cc index 58c6806fb86460626fc8d0dbb51c8a8ca8c396dd..08467d7e51ec4794a3b057872dae5848a48ec269 100644 --- a/src/QGC.cc +++ b/src/QGC.cc @@ -2,7 +2,7 @@ QGroundControl Open Source Ground Control Station -(c) 2009, 2010 QGROUNDCONTROL PROJECT +(c) 2009 - 2011 QGROUNDCONTROL PROJECT This file is part of the QGROUNDCONTROL project diff --git a/src/QGC.h b/src/QGC.h index 8c3834945b30ca33909a8e4b41e9fbab8ca9409f..638622b11e8a10240f01be6b20a7752b09fc650c 100644 --- a/src/QGC.h +++ b/src/QGC.h @@ -1,3 +1,26 @@ +/*===================================================================== + + QGroundControl Open Source Ground Control Station + + (c) 2009 - 2011 QGROUNDCONTROL PROJECT + + This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL 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. + + QGROUNDCONTROL 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 QGROUNDCONTROL. If not, see . + + ======================================================================*/ + #ifndef QGC_H #define QGC_H diff --git a/src/apps/qgcvideo/QGCVideoApp.cc b/src/apps/qgcvideo/QGCVideoApp.cc new file mode 100644 index 0000000000000000000000000000000000000000..bc19388160dc6adbd942d7f3c74b093ba26b3710 --- /dev/null +++ b/src/apps/qgcvideo/QGCVideoApp.cc @@ -0,0 +1,44 @@ +/*===================================================================== + + QGroundControl Open Source Ground Control Station + + (c) 2009 - 2011 QGROUNDCONTROL PROJECT + + This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL 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. + + QGROUNDCONTROL 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 QGROUNDCONTROL. If not, see . + + ======================================================================*/ + +/** + * @file + * @brief Main executable + * @author Lorenz Meier + * + */ + +#include "QGCVideoApp.h" +#include "ui_QGCVideoApp.h" + +QGCVideoApp::QGCVideoApp(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::QGCVideoApp) +{ + ui->setupUi(this); +} + +QGCVideoApp::~QGCVideoApp() +{ + delete ui; +} diff --git a/src/apps/qgcvideo/QGCVideoApp.h b/src/apps/qgcvideo/QGCVideoApp.h new file mode 100644 index 0000000000000000000000000000000000000000..b07a0eee8b224f382f5999b0e44f07be3ee6a540 --- /dev/null +++ b/src/apps/qgcvideo/QGCVideoApp.h @@ -0,0 +1,52 @@ +/*===================================================================== + + QGroundControl Open Source Ground Control Station + + (c) 2009 - 2011 QGROUNDCONTROL PROJECT + + This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL 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. + + QGROUNDCONTROL 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 QGROUNDCONTROL. If not, see . + + ======================================================================*/ + +/** + * @file + * @brief Main executable + * @author Lorenz Meier + * + */ + +#ifndef QGCVIDEOAPP_H +#define QGCVIDEOAPP_H + +#include + +namespace Ui { + class QGCVideoApp; +} + +class QGCVideoApp : public QMainWindow +{ + Q_OBJECT + +public: + explicit QGCVideoApp(QWidget *parent = 0); + ~QGCVideoApp(); + +private: + Ui::QGCVideoApp *ui; +}; + +#endif // QGCVIDEOAPP_H diff --git a/src/apps/qgcvideo/QGCVideoApp.ui b/src/apps/qgcvideo/QGCVideoApp.ui new file mode 100644 index 0000000000000000000000000000000000000000..989e852e8c86c4128ef93fd4b2445ba468b96246 --- /dev/null +++ b/src/apps/qgcvideo/QGCVideoApp.ui @@ -0,0 +1,24 @@ + + + + + QGCVideoApp + + + + 0 + 0 + 800 + 600 + + + + MainWindow + + + + + + + + diff --git a/src/apps/qgcvideo/main.cc b/src/apps/qgcvideo/main.cc new file mode 100644 index 0000000000000000000000000000000000000000..c21f383efb03b6154bfac391b480badbdd3f916a --- /dev/null +++ b/src/apps/qgcvideo/main.cc @@ -0,0 +1,46 @@ +/*===================================================================== + + QGroundControl Open Source Ground Control Station + + (c) 2009 - 2011 QGROUNDCONTROL PROJECT + + This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL 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. + + QGROUNDCONTROL 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 QGROUNDCONTROL. If not, see . + + ======================================================================*/ + +/** + * @file + * @brief Main executable + * @author Lorenz Meier + * + */ + +#include +#include "QGCVideoApp.h" + +/** + * @brief Starts the application + * + * @param argc Number of commandline arguments + * @param argv Commandline arguments + * @return exit code, 0 for normal exit and !=0 for error cases + */ +int main(int argc, char *argv[]) +{ + + QGCVideoApp app(argc, argv); + return app.exec(); +}