From 9705fec0b7b3b156880d3a7459f0aa5f49cf4530 Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Fri, 18 Sep 2026 16:18:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(nmSubWxs):=20=E6=9B=B4=E6=96=B0=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E8=A7=86=E5=9B=BE=E5=9B=9E=E6=94=BE=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=A0=8F=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 替换帧导航、播放停止和动画设置图标 - 色带设置按钮改用固定图标 - 移除控制栏色带动态图标刷新逻辑 --- Bin/Res/Icon/NmAnimationSettings.png | Bin 0 -> 793 bytes Bin/Res/Icon/NmColorScaleSettings.png | Bin 0 -> 204 bytes Bin/Res/Icon/NmFirstStep.png | Bin 0 -> 463 bytes Bin/Res/Icon/NmLastStep.png | Bin 0 -> 486 bytes Bin/Res/Icon/NmNextStep.png | Bin 0 -> 366 bytes Bin/Res/Icon/NmPreviousStep.png | Bin 0 -> 384 bytes Bin/Res/Icon/NmStartAnimation.png | Bin 0 -> 294 bytes Bin/Res/Icon/NmStopAnimation.png | Bin 0 -> 160 bytes .../nmNum/nmSubWxs/nmWxPebiResultControlBar.h | 6 +-- .../nmSubWxs/nmWxPebiResultControlBar.cpp | 47 ++++++------------ 10 files changed, 18 insertions(+), 35 deletions(-) create mode 100644 Bin/Res/Icon/NmAnimationSettings.png create mode 100644 Bin/Res/Icon/NmColorScaleSettings.png create mode 100644 Bin/Res/Icon/NmFirstStep.png create mode 100644 Bin/Res/Icon/NmLastStep.png create mode 100644 Bin/Res/Icon/NmNextStep.png create mode 100644 Bin/Res/Icon/NmPreviousStep.png create mode 100644 Bin/Res/Icon/NmStartAnimation.png create mode 100644 Bin/Res/Icon/NmStopAnimation.png diff --git a/Bin/Res/Icon/NmAnimationSettings.png b/Bin/Res/Icon/NmAnimationSettings.png new file mode 100644 index 0000000000000000000000000000000000000000..17a182ec21b115e6d14b70be549108c856c327c3 GIT binary patch literal 793 zcmV+!1LpjRP)Ml3h$v0Th7m9}wOv_X5Hdq*d0ci6H(^`CGO{iffje zX-{r$ZPI!wHrJM0)^oG1haOvNX>6I(O_whUL(yoGQ>-Q;=#U@fN4&_-86>R4mro((-+IxxfEO zC>(zO?rk!DxUjg$=M$ZsT^NP|008BM@rm)vS8Db8M^4vfV?zUni%BFhwfd5OcUPzD z!!X=rG987^l5aos;U|Up^@Pa zGO3uNs8~Fe$>g@(E;gG54Llu~nwr{lI@v51DHhJpTY7qWx+v?iaI24>`dwDv9Zr9E2|cZr9xHF*jSfJrBgIrUUoqsEE*Xe2A>VSD8x`PDXywk z7ohk_sfc0HUaybK<%&c_i6p%jiiU$;yWPIA;Uq~3=-%=;9P2ilO(+y!y?z6R0K5?8 zaygkyHjzw)_bCVh-@G0wS16`NsNr|LbQlnP?yR=v=o-@z>`nhVi|0q3Ms?$C6d3Rn7y@X+;sj12Ba;lVyd?k4F zttO)}7!GyZ>3BXksBLRqv#$|+fkvY-d>m0Il==3@gd<$8&B@70HizAHw;RXt|FXXU XFSj-IW)3Mn00000NkvXXu0mjfKOkr? literal 0 HcmV?d00001 diff --git a/Bin/Res/Icon/NmColorScaleSettings.png b/Bin/Res/Icon/NmColorScaleSettings.png new file mode 100644 index 0000000000000000000000000000000000000000..b55477010f29e563460ddf8e7273380f513361e1 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9F5M?jcysy3fAP_WL^ z#W6%&bVGbaNsA~YSkU41$z|& zn~wxuGU+I=SM+U`I-h;Xx2MVP3SNZU!dtNPQap8S;{?5m228I`|QqLcXgvtP2!rSeEsG<11W%sB-P|<@NC=%LC6vxzx`@ka~010{QY;^ znkxt!WEIsI7#Lo>cmd%ax%Mh!+Nr}=Uw-)Tfq{YH)a|z!(@q|~`s%}n4=iXle)#%p z+VvG=`2OvynG)Z`WJ7h~e{Wtr`|@P)^k~>JlKpe*ZX>D>zV=lGDDpG70K@f3JaTJ`2i=yD} zBz}=003~Bg{D`J_s_}SlIomGR#X9r>xcT@g(lZyMGcw)THd-l zO=l+u+c}Q=4FG_T7aD@$tXWi45de_rM@TwI>sPBOe?6`O003~DAWG#n5Nfn6Ga#di zDb=J(fHA9R0AnSa&uBjLDWBD<03YvGF8dVl7ts%)|JOB&&jERw0SVfAWAoSC* z3k-BNjdo*M-9Rh`|iHwt;6XI2)*;{X5v07*qoM6N<$g7Lb~xBvhE literal 0 HcmV?d00001 diff --git a/Bin/Res/Icon/NmNextStep.png b/Bin/Res/Icon/NmNextStep.png new file mode 100644 index 0000000000000000000000000000000000000000..c85fd19ad7606097e30405242da4625087768b00 GIT binary patch literal 366 zcmV-!0g?WRP)SeEsG<11W%sB-IQI3@pf;u60*)yw$nbQ3O33_dyuj z>z&YT*njzD=Jb=-AALkKRaQ}rfq~)0ix*g&^oLcTbm6(B`|thx_n#;~aP#tuODn8D z|E_ewnb#kG64t=Lz`)GHDkLoa^fPPr%#%m1zU1WMMwVs4)WE>Nz`)4JCn)mc8)x6P zhdjIj1Z+UkhC~w3@c;j(_iw(xf01Ov|K-yM0vi7Q`Tg$gOG&ODjUh^A%7Wj&eZ}X8 zub)4DeD^BAM9fQHh=ZMtUqAp&0lEg}U+*jZ6qLm|d3bnucz7`FN73M@D;{dX&%?>a z&o98n#s(LEeE$}l&4`v-KYaMW&(F`uh!QlAM8UwoAR!@vu7Mx`097bn4x?b!`~Uy| M07*qoM6N<$f+zy4Q2+n{ literal 0 HcmV?d00001 diff --git a/Bin/Res/Icon/NmPreviousStep.png b/Bin/Res/Icon/NmPreviousStep.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb836ea7219ff8cf104a639fa885168d971d414 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9F5M?jcysy3fA0|TRx zr;B5V#>C{Bzt3!$H5)oruJZ8k=oCy#e{9E*T)kI#Q&+zIf1i6rn{6VbyLmTtWdWu2 zKmYp|F(^k!N=isb{QIB&gI`_pL)MQ^FP$gx{=fcR-)>Ls=l}oh51G~c z|8~`7Vtvx4g%;2Iudk2$_wVa(c}8_Z10e9|{#2?uV@GzeZB@zt!|nYora-|Bn>MNJ z%rtGy{`dPI-}1KO-}4t{8V60DF()Zyr51yDqKn_!4=##|ij8aD{{R19-o8#mK)~U; c0}lhk=ZW>~W!L9Q0E3jl)78&qol`;+0M)sp!TySGmcYU_Ix2wBhnapW!k?C_W) zsiM2s`26$)4OeRG|4a3;u6%LI`;e3b2uS{Hb-DTDh}+=KlWv&Q8wVY$nY=fBdkpu$UmaAp6J9kE~(M8?!fD6yi1(JCJ1{W3XuHHGX-! l1XGFSlUZ0;3N%|87z!_i#T?@O`xod(22WQ%mvv4FO#p(Cc6?Z?083tl #include @@ -131,14 +130,11 @@ void nmWxPebiResultControlBar::onColorSettingsClicked() m_pPlaybackController->pause(); nmWxPebiResultColorScaleSettingsDlg oDialog( m_pSceneController, this); - connect(&oDialog, SIGNAL(displaySettingsApplied()), - this, SLOT(refreshColorPreview())); connect(&oDialog, SIGNAL(displaySettingsApplied()), this, SIGNAL(operationSucceeded())); connect(&oDialog, SIGNAL(operationFailed(QString)), this, SLOT(forwardOperationFailure(QString))); oDialog.exec(); - refreshColorPreview(); } void nmWxPebiResultControlBar::onFirstFrameClicked() @@ -207,7 +203,6 @@ void nmWxPebiResultControlBar::refreshFromController() m_listDisplayedPropertyIds.clear(); m_pPropertyCombo->setEnabled(false); m_pColorSettingsButton->setEnabled(false); - m_pColorSettingsButton->setIcon(QIcon()); m_pFirstButton->setEnabled(false); m_pPreviousButton->setEnabled(false); m_pNextButton->setEnabled(false); @@ -215,7 +210,7 @@ void nmWxPebiResultControlBar::refreshFromController() m_pPlayPauseButton->setEnabled(false); m_pSettingsButton->setEnabled(false); m_pPlayPauseButton->setIcon(QIcon(resultControlIconPath( - QString::fromLatin1("Continue.png")))); + QString::fromLatin1("NmStartAnimation.png")))); m_pPlayPauseButton->setToolTip(tr("Play")); return; } @@ -252,7 +247,6 @@ void nmWxPebiResultControlBar::refreshFromController() m_pPropertyCombo->blockSignals(bPropertyBlocked); m_pPropertyCombo->setEnabled(true); m_pColorSettingsButton->setEnabled(true); - refreshColorPreview(); const bool bTimeDependent = m_pPlaybackController->isPropertyTimeDependent(sPropertyId); @@ -294,8 +288,8 @@ void nmWxPebiResultControlBar::refreshFromController() const bool bPlaying = m_pPlaybackController->isPlaying(); m_pPlayPauseButton->setIcon(QIcon(resultControlIconPath( - bPlaying ? QString::fromLatin1("Pause.png") - : QString::fromLatin1("Continue.png")))); + bPlaying ? QString::fromLatin1("NmStopAnimation.png") + : QString::fromLatin1("NmStartAnimation.png")))); m_pPlayPauseButton->setToolTip( bPlaying ? tr("Pause") : tr("Play")); } @@ -306,19 +300,6 @@ void nmWxPebiResultControlBar::forwardOperationFailure( emit operationFailed(sError); } -void nmWxPebiResultControlBar::refreshColorPreview() -{ - nmPebiResultDisplaySettings oSettings; - if(m_pSceneController == nullptr || - !m_pSceneController->getCurrentDisplaySettings(oSettings)) { - m_pColorSettingsButton->setIcon(QIcon()); - return; - } - m_pColorSettingsButton->setIcon(QIcon( - nmVTKColorMapCatalog::createPreviewPixmap( - oSettings.m_sColorMapId, QSize(44, 14)))); -} - void nmWxPebiResultControlBar::createUi() { QHBoxLayout* pLayout = new QHBoxLayout(this); @@ -333,14 +314,15 @@ void nmWxPebiResultControlBar::createUi() m_pPropertyCombo->setToolTip(tr("Display property")); m_pColorSettingsButton = createControlButton( - this, QString(), tr("Color settings")); - m_pColorSettingsButton->setFixedSize(52, 24); - m_pColorSettingsButton->setIconSize(QSize(44, 14)); + this, QString::fromLatin1("NmColorScaleSettings.png"), + tr("Color settings")); m_pFirstButton = createControlButton( - this, QString::fromLatin1("First.png"), tr("First frame")); + this, QString::fromLatin1("NmFirstStep.png"), + tr("First frame")); m_pPreviousButton = createControlButton( - this, QString::fromLatin1("Prev.png"), tr("Previous frame")); + this, QString::fromLatin1("NmPreviousStep.png"), + tr("Previous frame")); m_pTimeCombo = new QComboBox(this); m_pTimeCombo->setMinimumWidth(150); m_pTimeCombo->setFixedHeight(24); @@ -348,13 +330,16 @@ void nmWxPebiResultControlBar::createUi() QSizePolicy::Expanding, QSizePolicy::Fixed); m_pTimeCombo->setToolTip(tr("Result time")); m_pNextButton = createControlButton( - this, QString::fromLatin1("Next.png"), tr("Next frame")); + this, QString::fromLatin1("NmNextStep.png"), + tr("Next frame")); m_pLastButton = createControlButton( - this, QString::fromLatin1("Last.png"), tr("Last frame")); + this, QString::fromLatin1("NmLastStep.png"), + tr("Last frame")); m_pPlayPauseButton = createControlButton( - this, QString::fromLatin1("Continue.png"), tr("Play")); + this, QString::fromLatin1("NmStartAnimation.png"), + tr("Play")); m_pSettingsButton = createControlButton( - this, QString::fromLatin1("SysTools.png"), + this, QString::fromLatin1("NmAnimationSettings.png"), tr("Animation settings")); pLayout->addWidget(m_pPropertyCombo);