From 2f0bbf264645a589fad0cb4b7d686699a00ed00f Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Fri, 16 Jul 2010 17:27:57 +0000 Subject: [PATCH] Vectorscope changes: * Background (YUV plane, modified YUV plane) can be exported * Axis can be turned on/off * 75% Polygon (R-Mg-B-Cy-G-Yl-R) can be turned on General changes: * YUV color tool moved to own class for re-use svn path=/trunk/kdenlive/; revision=4585 --- src/CMakeLists.txt | 3 + src/colorplaneexport.cpp | 128 +++++++++++++++++ src/colorplaneexport.h | 48 +++++++ src/colortools.cpp | 91 +++++++++++++ src/colortools.h | 40 ++++++ src/vectorscope.cpp | 171 ++++++++++------------- src/vectorscope.h | 13 +- src/widgets/colorplaneexport_ui.ui | 212 +++++++++++++++++++++++++++++ 8 files changed, 603 insertions(+), 103 deletions(-) create mode 100644 src/colorplaneexport.cpp create mode 100644 src/colorplaneexport.h create mode 100644 src/colortools.cpp create mode 100644 src/colortools.h create mode 100644 src/widgets/colorplaneexport_ui.ui diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff20f2d8..5ecaabfa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -90,6 +90,7 @@ kde4_add_ui_files(kdenlive_UI widgets/tracksconfigdialog_ui.ui widgets/urlval_ui.ui widgets/vectorscope_ui.ui + widgets/colorplaneexport_ui.ui ) set(kdenlive_SRCS @@ -192,6 +193,8 @@ set(kdenlive_SRCS tracksconfigdialog.cpp configtrackscommand.cpp vectorscope.cpp + colorplaneexport.cpp + colortools.cpp ) add_definitions( ${KDE4_DEFINITIONS} ) diff --git a/src/colorplaneexport.cpp b/src/colorplaneexport.cpp new file mode 100644 index 00000000..95a2ab68 --- /dev/null +++ b/src/colorplaneexport.cpp @@ -0,0 +1,128 @@ +/*************************************************************************** + * Copyright (C) 2010 by Simon Andreas Eugster (simon.eu@gmail.com) * + * This file is part of kdenlive. See www.kdenlive.org. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + ***************************************************************************/ + +#include "colorplaneexport.h" +#include +#include + +const QString EXTENSION_PNG = ".png"; +const int SCALE_RANGE = 80; + +ColorPlaneExport::ColorPlaneExport(QWidget *parent) : + QDialog(parent) +{ + setupUi(this); + + m_colorTools = new ColorTools(); + + tResX->setText("800"); + tResY->setText("800"); + + cbColorspace->addItem(i18n("YUV"), QVariant(CPE_YUV)); + cbColorspace->addItem(i18n("Modified YUV (Chroma)"), QVariant(CPE_YUV_MOD)); + + sliderColor->setSliderPosition(128); + + // 0 -> 1 + // 50 -> 0.5 + // 80 -> 0.2 + sliderScaling->setInvertedAppearance(true); + sliderScaling->setRange(0, 80); + sliderScaling->setSliderPosition(50); + + connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotExportPlane())); + connect(tResX, SIGNAL(textChanged(QString)), this, SLOT(slotValidate())); + connect(tResY, SIGNAL(textChanged(QString)), this, SLOT(slotValidate())); + connect(kurlrequester, SIGNAL(textChanged(QString)), this, SLOT(slotValidate())); + connect(sliderColor, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateDisplays())); + connect(sliderScaling, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateDisplays())); + + kurlrequester->setText("/tmp/yuv-plane.png"); + + slotColormodeChanged(); + slotValidate(); +} + +ColorPlaneExport::~ColorPlaneExport() +{ + delete m_colorTools; +} + +void ColorPlaneExport::slotUpdateDisplays() +{ + m_scaling = 1 - (float)sliderScaling->value()/100; + + lblScaleNr->setText("0..." + QString::number(m_scaling, 'f', 2)); + lblColNr->setText(QString::number(sliderColor->value())); + + lblSize->setText(i18n("%1 px", QVariant(tResX->text()).toInt()*QVariant(tResY->text()).toInt())); +} + +void ColorPlaneExport::slotValidate() +{ + bool ok; + int nr; + + nr = QVariant(tResX->text()).toInt(&ok); + ok = ok && nr > 0; + if (ok) { + nr = QVariant(tResY->text()).toInt(&ok); + ok = ok && nr > 0; + } + if (ok) { + ok = kurlrequester->text().trimmed().length() > 0; + qDebug() << "File given: " << ok; + } + + if (ok) { + buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + } else { + buttonBox->setStandardButtons(QDialogButtonBox::Cancel); + } + + slotUpdateDisplays(); +} + +void ColorPlaneExport::slotExportPlane() +{ + qDebug() << "Exporting plane now to " << kurlrequester->text(); + QString lower = kurlrequester->text().toLower(); + qDebug() << "Lower: " << lower; + if (!lower.endsWith(".png") && !lower.endsWith(".jpg") && !lower.endsWith(".tif") && !lower.endsWith(".tiff")) { + if (KMessageBox::questionYesNo(this, i18n("File has no extension. Add extension (%1)?", EXTENSION_PNG)) == KMessageBox::Yes) { + kurlrequester->setText(kurlrequester->text() + ".png"); + } + } + QImage img; + QSize size(QVariant(tResX->text()).toInt(), QVariant(tResY->text()).toInt()); + switch (cbColorspace->itemData(cbColorspace->currentIndex()).toInt()) { + case CPE_YUV: + img = m_colorTools->yuvColorWheel(size, sliderColor->value(), m_scaling, false, false); + break; + case CPE_YUV_MOD: + img = m_colorTools->yuvColorWheel(size, sliderColor->value(), m_scaling, true, false); + break; + } + img.save(kurlrequester->text()); +} + +void ColorPlaneExport::slotColormodeChanged() +{ + switch (cbColorspace->itemData(cbColorspace->currentIndex()).toInt()) { + case CPE_YUV: + case CPE_YUV_MOD: + sliderColor->setVisible(true); + sliderColor->setRange(0,255); + break; + default: + sliderColor->setVisible(false); + break; + } +} diff --git a/src/colorplaneexport.h b/src/colorplaneexport.h new file mode 100644 index 00000000..32ec2bbe --- /dev/null +++ b/src/colorplaneexport.h @@ -0,0 +1,48 @@ +/*************************************************************************** + * Copyright (C) 2010 by Simon Andreas Eugster (simon.eu@gmail.com) * + * This file is part of kdenlive. See www.kdenlive.org. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + ***************************************************************************/ + +/** + Exports color planes (e.g. YUV-UV-planes) to a file. + Basically just for fun, but also for comparing color models. + */ + +#ifndef COLORPLANEEXPORT_H +#define COLORPLANEEXPORT_H + +#include +#include "ui_colorplaneexport_ui.h" +#include "colortools.h" + +class ColorPlaneExport_UI; + +enum COLOR_EXPORT_MODE { CPE_YUV, CPE_YUV_MOD }; + +class ColorPlaneExport : public QDialog, public Ui::ColorPlaneExport_UI { + Q_OBJECT +public: + ColorPlaneExport(QWidget *parent = 0); + ~ColorPlaneExport(); + +protected: + +private: + ColorTools *m_colorTools; + float m_scaling; + float m_Y; + + +private slots: + void slotValidate(); + void slotExportPlane(); + void slotColormodeChanged(); + void slotUpdateDisplays(); +}; + +#endif // COLORPLANEEXPORT_H diff --git a/src/colortools.cpp b/src/colortools.cpp new file mode 100644 index 00000000..cc49e9ef --- /dev/null +++ b/src/colortools.cpp @@ -0,0 +1,91 @@ +/*************************************************************************** + * Copyright (C) 2010 by Simon Andreas Eugster (simon.eu@gmail.com) * + * This file is part of kdenlive. See www.kdenlive.org. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + ***************************************************************************/ + +#include +#include "colortools.h" + +ColorTools::ColorTools() +{ +} + + + +QImage ColorTools::yuvColorWheel(const QSize &size, unsigned char Y, float scaling, bool modifiedVersion, bool circleOnly) +{ + QImage wheel(size, QImage::Format_ARGB32); + if (size.width() == 0 || size.height() == 0) { + qCritical("ERROR: Size of the color wheel must not be 0!"); + return wheel; + } + wheel.fill(qRgba(0,0,0,0)); + + double dr, dg, db, du, dv, dmax; + double ru, rv, rr; + const int w = size.width(); + const int h = size.height(); + const float w2 = (float)w/2; + const float h2 = (float)h/2; + + for (int u = 0; u < w; u++) { + // Transform u from {0,...,w} to [-1,1] + du = (double) 2*u/(w-1) - 1; + du = scaling*du; + + for (int v = 0; v < h; v++) { + dv = (double) 2*v/(h-1) - 1; + dv = scaling*dv; + + if (circleOnly) { + // Ellipsis equation: x²/a² + y²/b² = 1 + // Here: x=ru, y=rv, a=w/2, b=h/2, 1=rr + // For rr > 1, the point lies outside. Don't draw it. + ru = u - w2; + rv = v - h2; + rr = ru*ru/(w2*w2) + rv*rv/(h2*h2); + if (rr > 1) { + continue; + } + } + + // Calculate the RGB values from YUV + dr = Y + 290.8*dv; + dg = Y - 100.6*du - 148*dv; + db = Y + 517.2*du; + + if (modifiedVersion) { + // Scale the RGB values down, or up, to max 255 + dmax = fabs(dr); + if (fabs(dg) > dmax) dmax = fabs(dg); + if (fabs(db) > dmax) dmax = fabs(db); + dmax = 255/dmax; + + dr *= dmax; + dg *= dmax; + db *= dmax; + } + + // Avoid overflows (which would generate intersting patterns). + // Note that not all possible (y,u,v) values with u,v \in [-1,1] + // have a correct RGB representation, therefore some RGB values + // may exceed {0,...,255}. + if (dr < 0) dr = 0; + if (dg < 0) dg = 0; + if (db < 0) db = 0; + if (dr > 255) dr = 255; + if (dg > 255) dg = 255; + if (db > 255) db = 255; + + wheel.setPixel(u, (h-v-1), qRgba(dr, dg, db, 255)); + } + } + + emit signalWheelCalculationFinished(); + return wheel; +} diff --git a/src/colortools.h b/src/colortools.h new file mode 100644 index 00000000..6a4ec19d --- /dev/null +++ b/src/colortools.h @@ -0,0 +1,40 @@ +/*************************************************************************** + * Copyright (C) 2010 by Simon Andreas Eugster (simon.eu@gmail.com) * + * This file is part of kdenlive. See www.kdenlive.org. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + ***************************************************************************/ + +/** + Color tools. + */ + +#ifndef COLORTOOLS_H +#define COLORTOOLS_H + +#include + +class ColorTools : public QObject +{ + Q_OBJECT + +public: + ColorTools(); + + /** + @brief Draws a UV plane with given Y value. + scaling defines how far to zoom in (or out). Lower value = zoom in. + The modified version always scales the RGB values so that at least one of them attains 255. + If not the full rect should be filled, set circleOnly to true. + See also: http://en.wikipedia.org/wiki/YUV and http://de.wikipedia.org/wiki/Vektorskop + */ + QImage yuvColorWheel(const QSize& size, const unsigned char Y, const float scaling, const bool modifiedVersion, const bool circleOnly); + +signals: + void signalWheelCalculationFinished(); +}; + +#endif // COLORTOOLS_H diff --git a/src/vectorscope.cpp b/src/vectorscope.cpp index 84c061e9..9907b828 100644 --- a/src/vectorscope.cpp +++ b/src/vectorscope.cpp @@ -43,7 +43,6 @@ mRgb2Yuv = r = #include #include #include -//#include #include #include @@ -80,16 +79,19 @@ Vectorscope::Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *pa { setupUi(this); - // Use item index 20 to always append it to the list. (Update if more than 20 items here.) - paintMode->insertItem(20, i18n("Green"), QVariant(PAINT_GREEN)); - paintMode->insertItem(20, i18n("Black"), QVariant(PAINT_BLACK)); - paintMode->insertItem(20, i18n("Chroma"), QVariant(PAINT_CHROMA)); - paintMode->insertItem(20, i18n("YUV"), QVariant(PAINT_YUV)); - paintMode->insertItem(20, i18n("Original Color"), QVariant(PAINT_ORIG)); + m_colorTools = new ColorTools(); + m_colorPlaneExport = new ColorPlaneExport(this); - backgroundMode->insertItem(20, i18n("None"), QVariant(BG_NONE)); - backgroundMode->insertItem(20, i18n("YUV"), QVariant(BG_YUV)); - backgroundMode->insertItem(20, i18n("Chroma"), QVariant(BG_CHROMA)); + paintMode->addItem(i18n("Green"), QVariant(PAINT_GREEN)); + paintMode->addItem(i18n("Green 2"), QVariant(PAINT_GREEN2)); + paintMode->addItem(i18n("Black"), QVariant(PAINT_BLACK)); + paintMode->addItem(i18n("Modified YUV (Chroma)"), QVariant(PAINT_CHROMA)); + paintMode->addItem(i18n("YUV"), QVariant(PAINT_YUV)); + paintMode->addItem(i18n("Original Color"), QVariant(PAINT_ORIG)); + + backgroundMode->addItem(i18n("None"), QVariant(BG_NONE)); + backgroundMode->addItem(i18n("YUV"), QVariant(BG_YUV)); + backgroundMode->addItem(i18n("Modified YUV (Chroma)"), QVariant(BG_CHROMA)); cbAutoRefresh->setChecked(true); @@ -97,7 +99,7 @@ Vectorscope::Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *pa connect(backgroundMode, SIGNAL(currentIndexChanged(int)), this, SLOT(slotBackgroundChanged())); connect(cbMagnify, SIGNAL(stateChanged(int)), this, SLOT(slotMagnifyChanged())); connect(this, SIGNAL(signalScopeCalculationFinished()), this, SLOT(slotScopeCalculationFinished())); - connect(this, SIGNAL(signalWheelCalculationFinished()), this, SLOT(slotWheelCalculationFinished())); + connect(m_colorTools, SIGNAL(signalWheelCalculationFinished()), this, SLOT(slotWheelCalculationFinished())); connect(paintMode, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateScope())); connect(cbAutoRefresh, SIGNAL(stateChanged(int)), this, SLOT(slotUpdateScope())); @@ -105,13 +107,25 @@ Vectorscope::Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *pa newChanges.fetchAndStoreRelaxed(0); newWheelChanges.fetchAndStoreRelaxed(0); + + ///// Build context menu ///// setContextMenuPolicy(Qt::ActionsContextMenu); + m_aExportBackground = new QAction(i18n("Export background"), this); - m_aExportBackground->setEnabled(false); addAction(m_aExportBackground); connect(m_aExportBackground, SIGNAL(triggered()), this, SLOT(slotExportBackground())); -// m_contextMenu = QMenu(this, "Vectorscope menu"); + m_a75PBox = new QAction(i18n("75% box"), this); + m_a75PBox->setCheckable(true); + m_a75PBox->setChecked(false); + addAction(m_a75PBox); + connect(m_a75PBox, SIGNAL(changed()), this, SLOT(update())); + + m_aAxisEnabled = new QAction(i18n("Draw axis"), this); + m_aAxisEnabled->setCheckable(true); + m_aAxisEnabled->setChecked(false); + addAction(m_aAxisEnabled); + connect(m_aAxisEnabled, SIGNAL(changed()), this, SLOT(update())); this->setMouseTracking(true); @@ -121,79 +135,7 @@ Vectorscope::Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *pa Vectorscope::~Vectorscope() { -} - -QImage Vectorscope::yuvColorWheel(const QSize &size, unsigned char Y, float scaling, bool modifiedVersion, bool circleOnly) -{ - QImage wheel(size, QImage::Format_ARGB32); - if (size.width() == 0 || size.height() == 0) { - qCritical("ERROR: Size of the color wheel must not be 0!"); - return wheel; - } - wheel.fill(qRgba(0,0,0,0)); - - double dr, dg, db, du, dv, dmax; - double ru, rv, rr; - const int w = size.width(); - const int h = size.height(); - const float w2 = (float)w/2; - const float h2 = (float)h/2; - - for (int u = 0; u < w; u++) { - // Transform u from {0,...,w} to [-1,1] - du = (double) 2*u/(w-1) - 1; - du = scaling*du; - - for (int v = 0; v < h; v++) { - dv = (double) 2*v/(h-1) - 1; - dv = scaling*dv; - - if (circleOnly) { - // Ellipsis equation: x²/a² + y²/b² = 1 - // Here: x=ru, y=rv, a=w/2, b=h/2, 1=rr - // For rr > 1, the point lies outside. Don't draw it. - ru = u - w2; - rv = v - h2; - rr = ru*ru/(w2*w2) + rv*rv/(h2*h2); - if (rr > 1) { - continue; - } - } - - // Calculate the RGB values from YUV - dr = Y + 290.8*dv; - dg = Y - 100.6*du - 148*dv; - db = Y + 517.2*du; - - if (modifiedVersion) { - // Scale the RGB values down, or up, to max 255 - dmax = fabs(dr); - if (fabs(dg) > dmax) dmax = fabs(dg); - if (fabs(db) > dmax) dmax = fabs(db); - dmax = 255/dmax; - - dr *= dmax; - dg *= dmax; - db *= dmax; - } - - // Avoid overflows (which would generate intersting patterns). - // Note that not all possible (y,u,v) values with u,v \in [-1,1] - // have a correct RGB representation, therefore some RGB values - // may exceed {0,...,255}. - if (dr < 0) dr = 0; - if (dg < 0) dg = 0; - if (db < 0) db = 0; - if (dr > 255) dr = 255; - if (dg > 255) dg = 255; - if (db > 255) db = 255; - - wheel.setPixel(u, (h-v-1), qRgba(dr, dg, db, 255)); - } - } - - emit signalWheelCalculationFinished(); - return wheel; + delete m_colorPlaneExport; } /** @@ -255,10 +197,10 @@ bool Vectorscope::prodWheelThread() break; case BG_YUV: qDebug() << "YUV background."; - m_wheelCalcThread = QtConcurrent::run(this, &Vectorscope::yuvColorWheel, m_scopeRect.size(), (unsigned char) 128, 1/SCALING, false, true); + m_wheelCalcThread = QtConcurrent::run(m_colorTools, &ColorTools::yuvColorWheel, m_scopeRect.size(), (unsigned char) 128, 1/SCALING, false, true); break; case BG_CHROMA: - m_wheelCalcThread = QtConcurrent::run(this, &Vectorscope::yuvColorWheel, m_scopeRect.size(), (unsigned char) 255, 1/SCALING, true, true); + m_wheelCalcThread = QtConcurrent::run(m_colorTools, &ColorTools::yuvColorWheel, m_scopeRect.size(), (unsigned char) 255, 1/SCALING, true, true); break; } newWheelChanges.fetchAndStoreRelaxed(0); @@ -350,7 +292,11 @@ void Vectorscope::calculateScope() break; case PAINT_GREEN: px = scope.pixel(pt); - scope.setPixel(pt, qRgba(qRed(px)+(255-qRed(px))/40, 255, qBlue(px)+(255-qBlue(px))/40, qAlpha(px)+(255-qAlpha(px))/20)); + scope.setPixel(pt, qRgba(qRed(px)+(255-qRed(px))/30, 255, qBlue(px)+(255-qBlue(px))/25, qAlpha(px)+(255-qAlpha(px))/20)); + break; + case PAINT_GREEN2: + px = scope.pixel(pt); + scope.setPixel(pt, qRgba(qRed(px)+(255-qRed(px))/40+5, 255, qBlue(px)+(255-qBlue(px))/30+10, qAlpha(px)+(255-qAlpha(px))/20)); break; case PAINT_BLACK: px = scope.pixel(pt); @@ -386,6 +332,14 @@ void Vectorscope::updateDimensions() if (ww < cw) { cw = ww; } cw -= 2*offset; m_scopeRect = QRect(topleft, QPoint(cw, cw) + topleft); + + centerPoint = mapToCanvas(m_scopeRect, QPointF(0,0)); + pR75 = mapToCanvas(m_scopeRect, P75*SCALING*YUV_R); + pG75 = mapToCanvas(m_scopeRect, P75*SCALING*YUV_G); + pB75 = mapToCanvas(m_scopeRect, P75*SCALING*YUV_B); + pCy75 = mapToCanvas(m_scopeRect, P75*SCALING*YUV_Cy); + pMg75 = mapToCanvas(m_scopeRect, P75*SCALING*YUV_Mg); + pYl75 = mapToCanvas(m_scopeRect, P75*SCALING*YUV_Yl); } void Vectorscope::paintEvent(QPaintEvent *) @@ -403,7 +357,8 @@ void Vectorscope::paintEvent(QPaintEvent *) // Draw the vectorscope circle QPainter davinci(this); QPoint vinciPoint; - QPoint centerPoint = mapToCanvas(m_scopeRect, QPointF(0,0)); + + davinci.setRenderHint(QPainter::Antialiasing, true); davinci.fillRect(0, 0, this->size().width(), this->size().height(), QColor(25,25,23)); @@ -446,10 +401,13 @@ void Vectorscope::paintEvent(QPaintEvent *) break; } - davinci.drawLine(mapToCanvas(m_scopeRect, QPointF(0,-.9)), mapToCanvas(m_scopeRect, QPointF(0,.9))); - davinci.drawLine(mapToCanvas(m_scopeRect, QPointF(-.9,0)), mapToCanvas(m_scopeRect, QPointF(.9,0))); + // Draw axis + if (m_aAxisEnabled->isChecked()) { + davinci.drawLine(mapToCanvas(m_scopeRect, QPointF(0,-.9)), mapToCanvas(m_scopeRect, QPointF(0,.9))); + davinci.drawLine(mapToCanvas(m_scopeRect, QPointF(-.9,0)), mapToCanvas(m_scopeRect, QPointF(.9,0))); + } - // Draw RGB/CMY points with 75% chroma (for NTSC) + // Draw center point switch (backgroundMode->itemData(backgroundMode->currentIndex()).toInt()) { case BG_CHROMA: davinci.setPen(penDark); @@ -459,13 +417,26 @@ void Vectorscope::paintEvent(QPaintEvent *) break; } davinci.drawEllipse(centerPoint, 5,5); + + + // Draw 75% box + if (m_a75PBox->isChecked()) { + davinci.drawLine(pR75, pYl75); + davinci.drawLine(pYl75, pG75); + davinci.drawLine(pG75, pCy75); + davinci.drawLine(pCy75, pB75); + davinci.drawLine(pB75, pMg75); + davinci.drawLine(pMg75, pR75); + } + + // Draw RGB/CMY points with 75% chroma (for NTSC) davinci.setPen(penThin); - davinci.drawEllipse(mapToCanvas(m_scopeRect, P75*SCALING*YUV_R), 3,3); - davinci.drawEllipse(mapToCanvas(m_scopeRect, P75*SCALING*YUV_G), 3,3); - davinci.drawEllipse(mapToCanvas(m_scopeRect, P75*SCALING*YUV_B), 3,3); - davinci.drawEllipse(mapToCanvas(m_scopeRect, P75*SCALING*YUV_Cy), 3,3); - davinci.drawEllipse(mapToCanvas(m_scopeRect, P75*SCALING*YUV_Mg), 3,3); - davinci.drawEllipse(mapToCanvas(m_scopeRect, P75*SCALING*YUV_Yl), 3,3); + davinci.drawEllipse(pR75, 3,3); + davinci.drawEllipse(pG75, 3,3); + davinci.drawEllipse(pB75, 3,3); + davinci.drawEllipse(pCy75, 3,3); + davinci.drawEllipse(pMg75, 3,3); + davinci.drawEllipse(pYl75, 3,3); @@ -598,6 +569,8 @@ void Vectorscope::slotUpdateWheel() void Vectorscope::slotExportBackground() { qDebug() << "Exporting background"; + m_colorPlaneExport->show(); + } void Vectorscope::slotBackgroundChanged() diff --git a/src/vectorscope.h b/src/vectorscope.h index 9e5ad75e..2dae1115 100644 --- a/src/vectorscope.h +++ b/src/vectorscope.h @@ -14,13 +14,15 @@ #include #include "renderer.h" #include "monitor.h" +#include "colorplaneexport.h" +#include "colortools.h" #include "ui_vectorscope_ui.h" class Render; class Monitor; class Vectorscope_UI; -enum PAINT_MODE { PAINT_GREEN = 0, PAINT_ORIG = 1, PAINT_CHROMA = 2, PAINT_YUV = 3, PAINT_BLACK = 4 }; +enum PAINT_MODE { PAINT_GREEN = 0, PAINT_ORIG = 1, PAINT_CHROMA = 2, PAINT_YUV = 3, PAINT_BLACK = 4, PAINT_GREEN2 = 5 }; enum BACKGROUND_MODE { BG_NONE = 0, BG_YUV = 1, BG_CHROMA = 2 }; class Vectorscope : public QWidget, public Ui::Vectorscope_UI { @@ -29,7 +31,6 @@ class Vectorscope : public QWidget, public Ui::Vectorscope_UI { public: Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *parent = 0); ~Vectorscope(); - QImage yuvColorWheel(const QSize& size, const unsigned char Y, const float scaling, const bool modifiedVersion, const bool circleOnly); protected: void paintEvent(QPaintEvent *); @@ -42,8 +43,12 @@ private: Monitor *m_clipMonitor; Render *m_activeRender; -// QMenu m_contextMenu; + ColorTools *m_colorTools; + ColorPlaneExport *m_colorPlaneExport; + QAction *m_aExportBackground; + QAction *m_aAxisEnabled; + QAction *m_a75PBox; /** How to represent the pixels on the scope (green, original color, ...) */ int iPaintMode; @@ -52,6 +57,7 @@ private: QPoint mapToCanvas(QRect inside, QPointF point); + QPoint centerPoint, pR75, pG75, pB75, pCy75, pMg75, pYl75; bool circleEnabled; QPoint mousePos; @@ -92,7 +98,6 @@ private: signals: void signalScopeCalculationFinished(); - void signalWheelCalculationFinished(); private slots: void slotMagnifyChanged(); diff --git a/src/widgets/colorplaneexport_ui.ui b/src/widgets/colorplaneexport_ui.ui new file mode 100644 index 00000000..10a01212 --- /dev/null +++ b/src/widgets/colorplaneexport_ui.ui @@ -0,0 +1,212 @@ + + + ColorPlaneExport_UI + + + + 0 + 0 + 488 + 213 + + + + Export color plane to PNG + + + + + 10 + 10 + 471 + 193 + + + + + 10 + + + + + Color space + + + + + + + + 0 + 0 + + + + + + + + Resolution + + + + + + + 5 + + + + + + + 5 + + + + + + + × + + + + + + + Filename + + + + + + + KFile::File|KFile::LocalOnly + + + + + + + + 8 + + + + (notranslate) Total pixels go here + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + The Y value describes the brightness of the colors. + + + + + + Qt::Horizontal + + + + + + + Y value + + + + + + + (notranslate) Y display + + + + + + + How much to zoom in + + + + + + Qt::Horizontal + + + + + + + (notranslate) % display + + + + + + + Scaling + + + + + + + + + KUrlRequester + QFrame +
kurlrequester.h
+ + + + + + buttonBox + accepted() + ColorPlaneExport_UI + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + ColorPlaneExport_UI + reject() + + + 316 + 260 + + + 286 + 274 + + + + + -- 2.39.2