Remove PIXHAWK specific board support

This is the Pixhawk research board, not the PX4 production board.

QGCExternalLibs.pri

@@ -31,12 +31,6 @@ else:exists(user_config.pri):infile(user_config.pri, MAVLINK_CONF) {
         message($$sprintf("Using MAVLink dialect '%1' specified in user_config.pri", $$MAVLINK_CONF))
     }
 }
-# If no valid user selection is found, default to the pixhawk if it's available.
-# Note: This can be a list of several dialects.
-else {
-    MAVLINK_CONF=pixhawk
-    message($$sprintf("Using default MAVLink dialect '%1'.", $$MAVLINK_CONF))
-}
 
 # Then we add the proper include paths dependent on the dialect.
 INCLUDEPATH += $$MAVLINKPATH

qgroundcontrol.pro

@@ -243,7 +243,6 @@ INCLUDEPATH += \
     src/lib/qmapcontrol \
     src/ui/mavlink \
     src/ui/param \
-    src/ui/watchdog \
     src/ui/map3D \
     src/ui/mission \
     src/ui/designer \
@@ -262,16 +261,12 @@ FORMS += \
     src/ui/UASView.ui \
     src/ui/ParameterInterface.ui \
     src/ui/WaypointList.ui \
-    src/ui/ObjectDetectionView.ui \
     src/ui/JoystickWidget.ui \
     src/ui/DebugConsole.ui \
     src/ui/HDDisplay.ui \
     src/ui/MAVLinkSettingsWidget.ui \
     src/ui/AudioOutputWidget.ui \
     src/ui/QGCSensorSettingsWidget.ui \
-    src/ui/watchdog/WatchdogControl.ui \
-    src/ui/watchdog/WatchdogProcessView.ui \
-    src/ui/watchdog/WatchdogView.ui \
     src/ui/QGCDataPlot2D.ui \
     src/ui/QGCRemoteControlView.ui \
     src/ui/QMap3D.ui \
@@ -370,7 +365,6 @@ HEADERS += \
     src/ui/ParameterInterface.h \
     src/ui/WaypointList.h \
     src/Waypoint.h \
-    src/ui/ObjectDetectionView.h \
     src/input/JoystickInput.h \
     src/ui/JoystickWidget.h \
     src/ui/DebugConsole.h \
@@ -382,10 +376,6 @@ HEADERS += \
     src/ui/QGCParamWidget.h \
     src/ui/QGCSensorSettingsWidget.h \
     src/ui/linechart/Linecharts.h \
-    src/uas/PxQuadMAV.h \
-    src/ui/watchdog/WatchdogControl.h \
-    src/ui/watchdog/WatchdogProcessView.h \
-    src/ui/watchdog/WatchdogView.h \
     src/uas/UASWaypointManager.h \
     src/ui/HSIDisplay.h \
     src/QGC.h \
@@ -528,7 +518,6 @@ SOURCES += \
     src/ui/ParameterInterface.cc \
     src/ui/WaypointList.cc \
     src/Waypoint.cc \
-    src/ui/ObjectDetectionView.cc \
     src/input/JoystickInput.cc \
     src/ui/JoystickWidget.cc \
     src/ui/DebugConsole.cc \
@@ -540,10 +529,6 @@ SOURCES += \
     src/ui/QGCParamWidget.cc \
     src/ui/QGCSensorSettingsWidget.cc \
     src/ui/linechart/Linecharts.cc \
-    src/uas/PxQuadMAV.cc \
-    src/ui/watchdog/WatchdogControl.cc \
-    src/ui/watchdog/WatchdogProcessView.cc \
-    src/ui/watchdog/WatchdogView.cc \
     src/uas/UASWaypointManager.cc \
     src/ui/HSIDisplay.cc \
     src/QGC.cc \

src/comm/MAVLinkProtocol.cc

@@ -24,7 +24,6 @@
 #include "UASManager.h"
 #include "UASInterface.h"
 #include "UAS.h"
-#include "PxQuadMAV.h"
 #include "configuration.h"
 #include "LinkManager.h"
 #include "QGCMAVLink.h"

src/comm/MAVLinkSimulationLink.cc

@@ -197,10 +197,6 @@ void MAVLinkSimulationLink::mainloop()
 
     mavlink_attitude_t attitude;
     memset(&attitude, 0, sizeof(mavlink_attitude_t));
