From db2d0e0bd688764dd0af6439bd539a5864769bca Mon Sep 17 00:00:00 2001 From: Marc Hillesheim Date: Mon, 21 May 2018 17:03:06 +0200 Subject: [PATCH] [gui][script] Add camera button --- assets/camera-hot.png | Bin 0 -> 3331 bytes assets/resources.qrc | 1 + .../f1x/openauto/autoapp/UI/MainWindow.hpp | 1 + src/autoapp/UI/MainWindow.cpp | 1 + src/autoapp/UI/mainwindow.ui | 27 ++++++++++++++++++ src/autoapp/autoapp.cpp | 9 ++++++ 6 files changed, 39 insertions(+) create mode 100644 assets/camera-hot.png diff --git a/assets/camera-hot.png b/assets/camera-hot.png new file mode 100644 index 0000000000000000000000000000000000000000..ac8d3ec9070cebcf4cb5d9f7019818c2f4b6f2b3 GIT binary patch literal 3331 zcmV+e4gB(nP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0006mNkluDhhmGUbQ6>o+Cc>uMIC%d$AW_(lx9&%Q-bhw`GFbw@{*TwdAaxd!f}E7S;^08bAX%L5C*xUXk{eW0j|FKAWx7I+2R)be-2 zRsR3KcSPc}Woca{{q9uA_%{*hQJbK}x&OpmhqE2<33#WzJ|AK;tZ@P0hHoygsQqk& z-38#hR(HRA0`Rr&Uyjm*_M1Llh-A`wBQ&ag(1h)qy88of0NmET9AWoaAr*msp8#A0 zO2Eek5CULKKR(M zV;4fM&jQD^6n=QfhoP=;fqI?P*0pIcOR|)84WN=R05#VDW`Gw70&p*OY1-zCk^8`z z4ln*a@Ul|?x?c8r+yEE=17H9QfB`T72EYIq00UqE41fVJ0IAcz0RZJl5QRfp>z)7r N002ovPDHLkV1kG#AnpJF literal 0 HcmV?d00001 diff --git a/assets/resources.qrc b/assets/resources.qrc index 17a9e9f..f952e89 100644 --- a/assets/resources.qrc +++ b/assets/resources.qrc @@ -14,5 +14,6 @@ sleep-hot.png wifi-hot.png brightness-hot.png + camera-hot.png diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp index 2db7fd6..d75556a 100644 --- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp @@ -48,6 +48,7 @@ signals: void exit(); void openSettings(); void toggleCursor(); + void toggleCamera(); void openConnectDialog(); void showBrightnessSlider(); diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 8a26910..524b5bd 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -56,6 +56,7 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi ui_->setupUi(this); connect(ui_->pushButtonSettings, &QPushButton::clicked, this, &MainWindow::openSettings); connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::exit); + connect(ui_->pushButtonToggleCamera, &QPushButton::clicked, this, &MainWindow::toggleCamera); connect(ui_->pushButtonToggleCursor, &QPushButton::clicked, this, &MainWindow::toggleCursor); connect(ui_->pushButtonWirelessConnection, &QPushButton::clicked, this, &MainWindow::openConnectDialog); connect(ui_->pushButtonBrightness, &QPushButton::clicked, this, &MainWindow::showBrightnessSlider); diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 71166c5..a8dfce1 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -152,6 +152,32 @@ Qt::Horizontal + + + + 30 + 314 + 64 + 64 + + + + + :/camera-hot.png:/camera-hot.png + + + + 64 + 64 + + + + false + + + true + + @@ -185,6 +211,7 @@ pushButtonWirelessConnection pushButtonToggleCursor pushButtonBrightness + pushButtonToggleCamera pushButtonExit diff --git a/src/autoapp/autoapp.cpp b/src/autoapp/autoapp.cpp index a371880..ddd74bf 100644 --- a/src/autoapp/autoapp.cpp +++ b/src/autoapp/autoapp.cpp @@ -110,6 +110,15 @@ int main(int argc, char* argv[]) qApplication.setOverrideCursor(cursor); }); + QObject::connect(&mainWindow, &autoapp::ui::MainWindow::toggleCamera, [&qApplication]() { +#ifdef RASPBERRYPI3 + system("/opt/crankshaft/toggle_rpicam.sh &"); + OPENAUTO_LOG(info) << "[CS] Ran RPiCam script."; +#else + OPENAUTO_LOG(info) << "[CS] You are not running this on a Raspberry Pi, skipping Cam script."; +#endif + }); + mainWindow.showFullScreen(); aasdk::usb::USBWrapper usbWrapper(usbContext);