diff --git a/PupilEXT/src/main.cpp b/PupilEXT/src/main.cpp index 200b9440..5f3ac7fe 100644 --- a/PupilEXT/src/main.cpp +++ b/PupilEXT/src/main.cpp @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) // Changing this may change the settings path thus not loading old application settings! QCoreApplication::setOrganizationName("FGLT"); QCoreApplication::setApplicationName("PupilEXT"); - QCoreApplication::setApplicationVersion("0.1.0 Beta"); + QCoreApplication::setApplicationVersion("0.1.1 Beta"); qRegisterMetaTypeStreamOperators>>("QMap>"); qRegisterMetaTypeStreamOperators>>("QList>"); diff --git a/PupilEXT/src/mainwindow.cpp b/PupilEXT/src/mainwindow.cpp index db14ebb3..fda84db8 100644 --- a/PupilEXT/src/mainwindow.cpp +++ b/PupilEXT/src/mainwindow.cpp @@ -386,15 +386,23 @@ void MainWindow::closeEvent(QCloseEvent *event) { } void MainWindow::about() { - QMessageBox::about(this, tr("About ") + QCoreApplication::applicationName(), - tr("%1 is an open source application for pupillometry.

Publication:
Babak Zandi, Moritz Lode, Alexander Herzog, Georgios Sakas and Tran Quoc Khanh, PupilEXT: flexible open-source platform for high resolution pupil measurement in vision research" - "

" - "Github: https://github.com/openPupil/Open-PupilEXT
" - "OpenPupil Project: www.openpupil.io

" - "Developer-Team: Moritz Lode, Babak Zandi
Version: %2
" - "
Application settings: %3


" - "Powered by Open Source. Licensed under GPL 3" - ).arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion(), applicationSettings->fileName())); + GettingsStartedWizard* wizard = new GettingsStartedWizard(this); + wizard->show(); + connect(wizard->button(QWizard::FinishButton), SIGNAL(clicked()), this , SLOT(onGettingsStartedWizardFinish())); + +// QMessageBox::about(this, tr("About ") + QCoreApplication::applicationName(), +// tr("%1 is an open source application for pupillometry.

" +// "Babak Zandi, Moritz Lode, Alexander Herzog, Georgios Sakas and Tran Quoc Khanh. (2021)." +// " PupilEXT: Flexible Open-Source Platform for High-Resolution Pupil Measurement in Vision Research. " +// "Frontiers in Neuroscience. doi:10.3389/fnins.2021.676220." +// "

" +// "Github: https://github.com/openPupil/Open-PupilEXT
" +// "Developer-Team: Moritz Lode, Babak Zandi
Version: %2

" +// "The software PupilEXT is licensed under GNU General Public License v.3.0." +// ", Copyright (c) 2021 Technical University of Darmstadt. PupilEXT is for academic and non-commercial use only." +// " Third-party libraries may be distributed under other open-source licenses (see GitHub repository).

" +// "Application settings: %3
" +// ).arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion(), applicationSettings->fileName())); } void MainWindow::openSourceDialog() { @@ -432,7 +440,7 @@ void MainWindow::openSourceDialog() { "Breeze Icon Theme, License: LGPL v3

"); scroll->setWidget(label); - + label->setOpenExternalLinks(true); dialog->setLayout(l); dialog->show(); } diff --git a/PupilEXT/src/subwindows/gettingsStartedWizard.cpp b/PupilEXT/src/subwindows/gettingsStartedWizard.cpp index 4c44173e..4879a8df 100644 --- a/PupilEXT/src/subwindows/gettingsStartedWizard.cpp +++ b/PupilEXT/src/subwindows/gettingsStartedWizard.cpp @@ -21,14 +21,19 @@ QWizardPage* GettingsStartedWizard::createIntroPage() QWizardPage *page = new QWizardPage; page->setTitle("Introduction"); - QLabel *label = new QLabel(tr("%1 is an open source application for pupillometry.