-#ifdef MAVLINK_ENABLED_PIXHAWK
-    mavlink_raw_aux_t rawAuxValues;
-    memset(&rawAuxValues, 0, sizeof(mavlink_raw_aux_t));
-#endif
     mavlink_raw_imu_t rawImuValues;
     memset(&rawImuValues, 0, sizeof(mavlink_raw_imu_t));
 
@@ -301,15 +297,6 @@ void MAVLinkSimulationLink::mainloop()
                         rawImuValues.zgyro = d;
                         attitude.yawspeed = ((d-29.000)/3000.0)*2.7-2.7-2.65;
                     }
-#ifdef MAVLINK_ENABLED_PIXHAWK
-                    if (keys.value(i, "") == "Pressure") {
-                        rawAuxValues.baro = d;
-                    }
-
-                    if (keys.value(i, "") == "Battery") {
-                        rawAuxValues.vbat = d;
-                    }
-#endif
                     if (keys.value(i, "") == "roll_IMU") {
                         attitude.roll = d;
                     }
@@ -473,46 +460,6 @@ void MAVLinkSimulationLink::mainloop()
 
         static int detectionCounter = 6;
         if (detectionCounter % 10 == 0) {
-#ifdef MAVLINK_ENABLED_PIXHAWK
-            mavlink_pattern_detected_t detected;
-            detected.confidence = 5.0f;
-            detected.type = 0;  // compiler confused into thinking type is used unitialized, bogus init to silence
-
-            if (detectionCounter == 10) {
-                char fileName[] = "patterns/face5.png";
-                memcpy(detected.file, fileName, sizeof(fileName));
-                detected.type = 0; // 0: Pattern, 1: Letter
-            } else if (detectionCounter == 20) {
-                char fileName[] = "7";
-                memcpy(detected.file, fileName, sizeof(fileName));
-                detected.type = 1; // 0: Pattern, 1: Letter
-            } else if (detectionCounter == 30) {
-                char fileName[] = "patterns/einstein.bmp";
-                memcpy(detected.file, fileName, sizeof(fileName));
-                detected.type = 0; // 0: Pattern, 1: Letter
-            } else if (detectionCounter == 40) {
-                char fileName[] = "F";
-                memcpy(detected.file, fileName, sizeof(fileName));
-                detected.type = 1; // 0: Pattern, 1: Letter
-            } else if (detectionCounter == 50) {
-                char fileName[] = "patterns/face2.png";
-                memcpy(detected.file, fileName, sizeof(fileName));
-                detected.type = 0; // 0: Pattern, 1: Letter
-            } else if (detectionCounter == 60) {
-                char fileName[] = "H";
-                memcpy(detected.file, fileName, sizeof(fileName));
-                detected.type = 1; // 0: Pattern, 1: Letter
-                detectionCounter = 0;
-            }
-            detected.detected = 1;
-            mavlink_msg_pattern_detected_encode(systemId, componentId, &msg, &detected);
-            // Allocate buffer with packet data
-            bufferlength = mavlink_msg_to_send_buffer(buffer, &msg);
-            //add data into datastream
-            memcpy(stream+streampointer,buffer, bufferlength);
-            streampointer += bufferlength;
-            //detectionCounter = 0;
-#endif
         }
         detectionCounter++;
 
@@ -701,14 +648,6 @@ void MAVLinkSimulationLink::writeBytes(const char* data, qint64 size)
 //                }
             }
             break;
-#ifdef MAVLINK_ENABLED_PIXHAWK
-            case MAVLINK_MSG_ID_MANUAL_CONTROL: {
-                mavlink_manual_control_t control;
-                mavlink_msg_manual_control_decode(&msg, &control);
-//                qDebug() << "\n" << "ROLL:" << control.x << "PITCH:" << control.y;
-            }
-            break;
-#endif
             case MAVLINK_MSG_ID_PARAM_REQUEST_LIST:
             {
 //                qDebug() << "GCS REQUESTED PARAM LIST FROM SIMULATION";

src/comm/OpalLink.cc

@@ -199,47 +199,6 @@ void OpalLink::writeBytes(const char *bytes, qint64 length)
                 params->getParameter(OpalRT::SERVO_INPUTS, "PIT_SET4_IN").setValue(((radio.pitch[4]>900 /*in us?*/)?radio.pitch[4]/1000:radio.pitch[4]));
         }
         break;
