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 +=\ ...@@ -49,7 +49,6 @@ SOURCES +=\
$${TOP}/src/ERWidget.cpp \ $${TOP}/src/ERWidget.cpp \
src/pupil-tracking/PuReST.cpp \ src/pupil-tracking/PuReST.cpp \
src/pupil-detection/PuRe.cpp \ src/pupil-detection/PuRe.cpp \
src/Evaluation.cpp \
src/pupil-tracking/PupilTrackingMethod.cpp src/pupil-tracking/PupilTrackingMethod.cpp
HEADERS += \ HEADERS += \
...@@ -83,7 +82,6 @@ HEADERS += \ ...@@ -83,7 +82,6 @@ HEADERS += \
$${TOP}/src/ERWidget.h \ $${TOP}/src/ERWidget.h \
$${TOP}/src/pupil-tracking/PupilTrackingMethod.h \ $${TOP}/src/pupil-tracking/PupilTrackingMethod.h \
src/pupil-detection/PuRe.h \ src/pupil-detection/PuRe.h \
src/Evaluation.h \
src/pupil-tracking/PuReST.h src/pupil-tracking/PuReST.h
FORMS += \ FORMS += \
...@@ -91,8 +89,7 @@ FORMS += \ ...@@ -91,8 +89,7 @@ FORMS += \
$${TOP}/src/CameraWidget.ui \ $${TOP}/src/CameraWidget.ui \
$${TOP}/src/GazeEstimationWidget.ui \ $${TOP}/src/GazeEstimationWidget.ui \
$${TOP}/src/LogWidget.ui \ $${TOP}/src/LogWidget.ui \
$${TOP}/src/PerformanceMonitorWidget.ui \ $${TOP}/src/PerformanceMonitorWidget.ui
src/Evaluation.ui
RESOURCES += \ RESOURCES += \
$${TOP}/resources.qrc $${TOP}/resources.qrc
......
...@@ -18,8 +18,6 @@ MainWindow::MainWindow(QWidget *parent) : ...@@ -18,8 +18,6 @@ MainWindow::MainWindow(QWidget *parent) :
ui(new Ui::MainWindow) ui(new Ui::MainWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
#define EYEREC
#ifdef EYEREC
createExtraMenus(); createExtraMenus();
connect(ui->menuBar, SIGNAL(triggered(QAction*)), this, SLOT(menuOption(QAction*)) ); connect(ui->menuBar, SIGNAL(triggered(QAction*)), this, SLOT(menuOption(QAction*)) );
...@@ -163,12 +161,6 @@ MainWindow::MainWindow(QWidget *parent) : ...@@ -163,12 +161,6 @@ MainWindow::MainWindow(QWidget *parent) :
this, SLOT(unfreezeCameraImages()) ); this, SLOT(unfreezeCameraImages()) );
connect(&commandManager, SIGNAL(togglePreview()), connect(&commandManager, SIGNAL(togglePreview()),
this, SLOT(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() ...@@ -180,7 +172,6 @@ MainWindow::~MainWindow()
void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::closeEvent(QCloseEvent *event)
{ {
#ifdef EYEREC
if (ui->recordingToggle->isChecked()) { if (ui->recordingToggle->isChecked()) {
ui->recordingToggle->setChecked(false); ui->recordingToggle->setChecked(false);
on_recordingToggle_clicked(); on_recordingToggle_clicked();
...@@ -263,13 +254,6 @@ void MainWindow::closeEvent(QCloseEvent *event) ...@@ -263,13 +254,6 @@ void MainWindow::closeEvent(QCloseEvent *event)
settings->deleteLater(); settings->deleteLater();
settings = NULL; settings = NULL;
} }
#else
if ( evaluation ) {
evaluation->close();
evaluation->deleteLater();
evaluation = NULL;
}
#endif
event->accept(); event->accept();
} }
......
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
#include "utils.h" #include "utils.h"
#include "Evaluation.h"
class MainWindowConfig class MainWindowConfig
{ {
public: public:
...@@ -88,7 +86,6 @@ private: ...@@ -88,7 +86,6 @@ private:
LogWidget *logWidget; LogWidget *logWidget;
PerformanceMonitorWidget *performanceMonitorWidget; PerformanceMonitorWidget *performanceMonitorWidget;
CommandManager commandManager; CommandManager commandManager;
Evaluation *evaluation;
QElapsedTimer elapsedTime; QElapsedTimer elapsedTime;
int elapsedTimeUpdateTimer; 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