From 4b1fa76143961d02dc95c8de5a025cec86e55cfa Mon Sep 17 00:00:00 2001 From: Asitha Nanayakkara Date: Wed, 18 Dec 2013 14:47:44 +0530 Subject: [PATCH] Menu entry update on camera or file view open About window updated. --- NoobaFE/CameraView.cpp | 17 ----------------- NoobaFE/CameraView.h | 6 ------ NoobaFE/Forms/OutputWind.ui | 25 +++++++++++++++++++++++-- NoobaFE/MainWindow.cpp | 18 +++++++++++++----- NoobaFE/Resources/add.png | Bin 0 -> 415 bytes NoobaFE/Resources/clear.png | Bin 0 -> 758 bytes NoobaFE/Resources/mainwind.qrc | 1 + NoobaFE/Resources/remove.png | Bin 0 -> 153 bytes 8 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 NoobaFE/Resources/add.png create mode 100644 NoobaFE/Resources/clear.png create mode 100644 NoobaFE/Resources/remove.png 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 0000000000000000000000000000000000000000..5e4b1eec29025863e4bdbd42d5b03451548c8847 GIT binary patch literal 415 zcmV;Q0bu@#P)%)R6z*^R(NYSgki<;fblbSQuKL0hGIU;N-n<2!SY!AdX}B zX~dlbSR|yt*8fPLkCf8HCb1U;zc4?aE6@9qgXj}Q5zMj~gkflM{DVW=w!nKn6l(Hj z{kqOg2Wgs`A`2u#9dHD5ryisyDI_u(MhyHQ8%FSbAN1P3>#!j};7aXUO{X5&Y9NK2 zynGC(qFW8LktQ;AT?aSUw_tTik^~+e?_G{Y8!5L&BI8&sS7&|So31c8=gNIYN4|HB zws2(S-}(S1J{bIPECDj0Hr9oQ+-OB~^GruQ7R=7<{*9jk3;=``lCh2qRKfrN002ov JPDHLkV1j*nuG|0s literal 0 HcmV?d00001 diff --git a/NoobaFE/Resources/clear.png b/NoobaFE/Resources/clear.png new file mode 100644 index 0000000000000000000000000000000000000000..d3e0e1256083f0d0fa7a2083593839e6a4a06dc2 GIT binary patch literal 758 zcmVd*4rq2>&w&ThuzE zIj?!G*2&&`hoDYd-$F6H&HsJs)5$NR~#{#Gfnl;XwBFNc`pEP z^*eB62P-P$&7(}a%J=y^>=^d^KrV=I z%K6ROai!R0jN0y8A|{JQBJ&QcRaI40v_H5hqiQ&D_?#RD_#wn}O4S;pjv4K4ojq^4 znlg31n|nIIlf9Riyt$DXtxL#ed%1V_YSCKRok+?>C!JCnSZNFi<3zSJ&0l5a%v~Lc zI39%kR4-FZy|IPcJFe5d?-p!VMGy~&0H}0|594CBqwA+PmDklZDYvW-SHDI(m0)VY zOn|T#YbSAa+sSY!lY8m!p*fM15`d$XlEq6mjL|kj{{2~ks0-yWqU9ey-z7sJ79A<0 zdS6|szdd*Ss~A9|5D`4DpT1lVxm<>9wwt^cC6jrKKQhpjNXok(0EwjZgkiA$&h5*E zf)|yF_%^f?!`gsiv4H1&#HW#mZP$xID6KzN{;kGzN;PWDt(h|y#-}x`aID|W$Z!X4 z1?E ouQi8&O(G}}7ABI?{j0D21Z$)ritx&@8vpshow_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 0000000000000000000000000000000000000000..ca6fee1ac4d0b004ebbd5df93533e7f009daa8cc GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XtUX;ELn>}1B}lL`^Gi&;@zG(9!;*ch4toTSBsdC%FeI@n y@meq>8w9>$O%bzbt*&&`0wFnGH9xvX