-#endif
-#ifdef MAVLINK_ENABLED_PIXHAWK
-        case MAVLINK_MSG_ID_REQUEST_DATA_STREAM: {
-            mavlink_request_data_stream_t stream;
-            mavlink_msg_request_data_stream_decode(&msg, &stream);
-            switch (stream.req_stream_id) {
-            case 0: // All data types
-                break;
-            case 1: // Raw Sensor Data
-                break;
-            case 2: // extended system status
-                break;
-            case 3: // rc channel data
-                sendRCValues = (stream.start_stop == 1?true:false);
-                break;
-            case 4: // raw controller
-                if (stream.start_stop == 1)
-                    sendRawController = true;
-                else
-                    sendRawController = false;
-                break;
-            case 5: // raw sensor fusion
-                break;
-            case 6: // position
-                sendPosition = (stream.start_stop == 1?true:false);
-                break;
-            case 7: // extra 1
-                break;
-            case 8: // extra 2
-                break;
-            case 9: // extra 3
-                break;
-            default:
-                qDebug() << __FILE__ << __LINE__ << "Received Unknown Data Strem Request with ID" << stream.req_stream_id;
-            }
-        }
-        break;
-        default: {
-            qDebug() << "OpalLink::writeBytes(): Unknown mavlink packet";
-        }
-        }
 #endif
     }
 

src/comm/QGCMAVLink.h

@@ -32,12 +32,5 @@ This file is part of the QGROUNDCONTROL project
 
 #include <mavlink.h>
 
-//#ifdef MAVLINK_CONF
-//#define MY_MACRO(x) <x>
-//#include MY_MACRO(MAVLINK_CONF)
-//#include MAVLINK_CONF
-//#endif
-
-
 #endif // QGCMAVLINK_H
 

src/uas/PxQuadMAV.h

-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
-
-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 <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-#ifndef PXQUADMAV_H
-#define PXQUADMAV_H
-
-#include "UAS.h"
-
-class PxQuadMAV : public UAS
-{
-    Q_OBJECT
-    Q_INTERFACES(UASInterface)
-public:
-    PxQuadMAV(MAVLinkProtocol* mavlink, QThread* thread, int id);
-public slots:
-    /** @brief Receive a MAVLink message from this MAV */
-    void receiveMessage(LinkInterface* link, mavlink_message_t message);
-    /** @brief Send a command to an onboard process */
-    void sendProcessCommand(int watchdogId, int processId, unsigned int command);
-signals:
-    void watchdogReceived(int systemId, int watchdogId, unsigned int processCount);
-    void processReceived(int systemId, int watchdogId, int processId, QString name, QString arguments, int timeout);
-    void processChanged(int systemId, int watchdogId, int processId, int state, bool muted, int crashed, int pid);
-};
-
-#endif // PXQUADMAV_H

src/uas/QGCMAVLinkUASFactory.cc

@@ -39,20 +39,6 @@ UASInterface* QGCMAVLinkUASFactory::createUAS(MAVLinkProtocol* mavlink, LinkInte
         uas = mav;
     }
     break;
