Merge remote-tracking branch 'origin/master'

Conflicts:
groundstation/groundstation.pro.user
groundstation/groundstation.pro.user.a55f9dc
groundstation/groundstation.pro.user.f0de3c1.3.3-pre1

build-groundstation-Desktop_Qt_Qt_Version_clang_64bit-Debug/.qmake.stash

@@ -0,0 +1,17 @@
+QMAKE_XCODE_DEVELOPER_PATH = /Applications/Xcode.app/Contents/Developer
+QMAKE_XCODE_VERSION = 6.1.1
+QMAKE_MAC_SDK.macosx.path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk
+QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
+QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
+QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_FIX_RPATH = \
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool \
+    -id
+QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_AR = \
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar \
+    cq
+QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_RANLIB = \
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib \
+    -s
+QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
+QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK_SHLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
+QMAKE_MAC_SDK.macosx.platform_name = macosx

build-groundstation-Desktop_Qt_Qt_Version_clang_64bit-Debug/groundstation.app/Contents/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleExecutable</key>
+	<string>groundstation</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.groundstation</string>
+	<key>NOTE</key>
+	<string>This file was generated by Qt/QMake.</string>
+</dict>
+</plist>

build-groundstation-Desktop_Qt_Qt_Version_clang_64bit-Debug/groundstation.app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPL????

build-groundstation-Desktop_Qt_Qt_Version_clang_64bit-Debug/moc_mainpicdisplay.cpp

