Cleaned up pattern recognition UI element

src/ui/ObjectDetectionView.cc

@@ -38,6 +38,8 @@ This file is part of the PIXHAWK project
 
 #include <QDebug>
 
+#include "MG.h"
+
 ObjectDetectionView::ObjectDetectionView(QString folder, QWidget *parent) :
         QWidget(parent),
         patternList(),
@@ -90,8 +92,9 @@ void ObjectDetectionView::newDetection(int uasId, QString patternPath, int x1, i
     {
         if (patternList.contains(patternPath))
         {
-            qDebug() << "REDETECTED";
+            //qDebug() << "REDETECTED";
 
+            /*
             QList<QAction*> actions = m_ui->listWidget->actions();
             // Find action and update it
             foreach (QAction* act, actions)
@@ -112,6 +115,7 @@ void ObjectDetectionView::newDetection(int uasId, QString patternPath, int x1, i
 
             // Set name and label
             m_ui->nameLabel->setText(patternName);
+            */
         }
         else
         {
@@ -120,7 +124,11 @@ void ObjectDetectionView::newDetection(int uasId, QString patternPath, int x1, i
 
             patternList.insert(patternPath, confidence);
             patternCount.insert(patternPath, 1);
-            QPixmap image = QPixmap(patternFolder + "/" + patternPath);
+
+            QString filePath = MG::DIR::getSupportFilesDirectory() + "/" + patternFolder + "/" + patternPath.split("/").last();
+
+            qDebug() << "Loading:" << filePath;
+            QPixmap image = QPixmap(filePath);
             QIcon ico(image);
             QAction* act = new QAction(ico, patternPath + separator + "(#" + QString::number(1) + ")" + separator + QString::number(confidence), this);
             connect(act, SIGNAL(triggered()), this, SLOT(takeAction()));

src/ui/ObjectDetectionView.h

@@ -48,7 +48,7 @@ class ObjectDetectionView : public QWidget {
     Q_OBJECT
     Q_DISABLE_COPY(ObjectDetectionView)
         public:
-            explicit ObjectDetectionView(QString folder="test", QWidget *parent = 0);
+            explicit ObjectDetectionView(QString folder="patterns", QWidget *parent = 0);
     virtual ~ObjectDetectionView();
 
     /** @brief Resize widget contents */

test/generated/mavlink_message_attitude.h

-// MESSAGE ATTITUDE PACKING
-
-#define MESSAGE_ID_ATTITUDE 90
-
-/**
- * @brief Send a attitude message
- *
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t message_attitude_pack(uint8_t system_id, CommMessage_t* msg, float roll, float pitch, float yaw)
-{
-	msg->msgid = MESSAGE_ID_ATTITUDE;
-	uint16_t i = 0;
-
-	i += put_float_by_index(roll, i, msg->payload); //Roll angle (rad)
-	i += put_float_by_index(pitch, i, msg->payload); //Pitch angle (rad)
-	i += put_float_by_index(yaw, i, msg->payload); //Yaw angle (rad)
-
-	return finalize_message(msg, system_id, i);
-}
-
-// MESSAGE ATTITUDE UNPACKING
-
-/**
- * @brief Get field roll from attitude message
- *
- * @return Roll angle (rad)
- */
-static inline float message_attitude_get_roll(CommMessage_t* msg)
-{
-	return *((float*) (void*)msg->payload);
-}
-
-/**
- * @brief Get field pitch from attitude message
- *
- * @return Pitch angle (rad)
- */
-static inline float message_attitude_get_pitch(CommMessage_t* msg)
-{
-	return *((float*) (void*)msg->payload+sizeof(float));
-}
-
-/**
- * @brief Get field yaw from attitude message
- *
- * @return Yaw angle (rad)
- */
-static inline float message_attitude_get_yaw(CommMessage_t* msg)
-{
-	return *((float*) (void*)msg->payload+sizeof(float)+sizeof(float));
-}
-

test/generated/mavlink_message_attitude2.h

-// MESSAGE ATTITUDE2 PACKING
-
-#define MESSAGE_ID_ATTITUDE2 90
-
-typedef struct __attitude2_t 
-{
-	float roll; ///< Roll angle (rad)
-	float pitch; ///< Pitch angle (rad)
-	float yaw; ///< Yaw angle (rad)
-
-} attitude2_t;
-
-/**
- * @brief Send a attitude2 message
- *
- * @param roll Roll angle (rad)
- * @param pitch Pitch angle (rad)
- * @param yaw Yaw angle (rad)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t message_attitude2_pack(uint8_t system_id, CommMessage_t* msg, float roll, float pitch, float yaw)
-{
-	msg->msgid = MESSAGE_ID_ATTITUDE2;
-	uint16_t i = 0;
-
-	i += put_float_by_index(roll, i, msg->payload); //Roll angle (rad)
-	i += put_float_by_index(pitch, i, msg->payload); //Pitch angle (rad)
-	i += put_float_by_index(yaw, i, msg->payload); //Yaw angle (rad)
-
-	return finalize_message(msg, system_id, i);
-}
-
-static inline uint16_t message_attitude2_encode(uint8_t system_id, CommMessage_t* msg, const attitude2_t* attitude2)
-{
-	message_attitude2_pack(system_id, msg, attitude2->roll, attitude2->pitch, attitude2->yaw);
-}
-// MESSAGE ATTITUDE2 UNPACKING
-
-/**
- * @brief Get field roll from attitude2 message
- *
- * @return Roll angle (rad)
- */
-static inline float message_attitude2_get_roll(CommMessage_t* msg)
-{
-	generic_32bit r;
-	r.b[3] = (msg->payload)[0];
-	r.b[2] = (msg->payload)[1];
-	r.b[1] = (msg->payload)[2];
-	r.b[0] = (msg->payload)[3];
-	return (float)r.f;
-}
-
-/**
- * @brief Get field pitch from attitude2 message
- *
- * @return Pitch angle (rad)
- */
-static inline float message_attitude2_get_pitch(CommMessage_t* msg)
-{
-	generic_32bit r;
-	r.b[3] = (msg->payload+sizeof(float))[0];
-	r.b[2] = (msg->payload+sizeof(float))[1];
-	r.b[1] = (msg->payload+sizeof(float))[2];
-	r.b[0] = (msg->payload+sizeof(float))[3];
-	return (float)r.f;
-}
-
-/**
- * @brief Get field yaw from attitude2 message
- *
- * @return Yaw angle (rad)
- */
-static inline float message_attitude2_get_yaw(CommMessage_t* msg)
-{
-	generic_32bit r;
-	r.b[3] = (msg->payload+sizeof(float)+sizeof(float))[0];
-	r.b[2] = (msg->payload+sizeof(float)+sizeof(float))[1];
-	r.b[1] = (msg->payload+sizeof(float)+sizeof(float))[2];
-	r.b[0] = (msg->payload+sizeof(float)+sizeof(float))[3];
-	return (float)r.f;
-}
-
-static inline void message_attitude2_decode(CommMessage_t* msg, attitude2_t* attitude2)
-{
-	attitude2->roll = message_attitude2_get_roll(msg);
-	attitude2->pitch = message_attitude2_get_pitch(msg);
-	attitude2->yaw = message_attitude2_get_yaw(msg);
-}

test/generated/mavlink_message_boot.h

-// MESSAGE BOOT PACKING
-
-#define MESSAGE_ID_BOOT 1
-
-/**
- * @brief Send a boot message
- *
- * @param version The onboard software version
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t message_boot_pack(uint8_t system_id, CommMessage_t* msg, uint32 version)
-{
-	msg->msgid = MESSAGE_ID_BOOT;
-	uint16_t i = 0;
-
-	i += put_uint32_by_index(version, i, msg->payload); //The onboard software version
-
-	return finalize_message(msg, system_id, i);
-}
-
-// MESSAGE BOOT UNPACKING
-
-/**
- * @brief Get field version from boot message
- *
- * @return The onboard software version
- */
-static inline uint32 message_boot_get_version(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload);
-}
-

test/generated/mavlink_message_boot2.h

-// MESSAGE BOOT2 PACKING
-
-#define MESSAGE_ID_BOOT2 1
-
-typedef struct __boot2_t 
-{
-	uint32 version; ///< The onboard software version
-
-} boot2_t;
-
-/**
- * @brief Send a boot2 message
- *
- * @param version The onboard software version
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t message_boot2_pack(uint8_t system_id, CommMessage_t* msg, uint32 version)
-{
-	msg->msgid = MESSAGE_ID_BOOT2;
-	uint16_t i = 0;
-
-	i += put_uint32_by_index(version, i, msg->payload); //The onboard software version
-
-	return finalize_message(msg, system_id, i);
-}
-
-static inline uint16_t message_boot2_encode(uint8_t system_id, CommMessage_t* msg, const boot2_t* boot2)
-{
-	message_boot2_pack(system_id, msg, boot2->version);
-}
-// MESSAGE BOOT2 UNPACKING
-
-/**
- * @brief Get field version from boot2 message
- *
- * @return The onboard software version
- */
-static inline uint32 message_boot2_get_version(CommMessage_t* msg)
-{
-
-}
-
-static inline void message_boot2_decode(CommMessage_t* msg, boot2_t* boot2)
-{
-	boot2->version = message_boot2_get_version(msg);
-}

test/generated/mavlink_message_heartbeat.h

-// MESSAGE HEARTBEAT PACKING
-
-#define MESSAGE_ID_HEARTBEAT 0
-
-/**
- * @brief Send a heartbeat message
- *
- * @param type Type of the MAV (quadrotor, helicopter, etc.)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t message_heartbeat_pack(uint8_t system_id, CommMessage_t* msg, uint8 type)
-{
-	msg->msgid = MESSAGE_ID_HEARTBEAT;
-	uint16_t i = 0;
-
-	i += put_uint8_by_index(type, i, msg->payload); //Type of the MAV (quadrotor, helicopter, etc.)
-
-	return finalize_message(msg, system_id, i);
-}
-
-// MESSAGE HEARTBEAT UNPACKING
-
-/**
- * @brief Get field type from heartbeat message
- *
- * @return Type of the MAV (quadrotor, helicopter, etc.)
- */
-static inline uint8 message_heartbeat_get_type(CommMessage_t* msg)
-{
-	return *((uint8*) (void*)msg->payload);
-}
-

test/generated/mavlink_message_heartbeat2.h

-// MESSAGE HEARTBEAT2 PACKING
-
-#define MESSAGE_ID_HEARTBEAT2 0
-
-typedef struct __heartbeat2_t 
-{
-	uint8 type; ///< Type of the MAV (quadrotor, helicopter, etc.)
-
-} heartbeat2_t;
-
-/**
- * @brief Send a heartbeat2 message
- *
- * @param type Type of the MAV (quadrotor, helicopter, etc.)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t message_heartbeat2_pack(uint8_t system_id, CommMessage_t* msg, uint8 type)
-{
-	msg->msgid = MESSAGE_ID_HEARTBEAT2;
-	uint16_t i = 0;
-
-	i += put_uint8_by_index(type, i, msg->payload); //Type of the MAV (quadrotor, helicopter, etc.)
-
-	return finalize_message(msg, system_id, i);
-}
-
-static inline uint16_t message_heartbeat2_encode(uint8_t system_id, CommMessage_t* msg, const heartbeat2_t* heartbeat2)
-{
-	message_heartbeat2_pack(system_id, msg, heartbeat2->type);
-}
-// MESSAGE HEARTBEAT2 UNPACKING
-
-/**
- * @brief Get field type from heartbeat2 message
- *
- * @return Type of the MAV (quadrotor, helicopter, etc.)
- */
-static inline uint8 message_heartbeat2_get_type(CommMessage_t* msg)
-{
-
-}
-
-static inline void message_heartbeat2_decode(CommMessage_t* msg, heartbeat2_t* heartbeat2)
-{
-	heartbeat2->type = message_heartbeat2_get_type(msg);
-}

test/generated/mavlink_message_sensraw.h

-// MESSAGE SENSRAW PACKING
-
-#define MESSAGE_ID_SENSRAW 100
-
-/**
- * @brief Send a sensraw message
- *
- * @param xacc X acceleration (mg raw)
- * @param yacc Y acceleration (mg raw)
- * @param zacc Z acceleration (mg raw)
- * @param xgyro Angular speed around X axis (adc units)
- * @param ygyro Angular speed around Y axis (adc units)
- * @param zgyro Angular speed around Z axis (adc units)
- * @param xmag 
- * @param ymag 
- * @param zmag 
- * @param baro 
- * @param gdist 
- * @param temp 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t message_sensraw_pack(uint8_t system_id, CommMessage_t* msg, uint32 xacc, uint32 yacc, uint32 zacc, uint32 xgyro, uint32 ygyro, uint32 zgyro, uint32 xmag, uint32 ymag, uint32 zmag, int32 baro, uint32 gdist, int32 temp)
-{
-	msg->msgid = MESSAGE_ID_SENSRAW;
-	uint16_t i = 0;
-
-	i += put_uint32_by_index(xacc, i, msg->payload); //X acceleration (mg raw)
-	i += put_uint32_by_index(yacc, i, msg->payload); //Y acceleration (mg raw)
-	i += put_uint32_by_index(zacc, i, msg->payload); //Z acceleration (mg raw)
-	i += put_uint32_by_index(xgyro, i, msg->payload); //Angular speed around X axis (adc units)
-	i += put_uint32_by_index(ygyro, i, msg->payload); //Angular speed around Y axis (adc units)
-	i += put_uint32_by_index(zgyro, i, msg->payload); //Angular speed around Z axis (adc units)
-	i += put_uint32_by_index(xmag, i, msg->payload); //
-	i += put_uint32_by_index(ymag, i, msg->payload); //
-	i += put_uint32_by_index(zmag, i, msg->payload); //
-	i += put_int32_by_index(baro, i, msg->payload); //
-	i += put_uint32_by_index(gdist, i, msg->payload); //
-	i += put_int32_by_index(temp, i, msg->payload); //
-
-	return finalize_message(msg, system_id, i);
-}
-
-// MESSAGE SENSRAW UNPACKING
-
-/**
- * @brief Get field xacc from sensraw message
- *
- * @return X acceleration (mg raw)
- */
-static inline uint32 message_sensraw_get_xacc(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload);
-}
-
-/**
- * @brief Get field yacc from sensraw message
- *
- * @return Y acceleration (mg raw)
- */
-static inline uint32 message_sensraw_get_yacc(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload+sizeof(uint32));
-}
-
-/**
- * @brief Get field zacc from sensraw message
- *
- * @return Z acceleration (mg raw)
- */
-static inline uint32 message_sensraw_get_zacc(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32));
-}
-
-/**
- * @brief Get field xgyro from sensraw message
- *
- * @return Angular speed around X axis (adc units)
- */
-static inline uint32 message_sensraw_get_xgyro(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32));
-}
-
-/**
- * @brief Get field ygyro from sensraw message
- *
- * @return Angular speed around Y axis (adc units)
- */
-static inline uint32 message_sensraw_get_ygyro(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32));
-}
-
-/**
- * @brief Get field zgyro from sensraw message
- *
- * @return Angular speed around Z axis (adc units)
- */
-static inline uint32 message_sensraw_get_zgyro(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32));
-}
-
-/**
- * @brief Get field xmag from sensraw message
- *
- * @return 
- */
-static inline uint32 message_sensraw_get_xmag(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32));
-}
-
-/**
- * @brief Get field ymag from sensraw message
- *
- * @return 
- */
-static inline uint32 message_sensraw_get_ymag(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32));
-}
-
-/**
- * @brief Get field zmag from sensraw message
- *
- * @return 
- */
-static inline uint32 message_sensraw_get_zmag(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32));
-}
-
-/**
- * @brief Get field baro from sensraw message
- *
- * @return 
- */
-static inline int32 message_sensraw_get_baro(CommMessage_t* msg)
-{
-	return *((int32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32));
-}
-
-/**
- * @brief Get field gdist from sensraw message
- *
- * @return 
- */
-static inline uint32 message_sensraw_get_gdist(CommMessage_t* msg)
-{
-	return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(int32));
-}
-
-/**
- * @brief Get field temp from sensraw message
- *
- * @return 
- */
-static inline int32 message_sensraw_get_temp(CommMessage_t* msg)
-{
-	return *((int32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(int32)+sizeof(uint32));
-}
-

test/generated/mavlink_message_sensraw2.h

-// MESSAGE SENSRAW2 PACKING
-
-#define MESSAGE_ID_SENSRAW2 100
-
-typedef struct __sensraw2_t 
-{
-	uint32 xacc; ///< X acceleration (mg raw)
-	uint32 yacc; ///< Y acceleration (mg raw)
-	uint32 zacc; ///< Z acceleration (mg raw)
-	uint32 xgyro; ///< Angular speed around X axis (adc units)
-	uint32 ygyro; ///< Angular speed around Y axis (adc units)
-	uint32 zgyro; ///< Angular speed around Z axis (adc units)
-	uint32 xmag; ///< 
-	uint32 ymag; ///< 
-	uint32 zmag; ///< 
-	int32 baro; ///< 
-	uint32 gdist; ///< 
-	int32 temp; ///< 
-
-} sensraw2_t;
-
-/**
- * @brief Send a sensraw2 message
- *
- * @param xacc X acceleration (mg raw)
- * @param yacc Y acceleration (mg raw)
- * @param zacc Z acceleration (mg raw)
- * @param xgyro Angular speed around X axis (adc units)
- * @param ygyro Angular speed around Y axis (adc units)
- * @param zgyro Angular speed around Z axis (adc units)
- * @param xmag 
- * @param ymag 
- * @param zmag 
- * @param baro 
- * @param gdist 
- * @param temp 
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t message_sensraw2_pack(uint8_t system_id, CommMessage_t* msg, uint32 xacc, uint32 yacc, uint32 zacc, uint32 xgyro, uint32 ygyro, uint32 zgyro, uint32 xmag, uint32 ymag, uint32 zmag, int32 baro, uint32 gdist, int32 temp)
-{
-	msg->msgid = MESSAGE_ID_SENSRAW2;
-	uint16_t i = 0;
-
-	i += put_uint32_by_index(xacc, i, msg->payload); //X acceleration (mg raw)
-	i += put_uint32_by_index(yacc, i, msg->payload); //Y acceleration (mg raw)
-	i += put_uint32_by_index(zacc, i, msg->payload); //Z acceleration (mg raw)
-	i += put_uint32_by_index(xgyro, i, msg->payload); //Angular speed around X axis (adc units)
-	i += put_uint32_by_index(ygyro, i, msg->payload); //Angular speed around Y axis (adc units)
-	i += put_uint32_by_index(zgyro, i, msg->payload); //Angular speed around Z axis (adc units)
-	i += put_uint32_by_index(xmag, i, msg->payload); //
-	i += put_uint32_by_index(ymag, i, msg->payload); //
-	i += put_uint32_by_index(zmag, i, msg->payload); //
-	i += put_int32_by_index(baro, i, msg->payload); //
-	i += put_uint32_by_index(gdist, i, msg->payload); //
-	i += put_int32_by_index(temp, i, msg->payload); //
-
-	return finalize_message(msg, system_id, i);
-}
-
-static inline uint16_t message_sensraw2_encode(uint8_t system_id, CommMessage_t* msg, const sensraw2_t* sensraw2)
-{
-	message_sensraw2_pack(system_id, msg, sensraw2->xacc, sensraw2->yacc, sensraw2->zacc, sensraw2->xgyro, sensraw2->ygyro, sensraw2->zgyro, sensraw2->xmag, sensraw2->ymag, sensraw2->zmag, sensraw2->baro, sensraw2->gdist, sensraw2->temp);
-}
-// MESSAGE SENSRAW2 UNPACKING
-
-/**
- * @brief Get field xacc from sensraw2 message
- *
- * @return X acceleration (mg raw)
- */
-static inline uint32 message_sensraw2_get_xacc(CommMessage_t* msg)
-{
-
-}
-
-/**
- * @brief Get field yacc from sensraw2 message
- *
- * @return Y acceleration (mg raw)
- */
-static inline uint32 message_sensraw2_get_yacc(CommMessage_t* msg)
-{
-
-}
-
-/**
- * @brief Get field zacc from sensraw2 message
- *
- * @return Z acceleration (mg raw)
- */
-static inline uint32 message_sensraw2_get_zacc(CommMessage_t* msg)
-{
-