diff --git a/BioTracker/CoreApp/BioTracker/View/MainWindow.cpp b/BioTracker/CoreApp/BioTracker/View/MainWindow.cpp index d2c17391..452a3d98 100644 --- a/BioTracker/CoreApp/BioTracker/View/MainWindow.cpp +++ b/BioTracker/CoreApp/BioTracker/View/MainWindow.cpp @@ -28,11 +28,18 @@ #include "QWizard" #include "QWizardPage" #include "QDesktopServices" +#include "QSplashScreen" MainWindow::MainWindow(QWidget* parent, IController* controller, IModel* model) : IViewMainWindow(parent, controller, model), ui(new Ui::MainWindow) { + + //start splashscreen + QPixmap splashPix(":/Logo/resources/logo/BT3-big.png"); + QSplashScreen splash(splashPix.scaledToHeight(300, Qt::SmoothTransformation)); + splash.show(); + _previouslySelectedTracker = ""; _currentParameterView = 0; _currentCoreParameterView = 0; @@ -64,6 +71,8 @@ MainWindow::MainWindow(QWidget* parent, IController* controller, IModel* model) //set window icon QApplication::setWindowIcon(QIcon(":/Logo/resources/logo/BT-3_non_transparent_rounded.ico")); + + splash.finish(this); } MainWindow::~MainWindow() { @@ -1046,4 +1055,4 @@ void MainWindow::on_actionShow_introduction_triggered() { ///////////// void MainWindow::closeEvent(QCloseEvent *event) { qobject_cast (getController())->exit(); -} \ No newline at end of file +} diff --git a/BioTracker/CoreApp/BioTracker/View/VideoControllWidget.cpp b/BioTracker/CoreApp/BioTracker/View/VideoControllWidget.cpp index 5271324e..7aa591f5 100644 --- a/BioTracker/CoreApp/BioTracker/View/VideoControllWidget.cpp +++ b/BioTracker/CoreApp/BioTracker/View/VideoControllWidget.cpp @@ -68,6 +68,7 @@ void VideoControllWidget::getNotified() { int mediaFps = mediaPlayer->getFpsOfSourceFile(); //ui->frame_num_edit->setText(QString::number(currentFrameNr)); ui->frame_num_spin->setMaximum(totalNumberOfFrames); + ui->frame_num_spin->setSuffix(QString(" / ") + QString::number(totalNumberOfFrames)); ui->frame_num_spin->setValue(currentFrameNr); ui->sld_video->setValue(currentFrameNr); @@ -318,7 +319,12 @@ void VideoControllWidget::setupVideoToolbar() { videoToolBar->addAction(ui->actionRecord_all); videoToolBar->addSeparator(); - videoToolBar->addWidget(ui->scrollAreaVideoInfo); + QAction* infoWidgetAction = videoToolBar->addWidget(ui->scrollAreaVideoInfo); + QWidget* infoWidget = videoToolBar->widgetForAction(infoWidgetAction); + QWidget* playbackWidget = infoWidget->findChild("playback"); + if(playbackWidget){ + playbackWidget->setStyleSheet("QWidget{background-color:#F7F7F7;}"); + } } } } diff --git a/BioTracker/CoreApp/BioTracker/View/VideoControllWidget.ui b/BioTracker/CoreApp/BioTracker/View/VideoControllWidget.ui index 5d4312f4..0b9e5cb7 100644 --- a/BioTracker/CoreApp/BioTracker/View/VideoControllWidget.ui +++ b/BioTracker/CoreApp/BioTracker/View/VideoControllWidget.ui @@ -9,7 +9,7 @@ 0 0 - 1056 + 809 101 @@ -40,6 +40,43 @@ 30 + + + + + + + 229 + 229 + 229 + + + + + + + + + 229 + 229 + 229 + + + + + + + + + 190 + 190 + 190 + + + + + + Show the current state of the video. Slide to desired frame @@ -100,7 +137,7 @@ 0 0 - 1038 + 791 50 @@ -112,13 +149,13 @@ 0 - 5 + 0 0 - 5 + 0 @@ -163,7 +200,7 @@ - 0 + 2 0 @@ -184,19 +221,25 @@ 5 - 0 + 3 0 - 0 + 3 0 + + + 0 + 0 + + Current time: @@ -205,18 +248,18 @@ - false + true - + 0 0 - 100 - 30 + 16777215 + 16777215 @@ -228,11 +271,208 @@ 11 + + true + + + + + + 16777215 + 40 + + + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 217 + 217 + 217 + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 217 + 217 + 217 + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + + 190 + 190 + 190 + + + + + + + 247 + 247 + 247 + + + + + + + 190 + 190 + 190 + + + + + + + 190 + 190 + 190 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + background-color: #f7f7f7; + + + QFrame::Plain + + + 1 + + + Qt::Vertical + + + @@ -246,13 +486,13 @@ 5 - 0 + 3 0 - 0 + 3 0 @@ -274,16 +514,25 @@ - 60 - 30 + 0 + 0 + + Displays the current frame of the medium. Can be modified. + QAbstractSpinBox::NoButtons QAbstractSpinBox::CorrectToNearestValue + + false + + + / 0 + 100 @@ -295,6 +544,197 @@ + + + + + 16777215 + 40 + + + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 217 + 217 + 217 + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 217 + 217 + 217 + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + + 190 + 190 + 190 + + + + + + + 247 + 247 + 247 + + + + + + + 190 + 190 + 190 + + + + + + + 190 + 190 + 190 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + background-color: #f7f7f7; + + + QFrame::Plain + + + Qt::Vertical + + + @@ -305,7 +745,7 @@ - 0 + 5 3 @@ -360,6 +800,197 @@ + + + + + 16777215 + 40 + + + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 217 + 217 + 217 + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 217 + 217 + 217 + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + + 190 + 190 + 190 + + + + + + + 247 + 247 + 247 + + + + + + + 190 + 190 + 190 + + + + + + + 190 + 190 + 190 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + background-color: #f7f7f7; + + + QFrame::Plain + + + Qt::Vertical + + + @@ -408,6 +1039,9 @@ Set a fps limit (0 for no limit) + + QAbstractSpinBox::PlusMinus + 1 @@ -419,6 +1053,197 @@ + + + + + 16777215 + 40 + + + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 217 + 217 + 217 + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 217 + 217 + 217 + + + + + + + 217 + 217 + 217 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + + 190 + 190 + 190 + + + + + + + 247 + 247 + 247 + + + + + + + 190 + 190 + 190 + + + + + + + 190 + 190 + 190 + + + + + + + 247 + 247 + 247 + + + + + + + 247 + 247 + 247 + + + + + + + + background-color: #f7f7f7; + + + QFrame::Plain + + + Qt::Vertical + + +