diff --git a/src/Combinear.qss b/src/Combinear.css similarity index 96% rename from src/Combinear.qss rename to src/Combinear.css index 6b592e2..255c136 100644 --- a/src/Combinear.qss +++ b/src/Combinear.css @@ -19,6 +19,7 @@ QWidget#statusBar QToolButton { border-radius: 5px; margin:0px 0px 0px 0px; padding:3px; + background-color: #323232; } QToolButton::menu-button @@ -44,6 +45,11 @@ QToolButton:pressed background-color: #646464; } +QToolButton:disabled +{ + background-color: #222222; +} + /*-----QMenu-----*/ QMenu { background-color: #f0f0f0; diff --git a/src/QDicomViewer.qrc b/src/QDicomViewer.qrc index e504779..395472b 100644 --- a/src/QDicomViewer.qrc +++ b/src/QDicomViewer.qrc @@ -11,7 +11,7 @@ Resources/import/setting.png - Combinear.qss + Combinear.css Icon/angle.png diff --git a/src/src/UI/Window/QDicomViewer.cpp b/src/src/UI/Window/QDicomViewer.cpp index 8beb057..269032a 100644 --- a/src/src/UI/Window/QDicomViewer.cpp +++ b/src/src/UI/Window/QDicomViewer.cpp @@ -1,4 +1,4 @@ -#include "QDicomViewer.h" +#include "QDicomViewer.h" #include #include @@ -52,7 +52,7 @@ void QDicomViewer::Initial() { } void QDicomViewer::loadStyleSheet(const QString &sheetName) { - QFile file(":/StyleSheet/" + sheetName + ".qss"); + QFile file(":/StyleSheet/" + sheetName + ".css"); file.open(QFile::ReadOnly); if (file.isOpen()) { QString styleSheet = this->styleSheet(); diff --git a/src/src/UI/Window/QDicomViewer.h b/src/src/UI/Window/QDicomViewer.h index f37f276..0b2923f 100644 --- a/src/src/UI/Window/QDicomViewer.h +++ b/src/src/UI/Window/QDicomViewer.h @@ -1,10 +1,12 @@ #pragma once #include #include "ui_QDicomViewer.h" -#include "UI/Widget/importwidget.h" +#include "UI/Widget/Import/importwidget.h" #include #include "UI/Dialog/exportdialog.h" #include "customwindow.h" +#include "Common/Worker/WorkerManager.h" +#include "UI/Manager/ImageViewStateCheckWorker.h" #include "UI/Widget/Measure/pqFontPropertyWidget.h" typedef tuple ActionProperty; @@ -106,6 +108,8 @@ private: QIcon icon_auto; QIcon icon_dis; QToolButton* syncBtn = nullptr; + QToolButton* fusionBtn = nullptr; + QToolButton* mprBtn = nullptr; QAction *m_sync_item_action[SYNC_ITEM_NUM]; QAction* m_sync_state_action; QAction* m_measure_hidden_action; @@ -124,6 +128,9 @@ private: AnnotationActorType m_cur_measure = AnnotationActorType::RulerAnn; + WorkerManager workerManager; + ImageViewStateCheckWorker worker; + void syncStateChanged() const; void switchSyncState();