From b444c0701dccc37182d4f0ec805d712837105a79 Mon Sep 17 00:00:00 2001 From: RCi <15089880081@163.com> Date: Tue, 28 May 2024 10:41:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=A7=E5=93=81=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HanddleAI/HandleAiUi-new/CMakeLists.txt | 2 +- HanddleAI/HandleAiUi-new/arrow.png | Bin 2300 -> 0 bytes HanddleAI/HandleAiUi-new/main.cpp | 34 ---------- .../uiModule/uiModule_summaryDataManager.h | 4 ++ .../uiModule/uiModule_switchProduct.h | 60 ++++++++++++++++++ lib/Hd_3DCameraLMI_module_PointLazer.exp | Bin 772 -> 796 bytes lib/Hd_3DCameraLMI_module_PointLazer.lib | Bin 2276 -> 2276 bytes lib/Hd_DalsaCamera_module.exp | Bin 751 -> 775 bytes lib/Hd_DalsaCamera_module.lib | Bin 2120 -> 2120 bytes lib/Hd_FinsTcp_module.exp | Bin 743 -> 767 bytes lib/Hd_FinsTcp_module.lib | Bin 2064 -> 2064 bytes lib/Hd_MvCamera_module_GENTL.exp | Bin 756 -> 780 bytes lib/Hd_MvCamera_module_GENTL.lib | Bin 2164 -> 2164 bytes lib/Hd_MvCamera_module_GIGE.exp | Bin 755 -> 779 bytes lib/Hd_MvCamera_module_GIGE.lib | Bin 2148 -> 2148 bytes lib/Hd_ResultsSummary_module.exp | Bin 756 -> 780 bytes lib/Hd_ResultsSummary_module.lib | Bin 2164 -> 2164 bytes lib/Hd_SocketModule_ModbusTcp.exp | Bin 1501 -> 1525 bytes lib/Hd_SocketModule_ModbusTcp.lib | Bin 3446 -> 3446 bytes 19 files changed, 65 insertions(+), 35 deletions(-) delete mode 100644 HanddleAI/HandleAiUi-new/arrow.png create mode 100644 HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h diff --git a/HanddleAI/HandleAiUi-new/CMakeLists.txt b/HanddleAI/HandleAiUi-new/CMakeLists.txt index af0370f7..d1ffb1f6 100644 --- a/HanddleAI/HandleAiUi-new/CMakeLists.txt +++ b/HanddleAI/HandleAiUi-new/CMakeLists.txt @@ -108,7 +108,7 @@ else() ${HANDLEAI_SRC_FILES} ${ALGO_HEAD_FILES} ${ALGO_SRC_FILES} - ${UI_FILES} "ff.rc" "icon.qrc" ) + ${UI_FILES} "ff.rc" "icon.qrc" "uiModule/uiModule_switchProduct.h") else() add_executable( ${CURRENT_FOLDER} WIN32 ${HEAD_FILES} diff --git a/HanddleAI/HandleAiUi-new/arrow.png b/HanddleAI/HandleAiUi-new/arrow.png deleted file mode 100644 index e70f08049901dd73da5867789b595703797eb182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2300 zcmeHJ`#)6c9$vF%1~bQHOlgNj%eGvieW=h7T2nG>a-|9!yz1=d_ zj7qy)+M9Aj+GvyQ(u7=gx#kwOW~3u+LI=4!>--7lxAVjK;r%}E`+eW{^L(G@`~L8z z96KsdW9zU108kTRPVN-8{%5EtQSsra(p(B?;qHQiKxqdw2>>dULMQ&oDDUat)h=xj zaK2Z(GgcreZd{(QRVX(mGs!zhh?k3Y#Zb=V@~Z!ehZfUgs^m)j#}@N8>3YapXAqgS zjF0p?L?MqxSn46T6hOCYZ~>LQC|J*UlCX5i*MnpL+=A|lud)C%rn<}w0|8b~K;@(h z0N0P4(n4qiBhYGi-U#6Mgp{zU`w3RJgIBmfvc*16rVxPnI_);GETAb%w>SX-NI2d9 zPCWw{dy($J=K>h%T;b{i0(0-0AHXaC!SY|ycvbN5Mr~gIMsU^D%HY+p z8goyHY?g6RJl#3-`RV5$HX?^BLj`?$v}NDn%FaheXCrcQUXp7LF*RFJFpxFnGj$*b zisKE0#>d3o^h4c4A{q*Vho?eAkh`}D#n08FJD6ws0)5sFd{nMek|z54gz~2RlClbm zk1So~24oYlWmVN3b+7G*zt{{`9&?c7(2?r7@R$t75&xkNHD`no@TQihsciK_06^u zw<>$TS=#wsB4T7DF3LfJp{gV=rGok8mTqUhd(C?G%&z!typYe|p!OCs_aFZW*|{_9 zFM(h?K80?Sn;72na6F|Ub$)hf=rrgWHt13p!7Q4S4thOB8?36ZyVmN(%Zss`8pCKK z^M$XBbK4V|GIcKK8+FlJrZxLF(i`+6Rk%v^&Y*+;Ld3%0j`P!pt786K{ze%Kx`vH} z&o|7yh%Q?+v0q%y@N^sGb0dGgFjc!>yzWsl@Vu}#w7%KDTH1^4?y&t{&I226ARS%p z<*&~1^l7xVUHKJpIfufssp(2%VSS^5S4t30v7-KmZlHk8Axrj)9_-J2CSfy>2lja%}Ms*&g7DvxrAM)SxQ7X+m}l9Y-#Gsrrg zKsw0iNIO085Q>iJ!WD-=&a9lfHqV|5aU4w{mYy8@OcI(z0Ap;F6awoN5$r~?TC1w`E7^t z{h*N@c_u}YpZ;lkv$1=XU0$Vy+@^cGduTw5jY@B_woZBtud+d|Th`-&U1`3(S`1`} zo_FH+9-cE@krLfu`a!S8UY!ZU-MVYnQxD3I(Lm{SNw2N3s=5)Cq~V@IQz!^Ue@aIn z^}|%giOWqgz26R z_%BrV3#|2^K-+a*5T(I3)RDI*Y*0~5J(W2Q(HQUR0mIARZkH*V%Jy)`T2&^GjhCn+ zc3gbxSTcZ^aq*KfO(tfA$p0ZSI!gNd^I$|yC3`FiqOV9&cwkwLo1HsqygP5j2&!?+jsWKX+OBaM=0x#zwmds;!B!9 z8It5B)}~iYG(PO<^iRy+qE4(q^QxGvTT>a0Q#-BA;@Q0gTEpb2m~1zojOr(qiWpEL z4vgDJF%kLpWI8;c$Z!J1e{5JCNSI0dT3`>dc%`d7?^K9_=ObHE>h9$)L>FHiIQPa; z+W#plACTsHS|F2J%NY#8`3OL$`XO$Rjmae4;e?;)7l4cVE$YHQ#JgT&Kw@utlje{J zlPRY5qS?<}DPpFB62_0(0@DQNuF~AM-?gM1djAz_CNfQCKsQ#{uCiiy0j!jzHcYcvwMoFvb)*`n1rHeTwL|N7OEurh=O8%EZBNizLz9?&t?F7 zEY}#6Du5l!JsP-J^$45Uuj1J!^~;Po-@-EA+PhurnE_loadingWidget.retryBtn, &QPushButton::clicked, back, &backEndManager::initialization); } -//exmple 860 168/144 1 -QByteArray createReadPlcQByteArray(int pos, int areaCode, int lenth) -{ - int pos1 = std::max(0, pos - 255); - int pos2 = pos - pos1; - QString str1 = QString("%1").arg(pos1, 2, 16, QLatin1Char('0')).toUpper(); - QString str2 = QString("%1").arg(pos2, 2, 16, QLatin1Char('0')).toUpper(); - QString str3 = QString("%1").arg(lenth, 2, 16, QLatin1Char('0')).toUpper(); - QString str = QString("50 00 00 FF FF 03 00 0C 00 0A 00 01 04 00 00 %1 %2 00 %3 %4 00") - .arg(str1) - .arg(str2) - .arg(QString::number(areaCode, 16).toUpper()) - .arg(str3); - return QByteArray::fromHex(str.toStdString().c_str()); -} -//exmple 862 168/144 1 1 -QByteArray createwritePlcQByteArray(int pos, int areaCode, int lenth, int value) -{ - int pos1 = std::max(0, pos - 255); - int pos2 = pos - pos1; - - QString str1 = QString("%1").arg(pos1, 2, 16, QLatin1Char('0')).toUpper(); - QString str2 = QString("%1").arg(pos2, 2, 16, QLatin1Char('0')).toUpper(); - QString str3 = QString("%1").arg(lenth, 2, 16, QLatin1Char('0')).toUpper(); - QString str4 = QString("%1").arg(value, 2, 16, QLatin1Char('0')).toUpper(); - QString str = QString("50 00 00 FF FF 03 00 0E 00 0A 00 01 14 00 00 %1 %2 00 %3 00 %4 00 %5 00") - .arg(str1) - .arg(str2) - .arg(QString::number(areaCode, 16).toUpper()) - .arg(str3) - .arg(str4); - return QByteArray::fromHex(str.toStdString().c_str()); -} int main(int argc, char* argv[]) { - QByteArray r = createReadPlcQByteArray(102, 168, 1); QApplication a(argc, argv); LogMsg::Create(LogMsg::LogMsgType::DebugMsg); //检测是否已运行 diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h index 381b0975..70716b91 100644 --- a/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h +++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h @@ -5,6 +5,8 @@ #include #include #include +#include + class summaryDataManager { public: @@ -146,6 +148,8 @@ public: progressBar3->setProgress(0.8); layout->addWidget(progressBar3); + switchProductWidget* _switchProductWidget = new switchProductWidget(); + layout->addWidget(_switchProductWidget); LogWindow* log = new LogWindow(); layout->addWidget(log); } diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h new file mode 100644 index 00000000..a50347b3 --- /dev/null +++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h @@ -0,0 +1,60 @@ +#include +#include +#include +#include +#include +class switchProductWidget : public QWidget +{ +public: + int currentProductIndex = 0; + QHBoxLayout* layout = new QHBoxLayout(this); + fancyButtonText* switchBtn = new fancyButtonText(100, 60, "޸", "޸ĵǰ"); + QComboBox* productSelect = new QComboBox(this); + QLabel* currentProduct = new QLabel(this); + switchProductWidget() + { + this->setLayout(layout); + + productSelect->addItem("Ʒ1"); + productSelect->addItem("Ʒ2"); + + layout->addWidget(productSelect); + productSelect->hide(); + + currentProduct->setText("Ʒ1"); + layout->addWidget(currentProduct); + layout->addWidget(switchBtn); + + connect(switchBtn, &QPushButton::clicked, this, &switchProductWidget::startSwitch); + connect(productSelect, &QComboBox::currentTextChanged, this, &switchProductWidget::currentProductSwitch); + } +private: + int siwtchBtnState = 0; +private slots: + void startSwitch() + { + if(siwtchBtnState == 0) + { + currentProduct->hide(); + productSelect->show(); + switchBtn->setText("ȡ"); + siwtchBtnState = 1; + return; + } + else if (siwtchBtnState == 1) + { + currentProduct->show(); + productSelect->hide(); + switchBtn->setText("޸"); + siwtchBtnState = 0; + return; + } + + } + void currentProductSwitch(QString input) + { + int index = productSelect->currentIndex(); + } +}; + +#pragma once \ No newline at end of file diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp index c128f721899e1a2fd5f5ffe10a0335da718ee8af..88c617493ab7801f61da9e06f2fcfdfbffe2ba20 100644 GIT binary patch delta 151 zcmZo+o5RML(#FK_9|#;Kaym20O!U3aE5OLWV9UTL$N&T`lPwv&lr8ifTgIrW>|zxYR%~QoWE2zT921hCpHm#;8w_L` an&=r@=ouRu8XHVzV{&53YMkuFbO`_%VI!>o diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib index b506c2adaff32453f920896da4a99bad9470fc31..36c75b149f315b6d9f39a25471404d60a91a35ae 100644 GIT binary patch delta 118 zcmaDN_(X8S0VbAS@rnN@A7MJqqQM~0GP$3*m6ylW|Qx-^}tjrLsf2`#qPxj05HBKZU6uP delta 118 zcmaDN_(X8S0VWpXY46@lKEiaIMU5e=adJO%F%yuQ#V)m3j>UkH^Ptn_hnE-_7?>uX wWRjj-#99wirapNBI|o$hWCyl5&b6m&4}62FG@E>vtp}!38LD#gEOswO00)UE^Z)<= diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp index d51dd3479f00019389da4252121bf314da3584cb..db9cc92828a25fac185a8aa39109e1edcd61f260 100644 GIT binary patch delta 152 zcmaFQ+RnzA(#FK_9|*K3ayl~!GEVfn!pq9Yz+l9{D98W=E|c{c?Ugkc1X>svd^3}a z@{9A+N)$ALG!=Y2{k$2P8Egd^lFL(o>LxO(T02|C1O)lJ2RYUm#`tQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~fc*8J(B}S|-afT>=1wrYhwC delta 128 zcmZo?d(X<5(#FK_9|(jeaym2pWSHo8h4(E31A`F*qacuCaGR{pXs@iskk!b*;G3CT zlwX{mR-&L0q^aQJ>F3Rm&0s6YkX)VuR5y`PRoTTVCal=Vz{n^j%sD0`KR>59#y1$q bG&IpOw$L*+HZ(Sv{E^X#DXVd^DbpnYn-wK) diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib index c271a24edcc0cf6762f83aa447cf44b73e509d54..cc2d36e5dd6097c8d1dffea4f0e34dc019fb0ad6 100644 GIT binary patch delta 109 zcmX>ha6({12NTODh23{1_b}~Y(O?j0ne4-y&IF|7*`+q0XO?DUVSi@ub@DrwDKJ^} s$!l3TpeiO`WQ}DF@!xsr_2l;~@{`vvNl(sYYlNv(hN|2w&#uV`01D?LO#lD@ delta 109 zcmX>ha6({12NR3#l2yki_b}~YQDewzob1D#&IF|7*`+q0XO?DU5oOG{G5HQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~fcb8J(B}S|*D!T>=2J`70a% delta 128 zcmey*`ka+BrHzT59#y1$q bG&IpOw$L*+HZ(Sv{F2d$DXVd^F4H9d!@eb@ diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib index e7784b3ea75952388bfd4c57a0b8fb3be8e54022..a50e177e10f90e3993f56c5a13e462416b8c93d4 100644 GIT binary patch delta 113 zcmbOrFhO8L2@@y(r?ji`j0_AMllj@qCU0h{Wzk>|Xqg}QqQyqQ^; wk>!eB#hJ;cSSG+!=tE@7S(vllUz^OuwgV=i%;k`rpIe}pnF7_$%g)RQ0BqkOCjbBd delta 113 zcmbOrFhO8L2@@xiS>+3PMg|6s$^2|)lQ%QfvZyg+HBOFWRi7NqY{LX(_OnWD-pnk_ w$nsyM=EdYwEE8ZV^dYk4EOPCyj!oub+X0hM=5k2R&n?i)Oo3|WWoKpt0HB~E>;M1& diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp index f0a89b553a1d128975c713a0fcafda275f8da276..607e07c80afe25abf66a447453261bb356cd4e94 100644 GIT binary patch delta 152 zcmeyu+QY_~(#FK_9|#O4aym1KFi!Nl#>>ITz+lS2D98W=E|U!zos=~g1X>svd^3}a z@{9A+N)$ALG!=Y2{k$2P8Egd^lFL(o>ZUQOT02|C1O)lJ2RYUm#`tQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~ff67@e2|S|%$oT>=1?v?~(; delta 128 zcmeBS`@+hZ(#FK_9|$BSaym2pVVLN5jrRis1A{38qacuCaGPw%=%lR1kk!b*;G3CT zlwX{mR-&L0q^aQJ>F3Rm&0s6YkX)VuR5y)LRoTTVCal=Vz{n^j%sD0`KR>59#y1$q bG&IpOw$L*+HZ(Sv{Eg9xDXVd^71JdEslz3l diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib index 4010f0a3da11c6819056f7133313cf8a23370e79..a65c613a9788aa36e3530d6a5ccb1cad49b8c1da 100644 GIT binary patch delta 118 zcmew&@I_$53?`PsF#ive=P>PO(O?j0nH>vgz+l3_D98W=E|U!z9hEg01X>svd^3}a z@{9A+N)$ALG!=Y2{k$2P8Egd^lFL(o>ZUTPT02|C1O)lJ2RYUm#`tQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~fdm8J(B}S|%$pT>=1;vMUJy delta 128 zcmeBX`^?Ij(#FK_9|*)Jaym2pW|-)AjrTnR1A_?zqacuCaGPw%=%}p5kk!b*;G3CT zlwX{mR-&L0q^aQJ>F3Rm&0s6YkX)VuR5z7TRoTTVCal=Vz{n^j%sD0`KR>59#y1$q bG&IpOw$L*+HZ(Sv{FTv(DXVd^CDSDUrhz4r diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib index 110ae8d714ae9a153c870b6ea7d31787466ae1f1..b1396b9be8cfc2bad5039077ec72d4077da69fd6 100644 GIT binary patch delta 108 zcmaDN@I+w4Bqo*{N6bD?p2oC~MT0@0W%4Xm^~v?jPE0`NX;!JtcbVlGnU|fYoBW?; sI!u8+M6#TfyL!>nx04xJl@!pp2oC~MU5e=aq=uy^~v?jPE0`NX;!JtcbVlGnV>ITz+lS2D98W=E|U!zos=~g1X>svd^3}a z@{9A+N)$ALG!=Y2{k$2P8Egd^lFL(o>ZUQOT02|C1O)lJ2RYUm#`tQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~ff67@e2|S|%$oT>=1?v?~(; delta 128 zcmeBS`@+hZ(#FK_9|$BSaym2pVVLN5jrRis1A{38qacuCaGPw%=%lR1kk!b*;G3CT zlwX{mR-&L0q^aQJ>F3Rm&0s6YkX)VuR5y)LRoTTVCal=Vz{n^j%sD0`KR>59#y1$q bG&IpOw$L*+HZ(Sv{Eg9xDXVd^71JdEslz3l diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib index 8baafc1c7adb77e35051dfe8ea37dc3b629b4297..a61fbd40216d4091ba157f7b97afab308e79a4fe 100644 GIT binary patch delta 118 zcmew&@I_$53?`PJ|NEa$p2M`CMT0@0WpX@oHj_Zh<}=JzjGU7uUOIM)fq{W(@N^g#37iR$WFG delta 118 zcmew&@I_$53?>$>dz1c6p2M`CMU5e=adJF!Hd9vP<}=JzjGP~AlKz}xU|?XHypTzH zvKDJOOo{sBGprmyWs}b^OHKa38pru=hQq~oP?ctrd)ZoGDwPo`r8md2i!%ZM19K>= diff --git a/lib/Hd_SocketModule_ModbusTcp.exp b/lib/Hd_SocketModule_ModbusTcp.exp index 25890329510762a3f51d55c44ebc1ed66568465a..4e86b6bba1aceda05b67e13eea816aa3caad4af2 100644 GIT binary patch delta 153 zcmcc1{gs59#y1$qG&C_Ws58_vHny1jndupmK+ERa%uGxGK8r4y delta 129 zcmey$eV3avrHzTQM&7B63=C!rjDie6;5ONn$yr&AA*+#r!8bFx zD8D#Atwcd1NK?Vb)6bhBo55C)A-OySsBSfrsetu4IjBhZI cX=tKnY@ugtY-nsSnVb0;Q&!{V&&*6r04MS$B>(^b diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib index b3ff8f19c2b7f22a232105edac9723e1a30fca2a..5ec47732196dc7452962b23c04a9ae6b8cb23ce6 100644 GIT binary patch delta 108 zcmew+^-XHSI~LBiA5)I%Gcqu6Oy0<0Hd&Xol|_R=pk)$=`sBN;E=&R~lMOkfHrui( wGqS!kFaLLX@>&l0$t~;^P*wU673D03ub!ToyoTcdSbTB;r#4LMcFz6G0MnZzxBvhE delta 108 zcmew+^-XHSI~LA!vnzk