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 0000000..c4eb09b Binary files /dev/null and b/src/Icon/VR.png differ diff --git a/src/QDicomViewer.qrc b/src/QDicomViewer.qrc index 395472b..77bec28 100644 --- a/src/QDicomViewer.qrc +++ b/src/QDicomViewer.qrc @@ -51,6 +51,7 @@ Icon/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;