Server: use data structure to contain object recognition results

Author: fuzun

server/source/Client/Client.cpp

@@ -41,6 +41,8 @@ Client::Client(QObject *parent, QWebSocket* _socket, QSettings* config)
     socket(_socket)
 {
     qRegisterMetaType<QVector<QPair<QRect, QString>>>();
+    qRegisterMetaType<QVector<QPair<float,QString>>>();
+
     qRegisterMetaType<Client::Command>();
 
     worker = new ClientWorker(nullptr, config, &settings);
@@ -184,7 +186,7 @@ void Client::processDlibWorkerFaceResults(const QVector<QPair<QRect, QString>>&
     }
 }
 
-void Client::processDlibWorkerObjectResults(const QStringList &results)
+void Client::processDlibWorkerObjectResults(const QVector<QPair<float, QString> > &results)
 {
     if (results.isEmpty())
         return;
@@ -206,7 +208,7 @@ void Client::processDlibWorkerObjectResults(const QStringList &results)
             font.setPointSize(12);
             paint.setFont(font);
 
-            const QString& str = it;
+            const QString& str = QString("%1: %2").arg(it.first).arg(it.second);
 
             QFontMetrics fMetrics(paint.font());
             QRect textRect(20, 20 + fMetrics.size(Qt::TextSingleLine, str).height() * counter, fMetrics.size(Qt::TextSingleLine, str).width(), fMetrics.size(Qt::TextSingleLine, str).height());

server/source/Client/Client.h

@@ -106,7 +106,7 @@ public slots:
 
 private slots:
     void processDlibWorkerFaceResults(const QVector<QPair<QRect, QString>>& results);
-    void processDlibWorkerObjectResults(const QStringList& results);
+    void processDlibWorkerObjectResults(const QVector<QPair<float, QString>>& results);
 
 public:
 signals:

server/source/Client/ClientWorker.cpp

@@ -80,14 +80,27 @@ void ClientWorker::processDlibWorkerFaceResults(const QVector<QPair<QRect, QStri
     }
 }
 
-void ClientWorker::processDlibWorkerObjectResults(const QStringList &results)
+void ClientWorker::processDlibWorkerObjectResults(const QVector<QPair<float, QString>> &results)
 {
     if (results.isEmpty())
         return;
 
-    log("DLIB has found objects: " + results.join(", "));
+    QStringList strList;
+    QVariantList list;
+    for (const auto& i : results)
+    {
+        QVariantHash hash;
+
+        hash["prediction"] = i.first;
+        hash["label"] = i.second;
+
+        strList.push_back(QString("%1: %2").arg(i.first).arg(i.second));
+        list.push_back(hash);
+    }
+
+    log("DLIB has found objects: " + strList.join(","));
     log("Sending found object properties to the client.");
-    sendCommand(Command::MESSAGE_TAG_OBJECT, results);
+    sendCommand(Command::MESSAGE_TAG_OBJECT, list);
 }
 
 void ClientWorker::processTextMessage(const QString &message)

server/source/Client/ClientWorker.h

@@ -63,7 +63,7 @@ class ClientWorker : public QObject
 
 private slots:
     void processDlibWorkerFaceResults(const QVector<QPair<QRect, QString>>& results);
-    void processDlibWorkerObjectResults(const QStringList& results);
+    void processDlibWorkerObjectResults(const const QVector<QPair<float, QString>> &results);
 
     void processTextMessage(const QString& message);
     void processBinaryMessage(const QByteArray& data);

server/source/DLIBWorker/DLIBWorker.cpp

@@ -388,12 +388,12 @@ void DLIBWorker::process(const QByteArray& buffer)
 
             matrix<float,1,1000> p = sum_rows(mat(snet(images.begin(), images.end()))) / m_numCrops;
 
-            QStringList result;
+            QVector<QPair<float, QString>> result;
 
             for (size_t k = 0; k < m_settings->labelCount; ++k)
             {
                 unsigned long predicted_label = index_of_max(p);
-                result.append(QString::number(p(predicted_label)) + ": " + QString::fromStdString(labels[predicted_label]));
+                result.append( { p(predicted_label), QString::fromStdString(labels[predicted_label]) } );
                 p(predicted_label) = 0;
             }
 

server/source/DLIBWorker/DLIBWorker.h

@@ -143,7 +143,7 @@ public slots:
 public:
 signals:
     void doneFace(const QVector<QPair<QRect, QString>>& results);
-    void doneObject(const QStringList& results);
+    void doneObject(const QVector<QPair<float, QString>>& results);
 
     void log(const QString& str);
 };