From fca7dedd837c0275140a09d6123a20387c00eeca Mon Sep 17 00:00:00 2001 From: bailijun Date: Thu, 21 Oct 2021 10:23:36 +0800 Subject: [PATCH] =?UTF-8?q?Merged=20with=20bai:=20textLable=20=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit textLable 滚动显示 倒计时 显示调整 指示灯显示状态 修正 & 修正 void Co-authored-by: Bai Reviewed-on: https://dd.tall.wiki/gitea/ccsens_hardware/qt_qcp_show/pulls/3 --- QCPShow.pro.user | 24 ++++++++-------- image/1LED_gray.png | Bin 0 -> 4196 bytes image/1LED_green.png | Bin 0 -> 4331 bytes main.cpp | 6 ++-- mainwidget.cpp | 67 +++++++++++++++++++++++++++++++------------ mainwidget.h | 6 +++- mainwidget.ui | 32 +++++++++++++++++---- resource.qrc | 2 ++ websocketservice.cpp | 3 +- 9 files changed, 99 insertions(+), 41 deletions(-) create mode 100644 image/1LED_gray.png create mode 100644 image/1LED_green.png diff --git a/QCPShow.pro.user b/QCPShow.pro.user index d46a439..d4f0342 100644 --- a/QCPShow.pro.user +++ b/QCPShow.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {fe03815e-74e2-457e-b60c-e66368cd4ce4} + {0d351c1e-abb6-427c-8d0b-30ca23826ed5} ProjectExplorer.Project.ActiveTarget @@ -66,7 +66,7 @@ 0 0 - E:/Qt/QtSpace/build-QcpShow-Desktop_Qt_5_8_0_MinGW_32bit-Debug + D:/Qt/QtSpace/build-QcpShow-Desktop_Qt_5_8_0_MinGW_32bit-Debug true @@ -90,7 +90,7 @@ 2 - Build + 构建 ProjectExplorer.BuildSteps.Build @@ -106,7 +106,7 @@ 1 - Clean + 清理 ProjectExplorer.BuildSteps.Clean @@ -144,7 +144,7 @@ 2 - Build + 构建 ProjectExplorer.BuildSteps.Build @@ -160,7 +160,7 @@ 1 - Clean + 清理 ProjectExplorer.BuildSteps.Clean @@ -198,7 +198,7 @@ 2 - Build + 构建 ProjectExplorer.BuildSteps.Build @@ -214,7 +214,7 @@ 1 - Clean + 清理 ProjectExplorer.BuildSteps.Clean @@ -231,7 +231,7 @@ 0 - Deploy + 部署 ProjectExplorer.BuildSteps.Deploy @@ -286,13 +286,13 @@ QCPShow QCPShow2 - Qt4ProjectManager.Qt4RunConfiguration:E:/Qt/QtSpace/QCPShow/QCPShow.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/Qt/QtSpace/qt_qcp_show/QCPShow.pro true QCPShow.pro false - E:/Qt/QtSpace/build-QcpShow-Desktop_Qt_5_8_0_MinGW_32bit-Debug + D:/Qt/QtSpace/build-QcpShow-Desktop_Qt_5_8_0_MinGW_32bit-Debug 3768 false true diff --git a/image/1LED_gray.png b/image/1LED_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..cd580f604226df039cb919e577d68c43a0579519 GIT binary patch literal 4196 zcmb_g`8$+r+uz86QikDteh&G!6|~$pUg+bvoYy@1yMFt3fe!l4(-efNB!Yv_42VyGLfJXx5RkNS zNsg$vXgH2}9}11_6o<0M!f0}x&Ql9dOixg-NQK%?@#JW@8_NGrTWO9qMB1rqZhR&e zdDP*W4T=Knt~Aq=%Icg_2#82>?vxN0o0_R~{ORmi7&Mlrow%L|?kr6=OzM3D?gjZQ z8)j^Hkw*akxABrQxL0go`YWU)0zxhMhzvr3d%bzt<&XxNfwS^V(}uID{a?(eZ`lx) zkT7s@b6aStR_f=7P6wQ20r7asC7@LU(Bc3@d-J{-$RioR$K%n>z_Z-!*X+>_z_Vk3 zzA1g7%KQ;);?t*3mm=k)gw1oniw<`3MHxLFX)KvsQ^B>>Km%pb5?nwCnuI%`XNRF! zxhW<$BWuRVUX<#hvlZ*}$9ZiPLXHDUhHXw?<=(|uuw9>j{3sREI}13UfmPLICT#@1 zN2FIe7c48n0@Z-L6M$5D)AZ=#8DNK&UD#Fan^`4IPF94h7JFCO_+afB^@w>Tl74OK z^}J>d*e?|8g*1NM2a_w7M;uOTYeR4<#95gcoH+|b#{;)&rM5&vMRnMm^#CO~V+QO{U`*orBAeiAkHg4V)d{D+ylyR-Q z_c82;-OxiLN=I*@RMEfWYFQ4wLr=%dTWMJDnI&7u!KRI{zMkmN$GTe9fpFdY?ww9yVq9B%LtMT!goR&hrjde|N zJ%?GAzx_3(l7H$tB~h}(xMZ<=$kyJwUDbpDdDhIYj6!F-j2jVavW? z4ARAFil-Fo3nMnCvK#W@3Nyu9!QW z3cm?0&G@&cxbW=HpM|YN+~zZW^(K^Q9l1p2HEkbNy4U?YT^c`h-(A5G4%!)CS@p$d zem8i)9C@LAD=uG?QrR66d6KALux!hw;|Cq@S1avW?)hN8As0A`7%^{Mjx4WU(AJ7E zDGtnjtRtAOVOn?pMq#Yvq#I{pnErHw4;Vvc(w(V%4T@ETGVf_}&a6>a2scc-{z;#9 z?8>Mv@O|M5tq0Kpd)Z#cFzgeN?q~Iv1Y`!VBD8kDv|P7moYBl1NI)lEg_K`7>!>5{ zrJk6|@nDxL>w?yWo6u>+`pLB@rPqvot*ZMuL5~JJ#W&1UojrK0PQADBlGYohF0DB? zx`gI1YaF0+ao9~52k@}Iulw?eZ&IkS_+sHa6qv99J-g!b$%kAkEPS<+&O40IS4g>e zsMQOsDOrw-wwC_n2C5UIz1`c@wQ6WJN%drWz*UNtTtKlTFl?s2^;{^H7l!|Ioi~_k zB;e)8H357mgR999H`+L6hc*r2+g+#pb?t?2e-rQ1)UpE7SMji1$iN+X!1ouv^p|+{ zRA^eJzdVK)Iq69>S9^WaezL&lJpzP+82x+W8#(xGS+14hvfK|#kaV>WB}Fj*{Me#d z#H7q{N5Sw+O0vXT@An8}OY*zk`wUVi6BjZGYpEHWaTQ$MOjh{Agco#eQZJdR5GWw0%TC#`%3-pI3h1M?uL0+TqhV9_LV z(BUqE&P$JKlwM85ncY09xD?ArIZzq3dvf1ZVEH7&QnlDq#y^}$4AQV{g=jbrZYq5CXaZv=`X|c&7rJT0mYMnbfJ6w4B!H|{-7hEZ(TIsGf2D5EB&7J}; z8S!>-U@Yb|zVF=m0X3z&d4b4Y;s4&`sFoyvDBF6th`~AbyV6BMA&MAx=(LS>y>Mn0 z6n;8}h|>tOi#_8jeid??6Nvibe^<&C4Sluo?MCd`#X1cuo3y7Uw#wmx$o37y+=~V3hj59IbUyWBn77l=kDZWHiO;kyiw6I*};i#*Y@8=CaY$5}8#2 zLz>IFve)Z@({<{bBs~;T8GI z#7gr=-|unO4dWDKl7!yn7QYaRud%aKkm;HBvv~A3_AzB%m;rvMb~_=^ z1`K7yS>W^tuVp)bPU{6^V{e9Gu?3j0Lcn*AtMk(4G>#}EoX>v=`-SseGk|h6d)UU6 zc=0|Z8H1>Gp@F5c@UUCfl>iGbq?oG-5jxcTX}bNk$ay_kW3x)s2^4G1o>8S<-u@C> z@$}AXm!*mQiX0Aw=U-%^DR%}n^eSiMXC4?9}`e|8D9Vi{x# z4;9x9(>@WLLaEq2y>Xq82INKdG3bD3R?W9hS@*Ncq1b5vPDBVX(Xf4UPX~$KNTKg_t}HXrLxAS1I|G@y`_EyDTh!&E%Xx zUOWp@PC!luITRSjE|UDj*4zfS-X4K{s69h@H#1VbG-PkWoG$$V6eA<6N`4xDiJdxv zuS8G-ifu+U^q*mOx1UkRV3?_puzwfd3%W@dmku8TZq=}?W!^|geMi8Qe;rS=g$!H) zO9~Vu`|Nf<4;TRYw@i=v^gpw?Sz(ZJ{o1e1QW5;rrUS`mRLas``ucD5)*xaey#y2` zEo`Z3P9%R1`=u#$dX)D+RoL2>Me>d$l8>^>9-H|7dCE&|;!slL;#?i}T)J*gukGHo zXd26;ZFx|mx!WUUMyzCy@DmEyc@bBGe)#kqx*!|Nm*92$5^>=AspCM{usMN!(`e2g z*;rG^?eJO_9&0T-V3B6frMf=K%wI3uzm6PC>52_M?hbWG^S19!`m^@lkKG0|So!)& z64^Z2b3D}+O;%<$Y!)P0!rHZE+eN-}s&=u~zyIutqGLTwe*e;LE-bz)VnBBP2pOP1 z&ZkbuS4W0b)GWUGwc)KH+H+%?OG~NzjTkPrV*BM+3}f(ws}|a$r>(6`T=*A_|I$o- zG0uf{sGp_ezBDoz=JU*}WZy<|zUoQck_dr#H_X_b7HRrZckGOKR_EB8L!tn%f?^G+ zgy??LVS!4j6kE|Ri{7*x9z^YTc+mW%t5TgqOKsOrE$^2Eq>du?4=2yx&)&#n;ahaV zHh0A-;kn$Gpo9n;{vQb|yw!!4n|RyDi&|Qr_<+5jgpu_81g(xo8X52ffIRZ1DB`t- zaWJk<-`ie|buyQeWbP$97F+{gKsaYw?d1tHb4Ize_Sl57w?+VV{$Is^<}7V}Oc09Q zjHw>+R{of;1r0onmYC>J?sL3Hx%1$5?mBeH7o(|_TP8)NVrA_q{{fpTpfynZl)80p zl0SPlTdBu}X!YlCRuYzZB?=S;xTfUner((42inD#PmX@h2*?;q% z9lz*GlRVu7@_bKq(#4phl$2Q43|pV->X9(a~W6 z7ZK5Zs?>vKo0A3}lna|9=V1Vf7vKZCmoqz?0~Tz+$61xNx^u{G3NTngW#$;7+!ZB{) zu#Ag>EmC<+*)YDyGnhnck~j~ZHM}VNqZ#Dd2pIiWu`Jlo{(l*RsAnoFLKfV9Ky&v}8YdvfBti5JGYv!53>1wM}Q?gNlKp<)qQsv?0+52a~ zpqD%0QF%59L|2JYK^XX$Z)KT9KUwkZxfo89w=-Jhb$)=)Vg;Bb_OeYzIazVSdh0kNxLBoD|kr_DWQvA4XJ028LVH#0Vv<-ZwVjBD_)Jz4P; zJ$*!7hfjNd_jwe{WBNs2(Ln|on_MU$BVdmp#UuWXG}c{o;?LwM5~k1L029Mhw`z;g zI!*VU-`!gbzYK*`^k(~&^gA=x05vhbF6j(|()NmbyBT5Ab945)R*L&@KlW-nH#cR2Pu^}O>pav4Vf<4~=$HP+}E z(%vZ>i}P`buWxIQLFk>*k&KFEZ7p`~{sHO&ebKw96OB7WULy7Az}JMkEf2YbaUNV? zMUDJrFN;2(XYuG87hEJ73wFD-@~4=jfXT{qjoUr4Sc#uo#@L8qpGLWYr1y6y+}I2n z6{vMiwNW0*h-NY5Q~10(**U7EMN%Ron2hO& z3YKKVq^K#RtKmF1zL$yjPLIfS=?FRHB^Ablc#iU%)G1Bu;?YtU;hB#MU2m9jrY~sb z7ygsG9Q4MqM?3W6^J9 zbRBK=R3sm2(kz;I6n6IjKj{Z1AM;9Nj$-@su{l?k^vAtXloIN}JEanu(OKqChkz#c zqBIer!P;9}clUv<0XfZ%dK3L$b?o9uz6{0txx|J!xi{ul$)Jj#qEezW!>tE^LAju7 z(NUhD6pkTA(f9Hbkq9>IvAn^@bxO1^MFky^9oo#!Y^-1pgkd zJI|QAP@t!N0xt`vV)#X-GXKi}l7a#rDMuCj48tl{ptg=6N znV^gXn6{vp!zCJ6g?0kIpAj5=lOW)f<*?6wGs=DH=j*C2^A)xNJ%;ZF1)qV`{o1*Q zx;rJ>A^3g~Fd1`gi@De0<%#VdIm9=Jp~E(XgWDT0U@@j;r=C0(CugoO(~ z$M-0L2i6b1qx4h72v7`qm+pS zp0uX|W z$M`S$+$zkcdSs2Y5ENtkygPV2%kpg-DxeAi>uuD_J6)s|f+pB*qXiO+r)mWKCv52s zt5LlDK!}7!(y+w}h1zMli6Hc@OhSN`5OlYuDzEf9*gF29s0N({#gPr&RMhr{pk#4> z4(+!+Nn*Xp@-y^s%W5(=Wnfmxs)z5svXy>H`l}4}7WARR8=RogzGr&+*vgo-s>!yq zGuLtYRMpCMrPYTCoP%bn4ttSJKcND%>|{-RKl|Y|_56_j)Apu&)ri=$yHasYTAQCM z6qm@O+*~tj#|#@qTWMn1za-|X*XZ!NF#h)2FX1rX+DiH?JkZfmda~Q0`O(d$`Opic zM1Vx@B5Si}i}>E8Q0tfGAdKFdMF2i(5x4rj{2h{4r;sIoTt<^TO(k}oE8IWt>GAmo zhiOWED^|A(F-;^ByxMy#AHr0cuaEhp7i5`9kFDN27I^hdtqTHg>VZTa^*PshBnspF z77)Y0TCJ8fQeQ@c?N z{}6QZo4*O^a}o#vmY@AmADTvXvjE@jV9@DRx^htpCAY_F!O!Ig0^DL|$xKj8nc!w# zu8a*^_;PIoh`DWhe)Fr<7?X)r{Ace3!E?^wxO6D*F#*`IW`i5g=;9=y$Dp1Vxt?d0 z#+~69tLktB%hyUpy-{(~E}42ssEI!_=7MEWWD2C_AgUT1gjdTF$@mcDY+g!LiN+sG zgZy%Yf(vM}AV-4|rhctM(Hkq3Ljb|?ixp_WT|fo9kb+~P*v2K9NI{U` z!q&Zcy-=3hxF3%95v@e8O zD_sg|j1*--pUY7ljQK07My;8my^)sxYMt%c^rGw1^kl-W#x7D*iX$E2+-}{#(u*1{ z(2i%vz|FHF*beQe{kI{lmmg&&Z)3~S3%C_&+U+F8@CLT@mZ!V~0qImGZFP<{s!9iZ zQy^@h(F26%fYSr_GQ+dx;HqOcx>4BZi#fJH`-=jphj@E&NNhnuU_X+dez^=WK9Blp z5o)!Ge1!rTpR=~RV_pSx8`5aA+iYbOoQVf3t~p#eEzbzbR?8Z0EF1B~MlVWN9%3O< zZW4w4gT^MZSepI3p$UW4kMuLw{(anw2-w0XnU-6VEE#`5Ei?bZVMwAhlvOf6x#oxE zPHV5oc6ZTg@ckDHG54-U8|u1Q6R9c>+X6jJK8U;3DD{ckp1BqyYBtOsDO9#3T?Dqv zVw?B~XHUv6nwOOw^PW=jXON2#W2q&AdPnsm1Ve^Jy|- z|2QtpZ8{!bEDc{rxHb}G$@=l%n-N9}sPV(PxY&v$Ebt-iZ*_X-DcdEkJ-21UMe*L_ z`vlJ05=}ZobLn1e|7zs-oP*+obX2$DSI*@pbW4mJF3Ci!KpJo9Fcrw}QxPMrKzTqS ztOyz4 z0y^#7I7p03W^K}_=mg+ijU#a`FqpKcEByaAa}+*>mU45K3L^DZ>F8?%Y2v7>`d1ON zsUTl2Dn+9!jw^AgkvP=3*{|8?0(&i;6POBZ>cDvz!_%qu6DrSpvIAMne|cKUzF;FLC1 X$(CG&C>eS=!~mgGwN=WMEJObTp*RMs literal 0 HcmV?d00001 diff --git a/main.cpp b/main.cpp index 31d9c45..d5f10a2 100644 --- a/main.cpp +++ b/main.cpp @@ -25,11 +25,11 @@ int main(int argc, char *argv[]) //绑定信号与槽 QObject::connect(&websocketService,&WebsocketService::wsConnectedStatusChanged, - &w,MainWidget::onWsConnectedStatusChanged); + &w,&MainWidget::onWsConnectedStatusChanged); QObject::connect(&websocketService,&WebsocketService::newPatientMergencyInfo, - &w,MainWidget::onNewPatientMergencyInfo); + &w,&MainWidget::onNewPatientMergencyInfo); QObject::connect(&websocketService,&WebsocketService::patientMergencyStatusChanged, - &w,MainWidget::onPatientMergencyStatusChanged); + &w,&MainWidget::onPatientMergencyStatusChanged); QObject::connect(&w,&MainWidget::statusChanged,&httpService,&HttpService::updateStatus); diff --git a/mainwidget.cpp b/mainwidget.cpp index e0b2b41..08a9305 100644 --- a/mainwidget.cpp +++ b/mainwidget.cpp @@ -22,6 +22,7 @@ MainWidget::MainWidget(QWidget *parent) : info->realCountDownInSeconds--; } } + updateUi(); }); //切换病人 @@ -38,22 +39,22 @@ MainWidget::MainWidget(QWidget *parent) : ui->statusLabel->setText("Not Connected"); //显示设置 - QFont font1, font2; - font1.setPointSize(150); - font2.setPointSize(20); + font1.setPointSize(240); + font2.setPointSize(240); + font3.setPointSize(20); ui->textLabel->setFont(font1); - ui->countdownLabel->setFont(font1); - ui->statusLabel->setFont(font2); + ui->countdownLabel->setFont(font2); + ui->statusLabel->setFont(font3); ui->textLabel->setStyleSheet("QLabel {color: rgb(255,0,0);}");//设置文本红色 ui->countdownLabel->setStyleSheet("QLabel {color: rgb(255,0,0);}");//设置文本红色 ui->statusLabel->setStyleSheet("QLabel {color: rgb(85,255,0);}");//设置文本绿色 - ui->textLabel->setAlignment(Qt::AlignHCenter); - ui->countdownLabel->setAlignment(Qt::AlignHCenter); - ui->statusLabel->setAlignment(Qt::AlignRight); - ui->textLabel->setAlignment(Qt::AlignCenter); - ui->countdownLabel->setAlignment(Qt::AlignCenter); - ui->statusLabel->setAlignment(Qt::AlignCenter); +// ui->textLabel->setAlignment(Qt::AlignHCenter); +// ui->countdownLabel->setAlignment(Qt::AlignHCenter); +// ui->statusLabel->setAlignment(Qt::AlignRight); + m_curX = 0; + connect(&m_lableScrollTimer,SIGNAL(timeout()),this,SLOT(lableScrollDisplay())); + m_lableScrollTimer.start(10); } MainWidget::~MainWidget() @@ -63,11 +64,19 @@ MainWidget::~MainWidget() void MainWidget::updateUi() { + m_curX = 0;//内容超出显示区域时，更新患者信息显示从头开始滚动 + //更新statusLabel - ui->statusLabel->setText(QString("%1 | %2") - .arg(m_wsConnectedStatus == 0 ? "未连接" : "已连接") - .arg(m_patientEmergencyInfos.length()) - ); +// ui->statusLabel->setText(QString("%1 | %2") +// .arg(m_wsConnectedStatus == 0 ? "未连接" : "已连接") +// .arg(m_patientEmergencyInfos.length()) +// ); + if(m_wsConnectedStatus){ + ui->LEDLabel->setStyleSheet("border-image: url(:/image/1LED_green.png);"); + }else{ + ui->LEDLabel->setStyleSheet("border-image: url(::/image/1LED_gray.png);"); + } + ui->statusLabel->setText(QString::number(m_patientEmergencyInfos.length())); if(m_patientEmergencyInfos.length() == 0){ //不显示 @@ -89,7 +98,8 @@ void MainWidget::updateUi() int hour,min,sec,nTotalSecs; nTotalSecs = pInfo->realCountDownInSeconds; sec = nTotalSecs % 60; - min = nTotalSecs / 60 % 60; +// min = nTotalSecs / 60 % 60; + min = nTotalSecs / 60 ; //min显示大于60 hour = nTotalSecs / 3600; QString str = QString("%1:%2").arg(min,2,10,QLatin1Char('0')).arg(sec,2,10,QLatin1Char('0')); ui->countdownLabel->setText(str); @@ -111,9 +121,28 @@ void MainWidget::resizeEvent(QResizeEvent *event) QWidget::resizeEvent(event); //标题 - ui->textLabel->setGeometry(0,0,this->width(),(this->height()-20)/2); - ui->countdownLabel->setGeometry(0,(this->height()-20)/2,this->width(),(this->height()-20)/2); - ui->statusLabel->setGeometry(0,this->height()-16,this->width(),20); +// ui->textLabel->setGeometry(0,0,this->width(),(this->height()-30)/2); + ui->countdownLabel->setGeometry(0,(this->height()-30)/2,this->width(),(this->height()-30)/2); + ui->LEDLabel->setGeometry(this->width()-120,this->height()-30,20,30); + ui->statusLabel->setGeometry(this->width()-80,this->height()-30,20,30); +} + +void MainWidget::lableScrollDisplay() +{ + QFontMetrics fm(font1); + m_width = fm.width(ui->textLabel->text()); + if(this->width() > m_width){ + ui->textLabel->setGeometry((this->width()-m_width)/2, 0,m_width,(this->height()-30)/2); + } + else{ + m_curX ++; + ui->textLabel->setGeometry(20-m_curX,0,m_width,(this->height()-30)/2); +// qDebug()<<"move" < (m_width - this->width())){ + m_curX = 0; + } + } void MainWidget::onWsConnectedStatusChanged(int status) diff --git a/mainwidget.h b/mainwidget.h index e4d6280..4c7e2a2 100644 --- a/mainwidget.h +++ b/mainwidget.h @@ -28,6 +28,9 @@ private: QTimer m_countDownTimer; QTimer m_switchPatientTimer; int m_wsConnectedStatus; + QFont font1, font2, font3; + QTimer m_lableScrollTimer; + int m_width, m_curX; public slots: void updateUi(); @@ -36,9 +39,10 @@ public slots: void onPatientMergencyStatusChanged(QString firstAidId,QString time,QString status); void addPatientToList(PatientEmergencyInfo *); void deletePatientFromList(QString firstAidId); + void lableScrollDisplay(); signals: - statusChanged(QString firstAidId,QString status); + void statusChanged(QString firstAidId,QString status); }; #endif // MAINWIDGET_H diff --git a/mainwidget.ui b/mainwidget.ui index 7da9a5c..e86e9db 100644 --- a/mainwidget.ui +++ b/mainwidget.ui @@ -23,13 +23,16 @@ - textLabel + 传控科技优先做CT + + + Qt::AlignCenter - 390 + 210 160 721 61 @@ -38,14 +41,17 @@ countdownLabel + + Qt::AlignCenter + - 1010 + 950 390 - 91 - 20 + 151 + 21 @@ -56,6 +62,22 @@ statusLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 790 + 400 + 54 + 12 + + + + + diff --git a/resource.qrc b/resource.qrc index de84d0a..f85b807 100644 --- a/resource.qrc +++ b/resource.qrc @@ -2,5 +2,7 @@ image/header.png image/black_bg.jpg + image/1LED_gray.png + image/1LED_green.png diff --git a/websocketservice.cpp b/websocketservice.cpp index 772a87d..a6b9a83 100644 --- a/websocketservice.cpp +++ b/websocketservice.cpp @@ -115,10 +115,11 @@ void WebsocketService::onTextMessageReceived(const QString &message) void WebsocketService::handleWsButtonStartMsg(QJsonObject jobj) { + qDebug()<