From 042b601b5ecb335e646aea462b2be231293a7fd8 Mon Sep 17 00:00:00 2001 From: Nicole Aucoin Date: Thu, 4 Apr 2013 17:35:27 -0400 Subject: [PATCH] ENH: emit unique signals when color, opacity, font, style change. The scalar bar widget listens for the unique signals from the text property widget and passes them along as a modified signal. --- .../VTK/Widgets/ctkVTKScalarBarWidget.cpp | 12 +++++++++++- .../VTK/Widgets/ctkVTKTextPropertyWidget.cpp | 12 ++++++------ .../VTK/Widgets/ctkVTKTextPropertyWidget.h | 7 ++++++- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKScalarBarWidget.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKScalarBarWidget.cpp index 5aa41c01de..5544dfb47a 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKScalarBarWidget.cpp +++ b/Libs/Visualization/VTK/Widgets/ctkVTKScalarBarWidget.cpp @@ -66,7 +66,17 @@ void ctkVTKScalarBarWidgetPrivate::init() QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(textChanged(QString)), q, SLOT(setLabelsFormat(QString))); - QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(modified()), + QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(colorChanged(QColor)), + q, SIGNAL(modified())); + QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(opacityChanged(double)), + q, SIGNAL(modified())); + QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(fontFamilyChanged(QString)), + q, SIGNAL(modified())); + QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(boldChanged(bool)), + q, SIGNAL(modified())); + QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(italicChanged(bool)), + q, SIGNAL(modified())); + QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(shadowChanged(bool)), q, SIGNAL(modified())); } diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.cpp index 2cdfa59013..066be0d34d 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.cpp +++ b/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.cpp @@ -199,7 +199,7 @@ void ctkVTKTextPropertyWidget::setColor(const QColor& color) } d->TextProperty->SetColor(color.redF(), color.greenF(), color.blueF()); - emit modified(); + emit colorChanged(color); } //----------------------------------------------------------------------------- @@ -219,7 +219,7 @@ void ctkVTKTextPropertyWidget::setOpacity(double opacity) } d->TextProperty->SetOpacity(opacity); - emit modified(); + emit opacityChanged(opacity); } //----------------------------------------------------------------------------- @@ -239,7 +239,7 @@ void ctkVTKTextPropertyWidget::setFont(const QString& font) } d->TextProperty->SetFontFamilyAsString(font.toStdString().data()); - emit modified(); + emit fontFamilyChanged(font); } //----------------------------------------------------------------------------- @@ -259,7 +259,7 @@ void ctkVTKTextPropertyWidget::setBold(bool enable) } d->TextProperty->SetBold(enable); - emit modified(); + emit boldChanged(enable); } //----------------------------------------------------------------------------- @@ -279,7 +279,7 @@ void ctkVTKTextPropertyWidget::setItalic(bool enable) } d->TextProperty->SetItalic(enable); - emit modified(); + emit italicChanged(enable); } //----------------------------------------------------------------------------- @@ -299,5 +299,5 @@ void ctkVTKTextPropertyWidget::setShadow(bool enable) } d->TextProperty->SetShadow(enable); - emit modified(); + emit shadowChanged(enable); } diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.h b/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.h index 8c8cc20a18..dae3e050f2 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.h +++ b/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.h @@ -82,7 +82,12 @@ public Q_SLOTS: Q_SIGNALS: void textChanged(const QString& text); - void modified(); + void colorChanged(const QColor& color); + void opacityChanged(double opacity); + void fontFamilyChanged(const QString &font); + void boldChanged(bool enable); + void italicChanged(bool enable); + void shadowChanged(bool enable); protected Q_SLOTS: void updateFromTextProperty();