passing constructor to parent

StateMachineController.cpp

@@ -1,6 +1,7 @@
 #include "StateMachineController.h"
 
-StateMachineController::StateMachineController(QObject *parent)
+StateMachineController::StateMachineController(QObject *parent):
+    QObject(parent)
 {
     // seed randomizer
     srand(time(0));
@@ -68,11 +69,21 @@ StateMachineController::StateMachineController(QObject *parent)
         logFileThread = new QThread(this);
         logFileWriter = new LogFileWriter();
 
+        socketThread = new QThread(this);
+        socketClient = new SocketClient();
+
         /*Thread-safe event communication*/
+
+        /*Main -> Logfile*/
         connect(this, SIGNAL(openLogFile(QString)), logFileWriter, SLOT(onOpen(QString)));
         connect(this, SIGNAL(closeLogFile()), logFileWriter, SLOT(onClose()));
         connect(this, SIGNAL(writeToLogFile(QString, uint, uint, QString)), logFileWriter, SLOT(onWrite(QString, uint, uint, QString)));
         connect(nidaq, SIGNAL(writeToLogFile(QString, uint, uint, QString)), logFileWriter, SLOT(onWrite(QString, uint, uint, QString)));
+
+        /*Socket -> Logfile*/
+        connect(socketClient, SIGNAL(socketTrackingResult(QVector<double>)), logFileWriter, SLOT(onWriteTrackingResult(QVector<double>)));
+
+        socketClient->moveToThread(socketThread);
         logFileWriter->moveToThread(logFileThread);
         logFileThread->start();
     }else{
@@ -85,8 +96,19 @@ StateMachineController::StateMachineController(QObject *parent)
 
 StateMachineController::~StateMachineController()
 {
+
+    if(logFileThread){
+        logFileThread->quit();
+        logFileThread->wait();
+    }
+    if(socketThread){
+        socketThread->quit();
+        socketThread->wait();
+    }
+
     delete nidaq;
     delete tdt;
+    delete logFileWriter;
 }
 
 void StateMachineController::startStateMachine(audioGameSettings settings)

StateMachineController.h

@@ -18,6 +18,7 @@
 #include "TimerDialog.h"
 #include "NIDAQmxInterface.h"
 #include "TDTInterface.h"
+#include "SocketClient.h"
 #include "rpcoxlib.h"
 #include "LogFileWriter.h"
 
@@ -45,6 +46,8 @@ class StateMachineController : public QObject
     TimerDialog *timerDialog;
     NIDAQmxInterface* nidaq;
     TDTInterface* tdt;
+    SocketClient* socketClient;
+    QThread* socketThread;
     QThread* logFileThread;
     LogFileWriter* logFileWriter;