From e6d13a7cb662112cf19781dfca8777c8286fbf2c Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Fri, 23 Jul 2010 18:17:17 +0000 Subject: [PATCH] Scopes: Space optimizations svn path=/trunk/kdenlive/; revision=4635 --- src/abstractscopewidget.cpp | 2 +- src/colorcorrection/rgbparadegenerator.cpp | 13 ++--- src/colorcorrection/waveformgenerator.cpp | 2 +- src/rgbparade.cpp | 4 +- src/vectorscope.cpp | 16 +++--- src/waveform.cpp | 2 +- src/widgets/rgbparade_ui.ui | 9 +--- src/widgets/vectorscope_ui.ui | 61 ++++++++++------------ src/widgets/waveform_ui.ui | 9 +--- 9 files changed, 44 insertions(+), 74 deletions(-) diff --git a/src/abstractscopewidget.cpp b/src/abstractscopewidget.cpp index 998cc725..d61f3b6f 100644 --- a/src/abstractscopewidget.cpp +++ b/src/abstractscopewidget.cpp @@ -216,7 +216,7 @@ void AbstractScopeWidget::paintEvent(QPaintEvent *) initialDimensionUpdateDone = true; } - qDebug() << "Drawing top/left at " << m_scopeRect.topLeft().x() << "/" << m_scopeRect.topLeft().y(); + qDebug() << "Drawing top/left at " << m_scopeRect.topLeft().y() << "/" << m_scopeRect.topLeft().x(); QPainter davinci(this); davinci.drawImage(m_scopeRect.topLeft(), m_imgBackground); diff --git a/src/colorcorrection/rgbparadegenerator.cpp b/src/colorcorrection/rgbparadegenerator.cpp index fe494e83..c79a8171 100644 --- a/src/colorcorrection/rgbparadegenerator.cpp +++ b/src/colorcorrection/rgbparadegenerator.cpp @@ -30,16 +30,11 @@ QImage RGBParadeGenerator::calculateRGBParade(const QSize ¶deSize, const QIm { Q_ASSERT(accelFactor >= 1); - QImage parade(paradeSize, QImage::Format_ARGB32); - if (paradeSize.width() <= 0 || paradeSize.height() <= 0) { - qCritical("Wave size should not be 0."); + return QImage(); } else { - - qDebug() << "Wave calculation started."; - - // Fill with transparent color + QImage parade(paradeSize, QImage::Format_ARGB32); parade.fill(qRgba(0,0,0,0)); QRgb *col; @@ -168,10 +163,8 @@ QImage RGBParadeGenerator::calculateRGBParade(const QSize ¶deSize, const QIm - + return parade; } - - return parade; } #undef CHOP255 diff --git a/src/colorcorrection/waveformgenerator.cpp b/src/colorcorrection/waveformgenerator.cpp index 62c5c74e..3da94773 100644 --- a/src/colorcorrection/waveformgenerator.cpp +++ b/src/colorcorrection/waveformgenerator.cpp @@ -37,7 +37,7 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm QImage wave(waveformSize, QImage::Format_ARGB32); if (waveformSize.width() <= 0 || waveformSize.height() <= 0) { - qCritical("Waveform size should not be 0."); + return QImage(); } else { diff --git a/src/rgbparade.cpp b/src/rgbparade.cpp index 7e891540..3e412ab7 100644 --- a/src/rgbparade.cpp +++ b/src/rgbparade.cpp @@ -32,8 +32,8 @@ QString RGBParade::widgetName() const { return "RGB Parade"; } QRect RGBParade::scopeRect() { - QPoint topleft(offset, ui->line->y() + 2*offset); - return QRect(topleft, QPoint(this->size().width() - offset, this->size().height() - offset) - topleft); + QPoint topleft(offset, ui->verticalSpacer->geometry().y() + 2*offset); + return QRect(topleft, QPoint(this->size().width() - offset, this->size().height() - offset)); } QImage RGBParade::renderHUD(uint) { return QImage(); } diff --git a/src/vectorscope.cpp b/src/vectorscope.cpp index 841e76d2..cca16ef1 100644 --- a/src/vectorscope.cpp +++ b/src/vectorscope.cpp @@ -117,22 +117,20 @@ QString Vectorscope::widgetName() const { return QString("Vectorscope"); } QRect Vectorscope::scopeRect() { - // Widget width/height - int ww = this->size().width(); - int wh = this->size().height(); - // Distance from top/left/right int offset = 6; // We want to paint below the controls area. The line is the lowest element. - QPoint topleft(offset, ui->line->y()+offset); + QPoint topleft(offset, ui->verticalSpacer->geometry().y()+offset); + QPoint bottomright(ui->horizontalSpacer->geometry().right()-offset, this->size().height()-offset); + + QRect scopeRect(topleft, bottomright); // Circle Width: min of width and height - cw = wh - topleft.y(); - if (ww < cw) { cw = ww; } - cw -= 2*offset; + cw = (scopeRect.height() < scopeRect.width()) ? scopeRect.height() : scopeRect.width(); + scopeRect.setWidth(cw); + scopeRect.setHeight(cw); - QRect scopeRect(topleft, QPoint(cw, cw) + topleft); m_centerPoint = m_vectorscopeGenerator->mapToCircle(scopeRect.size(), QPointF(0,0)); pR75 = m_vectorscopeGenerator->mapToCircle(scopeRect.size(), P75*VectorscopeGenerator::scaling*YUV_R); diff --git a/src/waveform.cpp b/src/waveform.cpp index 911ecd51..fdd22b97 100644 --- a/src/waveform.cpp +++ b/src/waveform.cpp @@ -39,7 +39,7 @@ QRect Waveform::scopeRect() // Distance from top/left/right int offset = 6; - QPoint topleft(offset, ui->line->y()+offset); + QPoint topleft(offset, ui->verticalSpacer->geometry().y()+offset); return QRect(topleft, this->size() - QSize(offset+topleft.x(), offset+topleft.y())); } diff --git a/src/widgets/rgbparade_ui.ui b/src/widgets/rgbparade_ui.ui index f711ca6e..f323dd3f 100644 --- a/src/widgets/rgbparade_ui.ui +++ b/src/widgets/rgbparade_ui.ui @@ -34,7 +34,7 @@ - + Qt::Vertical @@ -47,13 +47,6 @@ - - - - Qt::Horizontal - - - diff --git a/src/widgets/vectorscope_ui.ui b/src/widgets/vectorscope_ui.ui index 35ff33c4..ec82eae1 100644 --- a/src/widgets/vectorscope_ui.ui +++ b/src/widgets/vectorscope_ui.ui @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -60,28 +60,7 @@ - - - - Gain - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - + Qt::Vertical @@ -94,28 +73,42 @@ - - - - - 0 - 0 - + + + + Qt::Horizontal - + 40 - 0 + 20 + + + + - (notr) + (notr) Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + 0 + 0 + + + + Qt::Vertical + + + diff --git a/src/widgets/waveform_ui.ui b/src/widgets/waveform_ui.ui index 15142363..d07563c2 100644 --- a/src/widgets/waveform_ui.ui +++ b/src/widgets/waveform_ui.ui @@ -34,7 +34,7 @@ - + Qt::Vertical @@ -47,13 +47,6 @@ - - - - Qt::Horizontal - - - -- 2.39.2