From 727e4b7563bd2ef9a17d80c670f4fe015751fc5b Mon Sep 17 00:00:00 2001 From: Krad Date: Mon, 22 Aug 2022 09:25:44 +0800 Subject: [PATCH] Add volume rendering button to defaultToolBar. --- src/Combinear.css | 6 ++++++ src/Icon/VR.png | Bin 0 -> 1052 bytes src/QDicomViewer.qrc | 1 + src/src/UI/Widget/ToolBar/DefaultToolBar.cpp | 9 ++++++++- src/src/UI/Widget/ToolBar/DefaultToolBar.h | 5 ++++- 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 src/Icon/VR.png diff --git a/src/Combinear.css b/src/Combinear.css index 9252859..d8a146a 100644 --- a/src/Combinear.css +++ b/src/Combinear.css @@ -97,6 +97,7 @@ QToolButton#flip{qproperty-icon:url(":/InfiniteViewer/Icon/flip.png")} QToolButton#cine{qproperty-icon:url(":/InfiniteViewer/Icon/cine.png")} QToolButton#fusion{qproperty-icon:url(":/InfiniteViewer/Icon/fusion.png")} QToolButton#MPR{qproperty-icon:url(":/InfiniteViewer/Icon/MPR.png")} +QToolButton#VR{qproperty-icon:url(":/InfiniteViewer/Icon/VR.png")} QToolButton#minimize{ min-height: 25px; @@ -241,4 +242,9 @@ QSlider::handle:horizontal:disabled border: 1px solid #aaa; border-radius: 3px; +} + +VolumeRenderingWindow#volumeWin{ + border:1px solid #cdcdcd; + border-top:1px solid #333333; } \ No newline at end of file diff --git a/src/Icon/VR.png b/src/Icon/VR.png new file mode 100644 index 0000000000000000000000000000000000000000..c4eb09b1f5e26ceac2d644892e3a9419549fabb0 GIT binary patch literal 1052 zcmV+%1mpXOP)Px&)=5M`RA@u(nN5fkM-<23tDRvF9wa$Q2*isXJnY(CwZlLX*x7?0AZT3KKt$1m z5Mn?C^`M|J5k06N;zvLNf}$jZ#E%3t5YQa5S$6t$yMYiv7K8+%AP5VBFf;W+i@ns2 z^HKdVtV_CXQ&j!m`_+3@UG)ZGfj3;>{=@$lfQUW^fJ5^T!9!BYFCx2%B0xm@0pQ3y zI1h+;$93IGVgS$c_8{W%`EWk8nF_%7{hiEws@ZudWui!STLj0qW=D5TFp67jv zi04`v?FE46dHWFYXtTXU0M%;sBO%1shS&oDSQ`D#8XyRQJz8rsO}__#(L^ca`~DVY zzGyiAn3+cq@sC~r5Ya9GIBD3sp|w6Kgt#3WfQa4)fNu=3XNWlBy6*2p#90Fn(Psc~ z#;|vjnb$M(+pz(NXd?iGp)=cBDdnxOBWnO6`WOJt8^(Sq6bcM3>4tJUFH07SG7 z0Dd$*7eZ`y9Op{Zmn8rZZ3BP{hP_{l#o~Jd0|QUOzE}XB=dD7-pPP=Zov!PiHv6&y z@I3DWM7(ThkJoCojpcIrQPgJ*5Cp-n*82HoF3}tW z@B6ozdAQYC-|Id^ysNd|q?DR&wzVJt0APib@~>74l@y>`T4a$zvl^W~hKT^Q)|H{5 zp*!tTCyPyNtC0h=ih}Lxb=v&48hHfr2(-zgJcYt1rnxxgmpDI0E$$w93gs#EB2AJ$ z>hlyznnDv36Dx|v;-41#H1i=H>q0iiXb=R;nE5+q9?aZ33&B(XzVE-q%weTMT0A)| z+?i9|wt2e3^z?LLY;3F%iCcfjCMPGC^!4>!1%R^Q*@sd}vzlPz^z4{Uo0y390>Cj- zuvV)rE|<$QW}g+n`1tti{r&yd0N~wdGBfW|O1)I*jYH55AP9mTTI;i>7Bj!0l=`<> zzbnAh)YPJSy?z4#MrOl?c+hp-!*QIoz0tO)5rGh5x#KwZTWNFzK*Zkw;3q^}WlTOH zr3}NHx;00Dh*l%wb!P65#Dx%!<2ZNQ8S4ljgxC!LVU;dw=cSaNr1t!UfC*5q*H;z_ zg|H^|n&JFAj^l)j*tWF=0DvC=Agqr@?c14|nQfIyIcon/fusionable.png Icon/unfusionable.png Icon/unMPR.png + Icon/VR.png Icon/pq/pqBold24.png diff --git a/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp b/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp index a9232ff..dcfcb97 100644 --- a/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp +++ b/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp @@ -43,6 +43,7 @@ DefaultToolBar::DefaultToolBar(QWidget *parent) : QToolBar(parent) , mBtnCine(new QToolButton(this)) , mBtnFusion(new QToolButton(this)) , mBtnMPR(new QToolButton(this)) + , mBtnVR(new QToolButton(this)) , mBtnMinimize(new QToolButton(this)) , mBtnMaximize(new QToolButton(this)) , mBtnClose(new QToolButton(this)) @@ -106,6 +107,7 @@ void DefaultToolBar::initToolBarButtons() { addButton(mBtnCine, "cine"); addButton(mBtnFusion, "fusion"); addButton(mBtnMPR, "MPR"); + addButton(mBtnVR, "VR"); QWidget *spacer = new QWidget(this); spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); @@ -130,6 +132,7 @@ void DefaultToolBar::initToolBarButtons() { initTransformButton(); initFusionButton(); initMPRButton(); + initVRButton(); initCineButton(); initClearButton(); initScreenButtons(); @@ -456,4 +459,8 @@ void DefaultToolBar::initScreenButtons() { mBtnClose->setToolTip(QString("Close")); connect(mBtnClose, &QToolButton::clicked, this, &DefaultToolBar::parentWindowClose); -} \ No newline at end of file +} + +void DefaultToolBar::initVRButton() { + connect(mBtnVR, &QToolButton::clicked, this, &DefaultToolBar::volumeRendering); +} diff --git a/src/src/UI/Widget/ToolBar/DefaultToolBar.h b/src/src/UI/Widget/ToolBar/DefaultToolBar.h index 27c81de..2009c1c 100644 --- a/src/src/UI/Widget/ToolBar/DefaultToolBar.h +++ b/src/src/UI/Widget/ToolBar/DefaultToolBar.h @@ -39,6 +39,7 @@ signals: void parentWindowClose(); void transform(TransFormType type); void showMeta(); + void volumeRendering(); void referenceLineStateChange(bool isShow); private: QAction *addButton(QToolButton *button, const char *objectName); @@ -47,7 +48,6 @@ private: void initToolBarButtons(); void syncStateChanged() const; - void initMPRButton(); void initFileButton(); void initImportButton(); @@ -60,6 +60,8 @@ private: void initFusionButton(); void initCineButton(); void initClearButton(); + void initMPRButton(); + void initVRButton(); void initTransformButton(); void initScreenButtons(); @@ -82,6 +84,7 @@ private: QToolButton *mBtnCine; QToolButton *mBtnFusion; QToolButton *mBtnMPR; + QToolButton *mBtnVR; QToolButton *mBtnMinimize; QToolButton *mBtnMaximize; QToolButton *mBtnClose;