From d75dfe7cf4d64ebeb8d268c1e95f7586f6c076e1 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Wed, 6 Feb 2008 11:28:10 +0000 Subject: [PATCH] small changes done during the meeting --- src/fgt/edit_quality/eqhandle.cpp | 4 ++-- src/fgt/edit_quality/eqhandle.h | 2 +- src/fgt/edit_quality/handle.h | 2 +- src/fgt/edit_quality/qualitymapperdialog.cpp | 1 + src/fgt/edit_quality/qualitymapperdialog.ui | 10 ++-------- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/fgt/edit_quality/eqhandle.cpp b/src/fgt/edit_quality/eqhandle.cpp index 6fe5472aa..66028432a 100644 --- a/src/fgt/edit_quality/eqhandle.cpp +++ b/src/fgt/edit_quality/eqhandle.cpp @@ -26,8 +26,8 @@ EqHandle::~EqHandle(void) void EqHandle::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget /*= 0*/ ) { - Q_UNUSED(option); - Q_UNUSED(widget); + //Q_UNUSED(option); + //Q_UNUSED(widget); //QPen pen(Qt::black); //non sepen.setWidth(2); painter->setPen(_color); diff --git a/src/fgt/edit_quality/eqhandle.h b/src/fgt/edit_quality/eqhandle.h index 1829b076c..175c74a00 100644 --- a/src/fgt/edit_quality/eqhandle.h +++ b/src/fgt/edit_quality/eqhandle.h @@ -26,7 +26,7 @@ public: int zOrder, int size); ~EqHandle(void); QRectF boundingRect () const; - void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget); + virtual void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget); void setSize (int size) {(size%2==0) ? _size=size+1 : _size=size;}; void setBarHeight (qreal height) {_barHeight = height;}; diff --git a/src/fgt/edit_quality/handle.h b/src/fgt/edit_quality/handle.h index aa845d57f..3d5c21fcc 100644 --- a/src/fgt/edit_quality/handle.h +++ b/src/fgt/edit_quality/handle.h @@ -21,7 +21,7 @@ public: // Overriding QGraphicsItem methods QRectF boundingRect () const; - void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) = 0; + virtual void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) = 0; protected: void mousePressEvent (QGraphicsSceneMouseEvent *event); diff --git a/src/fgt/edit_quality/qualitymapperdialog.cpp b/src/fgt/edit_quality/qualitymapperdialog.cpp index fd7123fda..6bcde24bc 100644 --- a/src/fgt/edit_quality/qualitymapperdialog.cpp +++ b/src/fgt/edit_quality/qualitymapperdialog.cpp @@ -459,6 +459,7 @@ void QualityMapperDialog::drawGammaCorrection() //painter.drawArc(0, 0, pixmap->width(), pixmap->height(), 0, -90*16); ui.gammaCorrectionLabel->setPixmap(*pixmap); + painter.end(); delete pixmap; } diff --git a/src/fgt/edit_quality/qualitymapperdialog.ui b/src/fgt/edit_quality/qualitymapperdialog.ui index f1691baab..c16a39572 100644 --- a/src/fgt/edit_quality/qualitymapperdialog.ui +++ b/src/fgt/edit_quality/qualitymapperdialog.ui @@ -5,8 +5,8 @@ 0 0 - 520 - 600 + 583 + 717 @@ -15,12 +15,6 @@ 600 - - - 520 - 600 - - Quality Mapper Dialog