diff --git a/NoobaFE/CameraView.cpp b/NoobaFE/CameraView.cpp index 7086475..2e67ff2 100644 --- a/NoobaFE/CameraView.cpp +++ b/NoobaFE/CameraView.cpp @@ -419,23 +419,6 @@ void CameraView::resizeEvent(QResizeEvent *event) ui->mdiArea->tileSubWindows(); } -QImage CameraView::cvt2QImage(const Mat &cvImg) -{ - QImage img; - if(cvImg.channels() == 1) - { - img = QImage((const unsigned char*)(cvImg.data), - cvImg.cols,cvImg.rows,cvImg.step, QImage::Format_Indexed8); - } - else - { - img = QImage((const unsigned char*)(cvImg.data), - cvImg.cols,cvImg.rows,cvImg.step, QImage::Format_RGB888); - - } - return img; -} - void CameraView::setVideoState(nooba::VideoState state) { switch(state){ diff --git a/NoobaFE/CameraView.h b/NoobaFE/CameraView.h index a7bb6c3..8d80ace 100644 --- a/NoobaFE/CameraView.h +++ b/NoobaFE/CameraView.h @@ -96,12 +96,6 @@ private slots: FrameViewer* _frameViewer; }; - /* - \brief get a color QImage from cv::Mat - \return QImage with three color channels - */ - inline QImage cvt2QImage(const cv::Mat &cvImg); - /* * Updates the current video state * \param state diff --git a/NoobaFE/Forms/OutputWind.ui b/NoobaFE/Forms/OutputWind.ui index 3f3fa26..0b4e248 100644 --- a/NoobaFE/Forms/OutputWind.ui +++ b/NoobaFE/Forms/OutputWind.ui @@ -37,6 +37,18 @@ + + 3 + + + 3 + + + 3 + + + 3 + @@ -52,8 +64,15 @@ + + Clear Output + - Clear + + + + + :/Resources/clear.png:/Resources/clear.png @@ -61,7 +80,9 @@ - + + + pushButton diff --git a/NoobaFE/MainWindow.cpp b/NoobaFE/MainWindow.cpp index 1271aa6..6568aa9 100644 --- a/NoobaFE/MainWindow.cpp +++ b/NoobaFE/MainWindow.cpp @@ -163,7 +163,7 @@ void MainWindow::onMdiSubWindowActivated(QMdiSubWindow *subWindow) void MainWindow::onCamViewClose() { - if(ui->mdiArea->subWindowList().count() == 1) // 1 is goint to close. so disable menus + if(ui->mdiArea->subWindowList().count() == 0) // 1 is goint to close. so disable menus enableMenuItems(false); } @@ -277,11 +277,18 @@ void MainWindow::onPluginAct_triggerred() void MainWindow::on_actionAbout_NoobaVSS_triggered() { + QString arch; +#if defined(Q_PROCESSOR_X86_32) + arch = "32 bit"; +#elif defined(Q_PROCESSOR_X86_64) + arch = "64 bit"; +#endif + QMessageBox::about(this, "About NoobaVSS", - QString("

NoobaVSS %1.%2

" - "

Nooba Plugin API version %3.%4

" - "

Using OpenCV %5.%6 and Qt %7

" - "

Built on %8

" + QString("

NoobaVSS %1.%2 (%3)

" + "

Nooba Plugin API version %4.%5

" + "

Using OpenCV %6.%7 and Qt %8

" + "

Built on %9

" "

Copyright (C) 2014 by the Nooba team. All rights reserved.

" "

NoobaVSS is free software: you can redistribute it and/or modify " "it under the terms of the GNU General Public License as published by " @@ -291,6 +298,7 @@ void MainWindow::on_actionAbout_NoobaVSS_triggered() " but WITHOUT ANY WARRANTY; without even the implied warranty of" " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

") .arg(nooba::MajorVersion).arg(nooba::MinorVersion) + .arg(arch) .arg(API_MAJOR_VERSION).arg(API_MINOR_VERSION) .arg(CV_MAJOR_VERSION).arg(CV_MINOR_VERSION) .arg(QT_VERSION_STR) diff --git a/NoobaFE/Resources/add.png b/NoobaFE/Resources/add.png new file mode 100644 index 0000000..5e4b1ee Binary files /dev/null and b/NoobaFE/Resources/add.png differ diff --git a/NoobaFE/Resources/clear.png b/NoobaFE/Resources/clear.png new file mode 100644 index 0000000..d3e0e12 Binary files /dev/null and b/NoobaFE/Resources/clear.png differ diff --git a/NoobaFE/Resources/mainwind.qrc b/NoobaFE/Resources/mainwind.qrc index bec1b6f..f10dc80 100644 --- a/NoobaFE/Resources/mainwind.qrc +++ b/NoobaFE/Resources/mainwind.qrc @@ -16,5 +16,6 @@ show_hide.png Nooba_logo.png Nooba_logo.ico + clear.png diff --git a/NoobaFE/Resources/remove.png b/NoobaFE/Resources/remove.png new file mode 100644 index 0000000..ca6fee1 Binary files /dev/null and b/NoobaFE/Resources/remove.png differ