-    case MAV_AUTOPILOT_PIXHAWK:
-    {
-        PxQuadMAV* mav = new PxQuadMAV(mavlink, worker, sysid);
-        // Set the system type
-        mav->setSystemType((int)heartbeat->type);
-
-        // Connect this robot to the UAS object
-        // it is IMPORTANT here to use the right object type,
-        // else the slot of the parent object is called (and thus the special
-        // packets never reach their goal)
-        connect(mavlink, SIGNAL(messageReceived(LinkInterface*, mavlink_message_t)), mav, SLOT(receiveMessage(LinkInterface*, mavlink_message_t)));
-        uas = mav;
-    }
-    break;
     case MAV_AUTOPILOT_PX4:
     {
         QGXPX4UAS* px4 = new QGXPX4UAS(mavlink, worker, sysid);

src/uas/QGCMAVLinkUASFactory.h

@@ -10,7 +10,6 @@
 
 // INCLUDE ALL MAV/UAS CLASSES USING MAVLINK
 #include "UAS.h"
-#include "PxQuadMAV.h"
 
 class QGCMAVLinkUASFactory : public QObject
 {

src/uas/UAS.h

@@ -334,65 +334,6 @@ public:
     bool isRotaryWing();
     bool isFixedWing();
 
-#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
-    px::GLOverlay getOverlay()
-    {
-        QMutexLocker locker(&overlayMutex);
-        return overlay;
-    }
-
-    px::GLOverlay getOverlay(qreal& receivedTimestamp)
-    {
-        receivedTimestamp = receivedOverlayTimestamp;
-        QMutexLocker locker(&overlayMutex);
-        return overlay;
-    }
-
-    px::ObstacleList getObstacleList() {
-        QMutexLocker locker(&obstacleListMutex);
-        return obstacleList;
-    }
-
-    px::ObstacleList getObstacleList(qreal& receivedTimestamp) {
-        receivedTimestamp = receivedObstacleListTimestamp;
-        QMutexLocker locker(&obstacleListMutex);
-        return obstacleList;
-    }
-
-    px::Path getPath() {
-        QMutexLocker locker(&pathMutex);
-        return path;
-    }
-
-    px::Path getPath(qreal& receivedTimestamp) {
-        receivedTimestamp = receivedPathTimestamp;
-        QMutexLocker locker(&pathMutex);
-        return path;
-    }
-
-    px::PointCloudXYZRGB getPointCloud() {
-        QMutexLocker locker(&pointCloudMutex);
-        return pointCloud;
-    }
-
-    px::PointCloudXYZRGB getPointCloud(qreal& receivedTimestamp) {
-        receivedTimestamp = receivedPointCloudTimestamp;
-        QMutexLocker locker(&pointCloudMutex);
-        return pointCloud;
-    }
-
-    px::RGBDImage getRGBDImage() {
-        QMutexLocker locker(&rgbdImageMutex);
-        return rgbdImage;
-    }
-
-    px::RGBDImage getRGBDImage(qreal& receivedTimestamp) {
-        receivedTimestamp = receivedRGBDImageTimestamp;
-        QMutexLocker locker(&rgbdImageMutex);
-        return rgbdImage;
-    }
-#endif
-
     friend class UASWaypointManager;
     friend class QGCUASFileManager;
 
@@ -525,28 +466,6 @@ protected: //COMMENTS FOR TEST UNIT
     bool blockHomePositionChanges;   ///< Block changes to the home position
     bool receivedMode;          ///< True if mode was retrieved from current conenction to UAS
 
-#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
-    px::GLOverlay overlay;
-    QMutex overlayMutex;
-    qreal receivedOverlayTimestamp;
-
-    px::ObstacleList obstacleList;
-    QMutex obstacleListMutex;
-    qreal receivedObstacleListTimestamp;
-
-    px::Path path;
-    QMutex pathMutex;
-    qreal receivedPathTimestamp;
-
-    px::PointCloudXYZRGB pointCloud;
-    QMutex pointCloudMutex;
-    qreal receivedPointCloudTimestamp;
-
-    px::RGBDImage rgbdImage;
-    QMutex rgbdImageMutex;
-    qreal receivedRGBDImageTimestamp;
-#endif
-
     /// PARAMETERS
     QMap<int, QMap<QString, QVariant>* > parameters; ///< All parameters
     bool paramsOnceRequested;       ///< If the parameter list has been read at least once

src/ui/MainWindow.cc

@@ -75,9 +75,6 @@ This file is part of the QGROUNDCONTROL project
 #include "Q3DWidgetFactory.h"
 #endif
 
-// FIXME Move
-#include "PxQuadMAV.h"
-
 #include "LogCompressor.h"
 
 // Set up some constants
@@ -1549,25 +1546,6 @@ void MainWindow::UASCreated(UASInterface* uas)
     // Load default custom widgets for this autopilot type
     loadCustomWidgetsFromDefaults(uas->getSystemTypeName(), uas->getAutopilotTypeName());
 
-
-    if (uas->getAutopilotType() == MAV_AUTOPILOT_PIXHAWK)
-    {
-        // Dock widgets
-        if (!detectionDockWidget)
-        {
-            detectionDockWidget = new QDockWidget(tr("Object Recognition"), this);
-            detectionDockWidget->setWidget( new ObjectDetectionView("files/images/patterns", this) );
-            detectionDockWidget->setObjectName("OBJECT_DETECTION_DOCK_WIDGET");
-        }
-
-        if (!watchdogControlDockWidget)
-        {
-            watchdogControlDockWidget = new QDockWidget(tr("Process Control"), this);
-            watchdogControlDockWidget->setWidget( new WatchdogControl(this) );
-            watchdogControlDockWidget->setObjectName("WATCHDOG_CONTROL_DOCKWIDGET");
-        }
-    }
-
     // Reload view state in case new widgets were added
     loadViewState();
 }

src/ui/MainWindow.h

@@ -48,7 +48,6 @@ This file is part of the QGROUNDCONTROL project
 #include "UASListWidget.h"
 #include "MAVLinkProtocol.h"
 #include "MAVLinkSimulationLink.h"
-#include "ObjectDetectionView.h"
 #include "submainwindow.h"
 #include "input/JoystickInput.h"
 #if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX)
@@ -57,7 +56,6 @@ This file is part of the QGROUNDCONTROL project
 #include "DebugConsole.h"
 #include "ParameterInterface.h"
 #include "HDDisplay.h"
-#include "WatchdogControl.h"
 #include "HSIDisplay.h"
 #include "QGCRemoteControlView.h"
 #include "opmapcontrol.h"

src/ui/ObjectDetectionView.cc

-/*=====================================================================
-
-PIXHAWK Micro Air Vehicle Flying Robotics Toolkit
-
-(c) 2009, 2010 PIXHAWK PROJECT  <http://pixhawk.ethz.ch>
-
-This file is part of the PIXHAWK project
-
-    PIXHAWK 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.
-
-    PIXHAWK 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 PIXHAWK. If not, see <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-/**
- * @file
- *   @brief List of detected objects
- *   @author Benjamin Knecht <mavteam@student.ethz.ch>
- *   @author Lorenz Meier <mavteam@student.ethz.ch>
- *   @author Fabian Landau <mavteam@student.ethz.ch>
- *
- */
-
-#include <QListView>
-#include <QPixmap>
-#include "ObjectDetectionView.h"
-#include "ui_ObjectDetectionView.h"
-#include "UASManager.h"
-#include "GAudioOutput.h"
-
-#include <QDebug>
-#include <QMap>
-
-ObjectDetectionView::ObjectDetectionView(QString folder, QWidget *parent) :
-    QWidget(parent),
-    patternList(),
-    letterList(),
-    letterTimer(),
-    uas(NULL),
-    patternFolder(folder),
-    separator(" "),
-    m_ui(new Ui::ObjectDetectionView)
-{
-    m_ui->setupUi(this);
-    connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setUAS(UASInterface*)));
-    letterTimer.start(1000);
-    connect(&letterTimer, SIGNAL(timeout()), this, SLOT(decreaseLetterTime()));
-    connect(m_ui->clearButton, SIGNAL(clicked()), this, SLOT(clearLists()));
-
-    this->setVisible(false);
-}
-
-ObjectDetectionView::~ObjectDetectionView()
-{
-    delete m_ui;
-}
-
-void ObjectDetectionView::changeEvent(QEvent *e)
-{
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        m_ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-
-void ObjectDetectionView::setUAS(UASInterface* uas)
-{
-    if (this->uas != NULL) {
-        disconnect(this->uas, SIGNAL(patternDetected(int, QString, float, bool)), this, SLOT(newPattern(int, QString, float, bool)));
-        disconnect(this->uas, SIGNAL(letterDetected(int, QString, float, bool)), this, SLOT(newLetter(int, QString, float, bool)));
-    }
-
-    this->uas = uas;
-    connect(uas, SIGNAL(patternDetected(int, QString, float, bool)), this, SLOT(newPattern(int, QString, float, bool)));
-    connect(uas, SIGNAL(letterDetected(int, QString, float, bool)), this, SLOT(newLetter(int, QString, float, bool)));
-}
-
-void ObjectDetectionView::newPattern(int uasId, QString patternPath, float confidence, bool detected)
-{
-    if (detected) {
-        if (!patternList.contains(patternPath)) {
-            // Emit audio message on detection
-            if (detected) GAudioOutput::instance()->say("System " + QString::number(uasId) + " detected pattern " + QString(patternPath.split("/", QString::SkipEmptyParts).last()).split(".", QString::SkipEmptyParts).first());
-
-            patternList.insert(patternPath, Pattern(patternPath, confidence));
-        } else {
-            Pattern pattern = patternList.value(patternPath);
-            if (confidence > pattern.confidence)
-                pattern.confidence = confidence;
-            ++pattern.count;
-            patternList.insert(patternPath, pattern);
-        }
-
-        // set list items
-        QList<Pattern> templist;
-        foreach (Pattern pattern, patternList)
-        templist.push_back(pattern);
-        qSort(templist);
-        m_ui->listWidget->clear();
-        foreach (Pattern pattern, templist)
-        m_ui->listWidget->addItem(pattern.name + separator + "(" + QString::number(pattern.count) + ")" + separator + QString::number(pattern.confidence));
-
-        // load image
-        QString filePath = patternFolder + "/" + patternPath.split("/", QString::SkipEmptyParts).last();
-        QPixmap image = QPixmap(filePath);
-        if (image.width() > image.height())
-            image = image.scaledToWidth(m_ui->imageLabel->width());
-        else
-            image = image.scaledToHeight(m_ui->imageLabel->height());
-        m_ui->imageLabel->setPixmap(image);
-
-        // set textlabel
-        QString patternName = patternPath.split("/", QString::SkipEmptyParts).last(); // Remove preceding folder names
-        patternName = patternName.split(".", QString::SkipEmptyParts).first(); // Remove file ending
-        m_ui->nameLabel->setText("Pattern: " + patternName);
-    }
-}
-
-void ObjectDetectionView::newLetter(int uasId, QString letter, float confidence, bool detected)
-{
-    Q_UNUSED(confidence);
-
-    if (detected) {
-        if (!letterList.contains(letter)) {
-            // Emit audio message on detection
-            if (detected) GAudioOutput::instance()->say("System " + QString::number(uasId) + " detected letter " + letter);
-
-            letterList.insert(letter, Pattern(letter, 0));
-        } else {
-            Pattern pattern = letterList.value(letter);
-            pattern.confidence = 0;
-            ++pattern.count;
-            letterList.insert(letter, pattern);
-        }
-
-        updateLetterList();
-
-        // display letter
-        m_ui->letterLabel->setText(letter);
-
-        // set textlabel
-        m_ui->nameLabel->setText("Letter: " + letter);
-    }
-}
-
-void ObjectDetectionView::decreaseLetterTime()
-{
-    foreach (Pattern pattern, letterList) {
-        pattern.confidence -= 1;
-        letterList.insert(pattern.name, pattern);
-    }
-
-    updateLetterList();
-}
-
-void ObjectDetectionView::updateLetterList()
-{
-    // set list items
-    QList<Pattern> templist;
-    foreach (Pattern pattern, letterList)
-    templist.push_back(pattern);
-    qSort(templist);
-    m_ui->letterListWidget->clear();
-    foreach (Pattern pattern, templist)
-    m_ui->letterListWidget->addItem(pattern.name + separator + "(" + QString::number(pattern.count) + ")" + separator + QString::number(pattern.confidence));
-}
-
-void ObjectDetectionView::clearLists()
-{
-    patternList.clear();
-    letterList.clear();
-
-    m_ui->listWidget->clear();
-    m_ui->letterListWidget->clear();
-
-    m_ui->imageLabel->clear();;
-    m_ui->letterLabel->clear();
-    m_ui->nameLabel->clear();
-}
-
-void ObjectDetectionView::takeAction()
-{
-    QAction* act = dynamic_cast<QAction*>(sender());
-    if (act) {
-        QString patternPath = act->text().trimmed().split(separator, QString::SkipEmptyParts).first(); // Remove additional information
-        QString patternName = patternPath.split("//", QString::SkipEmptyParts).last(); // Remove preceding folder names
-        patternName = patternName.split(".", QString::SkipEmptyParts).first(); // Remove file ending
-
-        // Set name and label
-        m_ui->nameLabel->setText(patternName);
-        m_ui->imageLabel->setPixmap(act->icon().pixmap(64, 64));
-    }
-}
-
-void ObjectDetectionView::resizeEvent(QResizeEvent * event )
-{
-    if (event->isAccepted()) {
-        // Enforce square shape of image label
-        m_ui->imageLabel->resize(m_ui->imageLabel->width(), m_ui->imageLabel->width());
-    }
-}
-

src/ui/ObjectDetectionView.h

-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
-
-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 <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-/**
- * @file
- *   @brief List of detected objects
- *   @author Benjamin Knecht <mavteam@student.ethz.ch>
- *   @author Lorenz Meier <mavteam@student.ethz.ch>
- *   @author Fabian Landau <mavteam@student.ethz.ch>
- *
- */
-
-#ifndef _OBJECTDETECTIONVIEW_H_
-#define _OBJECTDETECTIONVIEW_H_