@@ -0,0 +1,151 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'mainpicdisplay.h'
+**
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.4.0)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "../groundstation/mainpic/mainpicdisplay.h"
+#include <QtCore/qbytearray.h>
+#include <QtCore/qmetatype.h>
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'mainpicdisplay.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 67
+#error "This file was generated using the moc from 5.4.0. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+struct qt_meta_stringdata_MainPicDisplay_t {
+    QByteArrayData data[11];
+    char stringdata[88];
+};
+#define QT_MOC_LITERAL(idx, ofs, len) \
+    Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
+    qptrdiff(offsetof(qt_meta_stringdata_MainPicDisplay_t, stringdata) + ofs \
+        - idx * sizeof(QByteArrayData)) \
+    )
+static const qt_meta_stringdata_MainPicDisplay_t qt_meta_stringdata_MainPicDisplay = {
+    {
+QT_MOC_LITERAL(0, 0, 14), // "MainPicDisplay"
+QT_MOC_LITERAL(1, 15, 7), // "clicked"
+QT_MOC_LITERAL(2, 23, 0), // ""
+QT_MOC_LITERAL(3, 24, 1), // "x"
+QT_MOC_LITERAL(4, 26, 1), // "y"
+QT_MOC_LITERAL(5, 28, 6), // "zoomIn"
+QT_MOC_LITERAL(6, 35, 7), // "zoomOut"
+QT_MOC_LITERAL(7, 43, 9), // "zoomToFit"
+QT_MOC_LITERAL(8, 53, 15), // "mousePressEvent"
+QT_MOC_LITERAL(9, 69, 12), // "QMouseEvent*"
+QT_MOC_LITERAL(10, 82, 5) // "event"
+
+    },
+    "MainPicDisplay\0clicked\0\0x\0y\0zoomIn\0"
+    "zoomOut\0zoomToFit\0mousePressEvent\0"
+    "QMouseEvent*\0event"
+};
+#undef QT_MOC_LITERAL
+
+static const uint qt_meta_data_MainPicDisplay[] = {
+
+ // content:
+       7,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       5,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       1,       // signalCount
+
+ // signals: name, argc, parameters, tag, flags
+       1,    2,   39,    2, 0x06 /* Public */,
+
+ // slots: name, argc, parameters, tag, flags
+       5,    0,   44,    2, 0x0a /* Public */,
+       6,    0,   45,    2, 0x0a /* Public */,
+       7,    0,   46,    2, 0x0a /* Public */,
+       8,    1,   47,    2, 0x09 /* Protected */,
+
+ // signals: parameters
+    QMetaType::Void, QMetaType::Int, QMetaType::Int,    3,    4,
+
+ // slots: parameters
+    QMetaType::Void,
+    QMetaType::Void,
+    QMetaType::Void,
+    QMetaType::Void, 0x80000000 | 9,   10,
+
+       0        // eod
+};
+
+void MainPicDisplay::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        MainPicDisplay *_t = static_cast<MainPicDisplay *>(_o);
+        switch (_id) {
+        case 0: _t->clicked((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break;
+        case 1: _t->zoomIn(); break;
+        case 2: _t->zoomOut(); break;
+        case 3: _t->zoomToFit(); break;
+        case 4: _t->mousePressEvent((*reinterpret_cast< QMouseEvent*(*)>(_a[1]))); break;
+        default: ;
+        }
+    } else if (_c == QMetaObject::IndexOfMethod) {
+        int *result = reinterpret_cast<int *>(_a[0]);
+        void **func = reinterpret_cast<void **>(_a[1]);
+        {
+            typedef void (MainPicDisplay::*_t)(int , int );
+            if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&MainPicDisplay::clicked)) {
+                *result = 0;
+            }
+        }
+    }
+}
+
+const QMetaObject MainPicDisplay::staticMetaObject = {
+    { &QLabel::staticMetaObject, qt_meta_stringdata_MainPicDisplay.data,
+      qt_meta_data_MainPicDisplay,  qt_static_metacall, Q_NULLPTR, Q_NULLPTR}
+};
+
+
+const QMetaObject *MainPicDisplay::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
+}
+
+void *MainPicDisplay::qt_metacast(const char *_clname)
+{
+    if (!_clname) return Q_NULLPTR;
+    if (!strcmp(_clname, qt_meta_stringdata_MainPicDisplay.stringdata))
+        return static_cast<void*>(const_cast< MainPicDisplay*>(this));
+    return QLabel::qt_metacast(_clname);
+}
+
+int MainPicDisplay::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QLabel::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 5)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 5;
+    } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
+        if (_id < 5)
+            *reinterpret_cast<int*>(_a[0]) = -1;
+        _id -= 5;
+    }
+    return _id;
+}
+
+// SIGNAL 0
+void MainPicDisplay::clicked(int _t1, int _t2)
+{
+    void *_a[] = { Q_NULLPTR, const_cast<void*>(reinterpret_cast<const void*>(&_t1)), const_cast<void*>(reinterpret_cast<const void*>(&_t2)) };
+    QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+QT_END_MOC_NAMESPACE

build-groundstation-Desktop_Qt_Qt_Version_clang_64bit-Debug/moc_mainpicwidget.cpp

@@ -0,0 +1,127 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'mainpicwidget.h'
+**
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.4.0)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "../groundstation/mainpic/mainpicwidget.h"
+#include <QtCore/qbytearray.h>
+#include <QtCore/qmetatype.h>
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'mainpicwidget.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 67
+#error "This file was generated using the moc from 5.4.0. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+struct qt_meta_stringdata_MainPicWidget_t {
+    QByteArrayData data[10];
+    char stringdata[92];
+};
+#define QT_MOC_LITERAL(idx, ofs, len) \
+    Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
+    qptrdiff(offsetof(qt_meta_stringdata_MainPicWidget_t, stringdata) + ofs \
+        - idx * sizeof(QByteArrayData)) \
+    )
+static const qt_meta_stringdata_MainPicWidget_t qt_meta_stringdata_MainPicWidget = {
+    {
+QT_MOC_LITERAL(0, 0, 13), // "MainPicWidget"
+QT_MOC_LITERAL(1, 14, 10), // "toggleMode"
+QT_MOC_LITERAL(2, 25, 0), // ""
+QT_MOC_LITERAL(3, 26, 12), // "deleteTarget"
+QT_MOC_LITERAL(4, 39, 16), // "onPictureClicked"
+QT_MOC_LITERAL(5, 56, 1), // "x"
+QT_MOC_LITERAL(6, 58, 1), // "y"
+QT_MOC_LITERAL(7, 60, 20), // "onTargetTableChanged"
+QT_MOC_LITERAL(8, 81, 3), // "row"
+QT_MOC_LITERAL(9, 85, 6) // "column"
+
+    },
+    "MainPicWidget\0toggleMode\0\0deleteTarget\0"
+    "onPictureClicked\0x\0y\0onTargetTableChanged\0"
+    "row\0column"
+};
+#undef QT_MOC_LITERAL
+
+static const uint qt_meta_data_MainPicWidget[] = {
+
+ // content:
+       7,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       4,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // slots: name, argc, parameters, tag, flags
+       1,    0,   34,    2, 0x0a /* Public */,
+       3,    0,   35,    2, 0x0a /* Public */,
+       4,    2,   36,    2, 0x0a /* Public */,
+       7,    2,   41,    2, 0x0a /* Public */,
+
+ // slots: parameters
+    QMetaType::Void,
+    QMetaType::Void,
+    QMetaType::Void, QMetaType::Int, QMetaType::Int,    5,    6,
+    QMetaType::Void, QMetaType::Int, QMetaType::Int,    8,    9,
+
+       0        // eod
+};
+
+void MainPicWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        MainPicWidget *_t = static_cast<MainPicWidget *>(_o);
+        switch (_id) {
+        case 0: _t->toggleMode(); break;
+        case 1: _t->deleteTarget(); break;
+        case 2: _t->onPictureClicked((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break;
+        case 3: _t->onTargetTableChanged((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break;
+        default: ;
+        }
+    }
+}
+
+const QMetaObject MainPicWidget::staticMetaObject = {
+    { &QWidget::staticMetaObject, qt_meta_stringdata_MainPicWidget.data,
+      qt_meta_data_MainPicWidget,  qt_static_metacall, Q_NULLPTR, Q_NULLPTR}
+};
+
+
+const QMetaObject *MainPicWidget::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
+}
+
+void *MainPicWidget::qt_metacast(const char *_clname)
+{
+    if (!_clname) return Q_NULLPTR;
+    if (!strcmp(_clname, qt_meta_stringdata_MainPicWidget.stringdata))
+        return static_cast<void*>(const_cast< MainPicWidget*>(this));
+    return QWidget::qt_metacast(_clname);
+}
+
+int MainPicWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QWidget::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 4)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 4;
+    } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
+        if (_id < 4)
+            *reinterpret_cast<int*>(_a[0]) = -1;
+        _id -= 4;
+    }
+    return _id;
+}
+QT_END_MOC_NAMESPACE