From 3eef7f3c82e8c8d2f394b268af06b24015d511fd Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Mon, 14 Sep 2026 14:38:09 +0800 Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E8=B0=83=E6=95=B4=20PEBI=20?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=A2=84=E8=A7=88=E5=B7=A5=E5=85=B7=E6=A0=8F?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=92=8C=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bin/Res/Icon/NmColorScale.png | Bin 0 -> 415 bytes Bin/Res/Icon/NmCopyGraphic.png | Bin 0 -> 979 bytes Bin/Res/Icon/NmScaleGrid.png | Bin 0 -> 365 bytes Bin/Res/Icon/NmSetCenter.png | Bin 0 -> 1108 bytes Bin/Res/Icon/NmSideView.png | Bin 0 -> 485 bytes Bin/Res/Icon/NmTopView.png | Bin 0 -> 400 bytes Bin/Res/Icon/NmZoomIn.png | Bin 0 -> 1135 bytes Bin/Res/Icon/NmZoomOut.png | Bin 0 -> 1112 bytes Bin/Res/Icon/NmZoomReset.png | Bin 0 -> 1029 bytes .../nmRender/nmVTKViewCommandController.cpp | 19 +++++++++-------- Src/nmNum/nmSubWxs/nmWxPebiGridViewWidget.cpp | 20 +++++++++++++----- 11 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 Bin/Res/Icon/NmColorScale.png create mode 100644 Bin/Res/Icon/NmCopyGraphic.png create mode 100644 Bin/Res/Icon/NmScaleGrid.png create mode 100644 Bin/Res/Icon/NmSetCenter.png create mode 100644 Bin/Res/Icon/NmSideView.png create mode 100644 Bin/Res/Icon/NmTopView.png create mode 100644 Bin/Res/Icon/NmZoomIn.png create mode 100644 Bin/Res/Icon/NmZoomOut.png create mode 100644 Bin/Res/Icon/NmZoomReset.png diff --git a/Bin/Res/Icon/NmColorScale.png b/Bin/Res/Icon/NmColorScale.png new file mode 100644 index 0000000000000000000000000000000000000000..f8f2b5c1934211300cc53b3496b01911aa3c5345 GIT binary patch literal 415 zcmV;Q0bu@#P)K*1bvtK@tx(J~?kHg>*)wSt9>HvVE1#UkfejIv1PPIeQg%dLjlo%`**vwww$#}~wmp{Ush zK$aNpoT{&{bzRmxI_@0+aK6zDtXV#+XUuK_71c4_M`voe&7X1TIMF_aSbiY6a{#V6WV;exSgvQ>!_k`V@txUi? zKCCO+TwSpa9h{tYPWpjad|FumB#Tu^0wf6nK{xP)ADF^d03anO4M>E<8~~mJ`5}>l zL;<2hD1QMKa2EndQIzmo2`Ru34B#dNw8^wTbnS7Qk{!4X0VG{dTz*onS9yR-BX{|4 z1ynl9w+GhepbP+PQy}%T!xTZQ00XE^)V%YF@iYaZF!=fH7T+@k(D1Rl6FC3?002ov JPDHLkV1iudquc-h literal 0 HcmV?d00001 diff --git a/Bin/Res/Icon/NmCopyGraphic.png b/Bin/Res/Icon/NmCopyGraphic.png new file mode 100644 index 0000000000000000000000000000000000000000..91127911c7ba1bcf8b595b8f85bb11b87960dc5c GIT binary patch literal 979 zcmV;^11$WBP)Kmd|UPMHt7QXJ+1g-%YZ+Y0`}`2?^to)=^#1H~4 z8a-2tbFCEsSe7l@wS06J8Ph5Pt?k~Sr%${hoNQ7+vvk|NeR-&G96?12m+ps$#>b_M zlu|_0)01(lDe2b7@{ZPo$h@7_A2;R-FTc%rDiNT5_s9N&1OEErvOmUz6K0Bx3l7Ky z5kV;B;ONA!wQ9RA5rKm$V3|d&*4lFK=Rfcd*rvo4X+VJJmY(w>$->tC|aBAMu5qt`T<~XQs_E5 zH+k)i#nYc2yAqfBkn_yB>}#b`Y2$u5PoT6m?rsLexB959N1dY0oLa3`E|(RHhSU+? z3U2-I#kr}R(&hp@2GIFBf>bj zB9cMy&^erQsX{JAv)P>g@SUmt9otGH006>cM3@x-QQXRbzq`A;4Y22N&KN^%G&Zk( zdGYjwBP<)RlVENG6F@LVnurk-cFImG4Tul3f4+IWa_hS@hYtwOI78F~NI)RNASr+g zTS>)`SCKl}$U_mbXxe16$ToD60E7dWQCezzSc5ZL=P>Hw98simj&H-5R%?a4ZYTQ4+l*R6DZN3av`u2XXlkP!`HJ8uD`I#h{Ns`Gh!eWI= zlXKyMWSU_TCb6z8HMuaF5+DEx#3Y!&=fLx*fe@1YI02cdJ)#^YnDZgT6Pj`)fsjo& zJpv>%IV195c7Wzpg1_6rgbZYX9$_R6bP23)Qvu%Bv>U(am)VDJLZ$bh=K$&600000 LNkvXXu0mjf%NL#d literal 0 HcmV?d00001 diff --git a/Bin/Res/Icon/NmSetCenter.png b/Bin/Res/Icon/NmSetCenter.png new file mode 100644 index 0000000000000000000000000000000000000000..9fdc056aacbdfe8fffe2f7902ddb8c87f1f0b15e GIT binary patch literal 1108 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≦V4~w)^WSqOe_BF>2$Uj(_L9lN0Wz5^o``D; z88#G(hLb~||CkbU3C5TZf-%Bal?PP{oCpZ%bed9{E6aV^?wJ9du4HNH_xIY{!{KnD zT3M8jh(sg=U@T%RA|wz(Qv18y^F1~m*J$!Jn*1z4h9WmLotv4N!5GKGAz7YWB9#&% z!5AZqAw&Q|Oe7ngr%ILb7n{v&u7?mF4mf+ZQ53=b2M>x03!bh%!3axbG9r;+j4>ey z6X%K}{XEH~xasNX$4{1>&b2H+=3eCSc)Gi;+!z?BuCDU>0$QCePp&`+rS|uq1^luc ztWYR_e)w>9c6McDMX6Mdj*VAURUZNX0L;z)dh_PTR;$(0+$@z!(>yPVBE|>+u)O?u zeqn)SS-0EW(9p2Gy&a9lZViuQY=7Chsn@$TKK|K?!(lL-C}J2)NQhou6Vs(Q4}eq z<>lqIwYBT(>pMF;Lqj7qCez`7jNx>y-5BU+SymLqbUIyJTx>R*eLi0(6#9PhhZi%C zI5JP3JT-EAjA0lEp+q7H27`9HU8mC(6cilDJo-#F7>pw$V+_Lp01!fczu#uFaooXA z&?^o769&U4pAHokY9WLOp-3dMwY7C1=ZH0UF+3j6=K)=OyIMH~n4`OWMZ+;%?p>2#yD+R&KVJ-vT&pdw&6qn2FW;T9P(>H+s2Vnj4aHObEmW;8EjO{v{ zF*Y$>`s`Rq0DE$8_Mu%Z{}%XYa^cIVGGp}kaQ1;+*+XCCzx!o%)l&@EZ-rpy)arAi zx!ZE?jROly%NOV746(1EJ~3TbEc$+^83V>xCYVi+0lTLZHS{O+~;0JP` z+kO4{9a7;d@6Dc`m&v%Z98{-k<2h$%;{2FP?bvWnHluGn=WnUcY9~{`+0608x>dlY8 z55p*mBpQ&B9K0v<+QFfb-F>r{YDa#qCT!ThJ$rjLKKbp*R}UROai;3T9Kp$Top{_m zdGy%^TXbouTCe-Ym{6LwCV1iL{sUu!&6!LX;>Bg}+(JGkMB$E9F6HbS>fheC`JKbl z?|*)_;t_yS3a^Y3YhKJ5BJ{RIl8B(@fjeRnlA-K30Ejh!m=#O5?ol8h&vWB7AizU zV~o}s5giNsP)lQ_Q!ZR_W!D8RHyPAJrQAfy62h`=MuwpV&H)&A5=0CU5m9R$`KzvD zTTbGdga+?GY6{B5`I$*O7B?#D=()G8v)32{4DvHaWp$YV$QVP^boVfCYO|bc6B+=( z`Qn+`YVkrxd&V=)%JHvvclV)GM(h04Cvo91VRH`kQdzX$=`^>mO=tiZV^C{MCD78^ zO=GdDl|rqx(uTVt4$N{m2k?|aGRCY;Xi%;VqML3FYO+)@l|nVyno~+DrIeB(IT6Hz zAPj=Y50p|!h-(uXtN>BBY~7Z*Wh-zlfW?|yf_e=&$0&?=I?QD0_Y)j+7%HU{F}iL5 z0E|I!6AUg-N5k?A;fc;HDT^AstC=3`QCl&($M)VhWx#t#R zfLeoyGtP{ibmB<@kTP9_;_sq|9#+3BsetOrientation(Qt::Vertical); m_pToolBar->setMovable(false); m_pToolBar->setFloatable(false); - m_pToolBar->setIconSize(QSize(20, 20)); + m_pToolBar->setIconSize(QSize(24, 24)); m_pToolBar->setToolButtonStyle(Qt::ToolButtonIconOnly); m_pToolBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); @@ -101,12 +101,12 @@ void nmWxPebiGridViewWidget::createUi() m_pGridLinesAction->setToolTip(tr("Show Grid Lines")); m_pGridLinesAction->setCheckable(true); m_pScalarBarAction = new QAction( - QIcon(gridViewIconPath("Eyes.png")), + QIcon(gridViewIconPath("NmColorScale.png")), tr("Show Scalar Bar"), this); m_pScalarBarAction->setToolTip(tr("Show Scalar Bar")); m_pScalarBarAction->setCheckable(true); m_pBoundsGridAction = new QAction( - QIcon(gridViewIconPath("CalGrid.png")), + QIcon(gridViewIconPath("NmScaleGrid.png")), tr("Scale Grid"), this); m_pBoundsGridAction->setToolTip(tr("Scale Grid")); m_pBoundsGridAction->setCheckable(true); @@ -123,24 +123,34 @@ void nmWxPebiGridViewWidget::createUi() nmVTKViewCommandController::ViewCommand_Top); QAction* pCopyAction = pCommandController->getAction( nmVTKViewCommandController::ViewCommand_CopyImage); + bool bHasPreviousGroup = false; if(pZoomOutAction != nullptr) { m_pToolBar->addAction(pZoomOutAction); + bHasPreviousGroup = true; } if(pFitAction != nullptr) { m_pToolBar->addAction(pFitAction); + bHasPreviousGroup = true; } if(pZoomInAction != nullptr) { m_pToolBar->addAction(pZoomInAction); + bHasPreviousGroup = true; } if(pTopAction != nullptr) { + if(bHasPreviousGroup) { + m_pToolBar->addSeparator(); + } m_pToolBar->addAction(pTopAction); + bHasPreviousGroup = true; + } + if(bHasPreviousGroup) { + m_pToolBar->addSeparator(); } - m_pToolBar->addSeparator(); m_pToolBar->addAction(m_pGridLinesAction); m_pToolBar->addAction(m_pScalarBarAction); m_pToolBar->addAction(m_pBoundsGridAction); - m_pToolBar->addSeparator(); if(pCopyAction != nullptr) { + m_pToolBar->addSeparator(); m_pToolBar->addAction(pCopyAction); } } else {