Presented in the work:
Babak Zandi, Moritz Lode, Alexander Herzog, Georgios Sakas and Tran Quoc Khanh, PupilEXT: flexible open-source platform for high resolution pupil measurement in vision research" + QLabel *label = new QLabel(tr("%1 Version: %2 is an open source application for pupillometry.

" + "Babak Zandi, Moritz Lode, Alexander Herzog, Georgios Sakas and Tran Quoc Khanh. (2021). " + "PupilEXT: Flexible Open-Source Platform for High-Resolution Pupil Measurement in Vision Research.
" + " Frontiers in Neuroscience. doi:10.3389/fnins.2021.676220." "

Consider to cite our work, if you find this tool useful for your research." - "

Links:
" - "Github: https://github.com/openPupil/Open-PupilEXT
" - "OpenPupil Project: www.openPupil.io

" - "Powered by Open Source. Licensed under GPL 3" - ).arg(QCoreApplication::applicationName())); - + "Github: https://github.com/openPupil/Open-PupilEXT

" + "The software PupilEXT is licensed under GNU General Public License v.3.0." + ", Copyright (c) 2021 Technical University of Darmstadt. PupilEXT is for academic and non-commercial use only." + " Note that third-party libraries used in PupilEXT may be distributed under other open-source licenses (see GitHub repository).

" + "Application settings path: %3
" + ).arg(QCoreApplication::applicationName(),QCoreApplication::applicationVersion(), applicationSettings->fileName())); + + label->setOpenExternalLinks(true); label->setWordWrap(true); QVBoxLayout *layout = new QVBoxLayout; @@ -58,6 +63,7 @@ QWizardPage* GettingsStartedWizard::createInfo1Page() QLabel *label2= new QLabel("For more information and detailed video instructions visit the project website: PupilEXT"); label2->setWordWrap(true); + label2->setOpenExternalLinks(true); QGridLayout *layout = new QGridLayout; layout->addWidget(label); @@ -72,7 +78,7 @@ QWizardPage* GettingsStartedWizard::createConclusionPage() QWizardPage *page = new QWizardPage; page->setTitle("Conclusion"); - QLabel *label = new QLabel("You are now ready to conduct pupil experiments!


Consider visiting openPupil.io to review openly available pupil datasets and contribute your insights."); + QLabel *label = new QLabel("You are now ready to conduct pupil experiments!


Consider visiting openPupil.io (under construction) to review openly available pupil datasets and contribute your insights."); label->setWordWrap(true); QVBoxLayout *layout = new QVBoxLayout; diff --git a/PupilEXT/src/subwindows/videoView.cpp b/PupilEXT/src/subwindows/videoView.cpp index e2c85f50..eb3c8c92 100644 --- a/PupilEXT/src/subwindows/videoView.cpp +++ b/PupilEXT/src/subwindows/videoView.cpp @@ -79,6 +79,16 @@ void VideoView::updateView(const cv::Mat &img) { if(mode==FIT) { graphicsView->fitInView(graphicsScene->sceneRect(), Qt::KeepAspectRatio); } + + // ML: ADDED START 20.06.21 + // Reason: Prevent error if the ROI is bigger than the image itself + QRectF roi = roiSelection->sceneBoundingRect() - QMarginsF(0.5,0.5,0.5,0.5); + if(!graphicsScene->sceneRect().contains(roi)) { + roiSelection->setRect(0, 0, 32, 32); + saveROISelection(); + } + // ML: ADDED END + initialFit = true; } } @@ -205,7 +215,12 @@ void VideoView::setROISelection(float roiSize) { // Sets a ROI selection based on a given rectangle void VideoView::setROISelection(QRectF roi) { - if(!roi.isEmpty() && graphicsScene->sceneRect().contains(roi)) { + //if(!roi.isEmpty() && graphicsScene->sceneRect().contains(roi)) { + // roiSelection->setRect(roi); + //} + // ML: CHANGED START 20.06.21 + if(!roi.isEmpty()) { roiSelection->setRect(roi); } + // ML: CHANGED END }