Moved interfaces to classes and integrated them into state machine

MPIBR · Oct 11, 2016 · aeffb94 · aeffb94
1 parent bd8dfa0
commit aeffb94
Showing 12 changed files with 377 additions and 429 deletions.
diff --git a/AudioGameGUI.pro b/AudioGameGUI.pro
@@ -8,15 +8,18 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 CONFIG += c++11
-QT += axcontainer
-TYPELIBS = $$system(dumpcpp -getfile {D323A622-1D13-11D4-8858-444553540000})
-
-isEmpty(TYPELIBS) {
-    message("TDT library not found!")
-} else {
-    TYPELIBS = $$system(dumpcpp {D323A622-1D13-11D4-8858-444553540000})
-    HEADERS += rpcoxlib.h
-    SOURCES  += rpcoxlib.cpp
+
+win32 {
+    QT += axcontainer
+    TYPELIBS = $$system(dumpcpp -getfile {D323A622-1D13-11D4-8858-444553540000})
+
+    isEmpty(TYPELIBS) {
+        message("TDT library not found!")
+    } else {
+        TYPELIBS = $$system(dumpcpp {D323A622-1D13-11D4-8858-444553540000})
+        HEADERS += rpcoxlib.h
+        SOURCES  += rpcoxlib.cpp
+    }
 }
 
 TARGET = AudioGameGUI
@@ -40,13 +43,14 @@ HEADERS  += \
     TDTInterface.h \
     trialseq.h
 
-LIBS += -L"C:\\Program Files (x86)\\National Instruments\\NI-DAQ\\DAQmx ANSI C Dev\\lib\\msvc" \
-    -lNIDAQmx
-
 #LIBS += -L"C:\\TDT\\lib64" \
 #    -lRPco
 
 FORMS    += mainwindow.ui \
     timerdialog.ui
 
 DISTFILES +=
+
+
+LIBS += -L"C:\\Program Files (x86)\\National Instruments\\Shared\\ExternalCompilerSupport\\C\\lib64\\msvc" \
+    -lNIDAQmx
diff --git a/AudioGameGUI.pro.user b/AudioGameGUI.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.1, 2016-09-23T15:20:23. -->
+<!-- Written by QtCreator 3.0.1, 2016-10-11T10:13:12. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>

diff --git a/Mainwindow.cpp b/Mainwindow.cpp
@@ -40,8 +40,12 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->lineEdit_licksToReward->setValidator(intValidator);
     ui->lineEdit_iti->setValidator(doubleValidator);
 
-    connect(&smc, SIGNAL(statusMessage(QString)), this, SLOT(onStatusMessage(QString)));
 
+    ui->lineEdit_fileNegative->setText("C:/Users/superuser.D-01477/Desktop/attentionGame/20160812_AttentionGame/20160812_AttentionGame/Audio/negative_state.rcx");
+    ui->lineEdit_filePositive->setText("C:/Users/superuser.D-01477/Desktop/attentionGame/20160812_AttentionGame/20160812_AttentionGame/Audio/positive_state.rcx");
+
+    connect(&smc, SIGNAL(statusMessage(QString)), this, SLOT(onStatusMessage(QString)));
+    connect(&smc, SIGNAL(terminated()), this, SLOT(onStateMachineTerminated()));
 }
 
 MainWindow::~MainWindow()
@@ -78,6 +82,8 @@ void MainWindow::on_pushButton_Run_clicked()
     settings.soundDurationNegative = ui->lineEdit_soundDurationNegative->text().toDouble();
     settings.userReaction = userReaction;
     settings.trialSequence = TrialSeq::generateTrialSequence(sorting, ui->lineEdit_repeatPositive->text().toInt(), ui->lineEdit_repeatNegative->text().toInt());
+    settings.fileNameNegative = ui->lineEdit_filePositive->text();
+    settings.fileNamePositive = ui->lineEdit_filePositive->text();
 
     if(ui->checkBox_itiExternal->isChecked()){
         qDebug()<<"Using iti from file";
@@ -174,7 +180,7 @@ void MainWindow::on_pushButton_selectFilePositive_clicked()
         appSettings.setValue(DEFAULT_DIR_KEY,
                             currentDir.absoluteFilePath(selectedPositiveFileName));
 
-        ui->lineEdit_selectFilePositive->setText(selectedPositiveFileName);
+        ui->lineEdit_filePositive->setText(selectedPositiveFileName);
     }
 }
 
@@ -189,7 +195,7 @@ void MainWindow::on_pushButton_selectFileNegative_clicked()
         appSettings.setValue(DEFAULT_DIR_KEY,
                             currentDir.absoluteFilePath(selectedNegativeFileName));
 
-        ui->lineEdit_selectFileNegative->setText(selectedNegativeFileName);
+        ui->lineEdit_fileNegative->setText(selectedNegativeFileName);
     }
 }
 
@@ -213,6 +219,11 @@ void MainWindow::on_lineEdit_preImaq_editingFinished()
     updateIti();
 }
 
+void MainWindow::onStateMachineTerminated()
+{
+    ui->pushButton_Run->setText("Run");
+}
+
 void MainWindow::onStatusMessage(QString statusMessage)
 {
     ui->statusBar->showMessage(statusMessage);

diff --git a/Mainwindow.h b/Mainwindow.h
@@ -40,6 +40,7 @@ private slots:
     void on_lineEdit_iti_editingFinished();
     void on_lineEdit_preImaq_editingFinished();
 
+    void onStateMachineTerminated();
     void onStatusMessage(QString statusMessage);