Commit 0e1ddbaa authored by Thiago Santini's avatar Thiago Santini

Removes mentions to the evaluation

Files that belonged to PuRe, PuReSt and the evaluation framework were
removed through a filter-branch, but rebasing these commit's changes mean
solving the conflicts throughout history, so we just do a single commit
here.
parent 346e36d4
......@@ -49,7 +49,6 @@ SOURCES +=\
$${TOP}/src/ERWidget.cpp \
src/pupil-tracking/PuReST.cpp \
src/pupil-detection/PuRe.cpp \
src/Evaluation.cpp \
src/pupil-tracking/PupilTrackingMethod.cpp
HEADERS += \
......@@ -83,7 +82,6 @@ HEADERS += \
$${TOP}/src/ERWidget.h \
$${TOP}/src/pupil-tracking/PupilTrackingMethod.h \
src/pupil-detection/PuRe.h \
src/Evaluation.h \
src/pupil-tracking/PuReST.h
FORMS += \
......@@ -91,8 +89,7 @@ FORMS += \
$${TOP}/src/CameraWidget.ui \
$${TOP}/src/GazeEstimationWidget.ui \
$${TOP}/src/LogWidget.ui \
$${TOP}/src/PerformanceMonitorWidget.ui \
src/Evaluation.ui
$${TOP}/src/PerformanceMonitorWidget.ui
RESOURCES += \
$${TOP}/resources.qrc
......
......@@ -18,8 +18,6 @@ MainWindow::MainWindow(QWidget *parent) :
ui(new Ui::MainWindow)
{
ui->setupUi(this);
#define EYEREC
#ifdef EYEREC
createExtraMenus();
connect(ui->menuBar, SIGNAL(triggered(QAction*)), this, SLOT(menuOption(QAction*)) );
......@@ -163,12 +161,6 @@ MainWindow::MainWindow(QWidget *parent) :
this, SLOT(unfreezeCameraImages()) );
connect(&commandManager, SIGNAL(togglePreview()),
this, SLOT(togglePreview()) );
#else
gPerformanceMonitor.setFrameDrop(false);
evaluation = new Evaluation();
evaluation->show();
QMetaObject::invokeMethod(evaluation, "run", Qt::QueuedConnection);
#endif
}
......@@ -180,7 +172,6 @@ MainWindow::~MainWindow()
void MainWindow::closeEvent(QCloseEvent *event)
{
#ifdef EYEREC
if (ui->recordingToggle->isChecked()) {
ui->recordingToggle->setChecked(false);
on_recordingToggle_clicked();
......@@ -263,13 +254,6 @@ void MainWindow::closeEvent(QCloseEvent *event)
settings->deleteLater();
settings = NULL;
}
#else
if ( evaluation ) {
evaluation->close();
evaluation->deleteLater();
evaluation = NULL;
}
#endif
event->accept();
}
......
......@@ -31,8 +31,6 @@
#include "utils.h"
#include "Evaluation.h"
class MainWindowConfig
{
public:
......@@ -88,7 +86,6 @@ private:
LogWidget *logWidget;
PerformanceMonitorWidget *performanceMonitorWidget;
CommandManager commandManager;
Evaluation *evaluation;
QElapsedTimer elapsedTime;
int elapsedTimeUpdateTimer;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment