Change signal and slot connect type in view reference class.2
This commit is contained in:
@@ -956,15 +956,23 @@ void QDicomViewer::SetupGridTool(QToolButton* gridBtn) {
|
|||||||
void QDicomViewer::SetupConnections()
|
void QDicomViewer::SetupConnections()
|
||||||
{
|
{
|
||||||
//通知左侧的缩略图bar ,当前选中series的变换
|
//通知左侧的缩略图bar ,当前选中series的变换
|
||||||
connect(ui->viewContainer,&ViewContainerWidget::Signal_NotifyThumbnail,
|
connect(ui->viewContainer, &ViewContainerWidget::Signal_NotifyThumbnail,
|
||||||
ui->thumbnailBar, &ThumbnailBarWidget::Slot_setCurrentThumbnail);
|
ui->thumbnailBar, &ThumbnailBarWidget::Slot_setCurrentThumbnail);
|
||||||
|
|
||||||
//通知右侧显示区域,当前有series被点击
|
//通知右侧显示区域,当前有series被点击
|
||||||
connect(ui->thumbnailBar, &ThumbnailBarWidget::Signal_ThumbClicked,
|
connect(ui->thumbnailBar, &ThumbnailBarWidget::Signal_ThumbClicked,
|
||||||
ui->viewContainer, &ViewContainerWidget::Slot_ThumbnailClickEvent);
|
ui->viewContainer, &ViewContainerWidget::Slot_ThumbnailClickEvent);
|
||||||
|
|
||||||
connect(ui->toolBar, &QToolBar::visibilityChanged,
|
connect(ui->toolBar,&QToolBar::visibilityChanged,
|
||||||
this, &QDicomViewer::Slot_ToolbarVisibilityChanged);
|
this, &QDicomViewer::Slot_ToolbarVisibilityChanged);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//connect(ui->viewContainer, SIGNAL(Signal_NotifyThumbnail(DicomImageView*)),
|
||||||
|
// ui->vcr_toolbar, SLOT(setImageView(DicomImageView*)));
|
||||||
|
|
||||||
|
//connect(ui->thumbnailBar, SIGNAL(Signal_CopyDicomView(SeriesInfo_t*)),
|
||||||
|
// this, SLOT(Slot_CopyDicomView(SeriesInfo_t*)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -28,14 +28,16 @@ private:
|
|||||||
Ui::QDicomViewerClass *ui;
|
Ui::QDicomViewerClass *ui;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 从qrc中读取指定抿成的StyleSheet文件
|
* 从qrc中读取指定名称的StyleSheet文件
|
||||||
* @param sheetName StyleSheet文件名
|
* @param sheetName StyleSheet文件名
|
||||||
*/
|
*/
|
||||||
void loadStyleSheet(const QString &sheetName);
|
void loadStyleSheet(const QString &sheetName);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 初始化函数,主要实现了Button的构建和槽函数绑定
|
* 初始化函数,主要实现了Button的构建和槽函数绑定
|
||||||
*/
|
*/
|
||||||
void Initial();
|
void Initial();
|
||||||
|
|
||||||
void createToolButton();
|
void createToolButton();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
#include "view/thumbnailbarwidget.h"
|
#include "view/thumbnailbarwidget.h"
|
||||||
#include "view/thumbnailImage.h"
|
|
||||||
#include "base/DicomLoader.h"
|
#include "base/DicomLoader.h"
|
||||||
#include "base/SeriesImageSet.h"
|
#include "base/SeriesImageSet.h"
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|||||||
@@ -8,10 +8,9 @@
|
|||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include "global/QGlobals.h"
|
#include "global/QGlobals.h"
|
||||||
#include "QScrollArea.h"
|
#include "QScrollArea.h"
|
||||||
|
#include "view/thumbnailImage.h"
|
||||||
|
|
||||||
class ImageInstance;
|
|
||||||
class SeriesImageSet;
|
class SeriesImageSet;
|
||||||
class thumbnailImage;
|
|
||||||
class DicomImageView;
|
class DicomImageView;
|
||||||
|
|
||||||
class ThumbnailBarWidget : public QFrame {
|
class ThumbnailBarWidget : public QFrame {
|
||||||
@@ -28,7 +27,7 @@ class ThumbnailBarWidget : public QFrame {
|
|||||||
//protected:
|
//protected:
|
||||||
// void paintEvent(QPaintEvent *)override;
|
// void paintEvent(QPaintEvent *)override;
|
||||||
|
|
||||||
Q_SIGNALS:
|
signals:
|
||||||
void Signal_ThumbClicked(thumbnailImage* thumb);
|
void Signal_ThumbClicked(thumbnailImage* thumb);
|
||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
|
|||||||
@@ -225,8 +225,6 @@ void ViewContainerWidget::setCurrentView(DicomImageView *view) {
|
|||||||
* 双击 view(放大缩小)
|
* 双击 view(放大缩小)
|
||||||
* @param view
|
* @param view
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
void ViewContainerWidget::Slot_ViewDoubleClicked(DicomImageView *view) {
|
void ViewContainerWidget::Slot_ViewDoubleClicked(DicomImageView *view) {
|
||||||
if (!view) {
|
if (!view) {
|
||||||
return;
|
return;
|
||||||
@@ -257,9 +255,6 @@ void ViewContainerWidget::Slot_ViewDoubleClicked(DicomImageView *view) {
|
|||||||
* @param col
|
* @param col
|
||||||
* @param row
|
* @param row
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void ViewContainerWidget::Slot_SetViewLayout(int col, int row) {
|
void ViewContainerWidget::Slot_SetViewLayout(int col, int row) {
|
||||||
|
|
||||||
if (!(col > 0 && row > 0)) {
|
if (!(col > 0 && row > 0)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user