Fixed wrong filename from gui

MPIBR · Oct 21, 2016 · 1afb15f · 1afb15f
1 parent 6dda206
commit 1afb15f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/Mainwindow.cpp b/Mainwindow.cpp
@@ -39,8 +39,8 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->lineEdit_licksToReward->setValidator(intValidator);
     ui->lineEdit_iti->setValidator(doubleValidator);
 
-    //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");
+//    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()));
@@ -53,8 +53,6 @@ MainWindow::~MainWindow()
 
 void MainWindow::on_pushButton_Run_clicked()
 {
-    ui->pushButton_Run->setDisabled(true);
-    ui->statusBar->showMessage("Running");
 
     int sorting;
     switch(ui->comboBox_trialSequence->currentIndex()){
@@ -79,18 +77,25 @@ 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.fileNameNegative = ui->lineEdit_fileNegative->text();
     settings.fileNamePositive = ui->lineEdit_filePositive->text();
     settings.logFileName = ui->lineEdit_outputFolder->text() + "/" + ui->lineEdit_outputFilename->text() + ".csv";
 
     if(ui->checkBox_itiExternal->isChecked()){
         qDebug()<<"Using iti from file";
-        settings.itiSequence = TrialSeq::loadExternalItiSequence("/Users/davidunzue/iti_external.txt", ui->lineEdit_repeatPositive->text().toInt(), ui->lineEdit_repeatNegative->text().toInt());
+        settings.itiSequence = TrialSeq::loadExternalItiSequence("./iti_external.txt", ui->lineEdit_repeatPositive->text().toInt(), ui->lineEdit_repeatNegative->text().toInt());
     }else{
         settings.itiSequence = TrialSeq::generateItiSequence(userReaction, ui->lineEdit_iti->text(), ui->lineEdit_preImaq->text().toDouble(), ui->lineEdit_repeatPositive->text().toInt(), ui->lineEdit_repeatNegative->text().toInt());
     }
 
-    smc.startStateMachine(settings);
+    if(!settings.itiSequence.isEmpty()){
+        ui->pushButton_Run->setDisabled(true);
+        ui->statusBar->showMessage("Running");
+        smc.startStateMachine(settings);
+    }else{
+        QMessageBox::information(0, "error", "Unable to open iti_external.txt");
+    }
+
 }
 
 void MainWindow::on_pushButton_Pause_toggled(bool checked)

diff --git a/Mainwindow.h b/Mainwindow.h
@@ -7,12 +7,14 @@
 #include <QDebug>
 #include <QSettings>
 #include <QStandardPaths>
+#include <QMessageBox>
 #include "TimerDialog.h"
 #include "StateMachineController.h"
 #include "SettingStructures.h"
 #include "trialseq.h"
 #include "AboutDialog.h"
 
+
 namespace Ui {
 class MainWindow;
 }