Vectorscope:

[kdenlive] / src / vectorscope.cpp

diff --git a/src/vectorscope.cpp b/src/vectorscope.cpp
index 6660105e186f021416b37bca921e60f84725dc78..b046fa13f8c971a6f6b5226a7a6a69e3bcf82a4c 100644 (file)
--- a/src/vectorscope.cpp
+++ b/src/vectorscope.cpp
@@ -34,6 +34,13 @@ const QPointF YUV_Cy(.147, -.615);
 const QPointF YUV_Mg(.289,  .515);
 const QPointF YUV_Yl(-.437,  .100);
 
+const QPointF YPbPr_R(-.169, .5);
+const QPointF YPbPr_G(-.331, -.419);
+const QPointF YPbPr_B(.5, -.081);
+const QPointF YPbPr_Cy(.169, -.5);
+const QPointF YPbPr_Mg(.331, .419);
+const QPointF YPbPr_Yl(-.5, .081);
+
 
 Vectorscope::Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *parent) :
     AbstractScopeWidget(projMonitor, clipMonitor, parent),
@@ -56,6 +63,7 @@ Vectorscope::Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *pa
     ui->backgroundMode->addItem(i18n("None"), QVariant(BG_NONE));
     ui->backgroundMode->addItem(i18n("YUV"), QVariant(BG_YUV));
     ui->backgroundMode->addItem(i18n("Modified YUV (Chroma)"), QVariant(BG_CHROMA));
+    ui->backgroundMode->addItem("YPbPr", QVariant(BG_YPbPr)); // TODO translate after 0.7.8 release
 
     ui->sliderGain->setMinimum(0);
     ui->sliderGain->setMaximum(40);
@@ -86,6 +94,20 @@ Vectorscope::Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *pa
     m_menu->addAction(m_aAxisEnabled);
     b &= connect(m_aAxisEnabled, SIGNAL(changed()), this, SLOT(forceUpdateBackground()));
 
+    // TODO use i18n after the 0.7.8 release
+    m_menu->addSeparator()->setText("Color Space");
+    m_aColorSpace_YPbPr = new QAction("YPbPr", this);
+    m_aColorSpace_YPbPr->setCheckable(true);
+    m_aColorSpace_YUV = new QAction("YUV", this);
+    m_aColorSpace_YUV->setCheckable(true);
+    m_agColorSpace = new QActionGroup(this);
+    m_agColorSpace->addAction(m_aColorSpace_YPbPr);
+    m_agColorSpace->addAction(m_aColorSpace_YUV);
+    m_menu->addAction(m_aColorSpace_YPbPr);
+    m_menu->addAction(m_aColorSpace_YUV);
+    b &= connect(m_aColorSpace_YPbPr, SIGNAL(toggled(bool)), this, SLOT(slotColorSpaceChanged()));
+    b &= connect(m_aColorSpace_YUV, SIGNAL(toggled(bool)), this, SLOT(slotColorSpaceChanged()));
+
     Q_ASSERT(b);
 
     // To make the 1.0x text show
@@ -102,9 +124,12 @@ Vectorscope::~Vectorscope()
     delete m_colorPlaneExport;
     delete m_vectorscopeGenerator;
 
+    delete m_aColorSpace_YPbPr;
+    delete m_aColorSpace_YUV;
     delete m_aExportBackground;
     delete m_aAxisEnabled;
     delete m_a75PBox;
+    delete m_agColorSpace;
 }
 
 QString Vectorscope::widgetName() const { return QString("Vectorscope"); }
@@ -120,6 +145,8 @@ void Vectorscope::readConfig()
     ui->backgroundMode->setCurrentIndex(scopeConfig.readEntry("backgroundmode").toInt());
     ui->paintMode->setCurrentIndex(scopeConfig.readEntry("paintmode").toInt());
     ui->sliderGain->setValue(scopeConfig.readEntry("gain", 1));
+    m_aColorSpace_YPbPr->setChecked(scopeConfig.readEntry("colorspace_ypbpr", false));
+    m_aColorSpace_YUV->setChecked(!m_aColorSpace_YPbPr->isChecked());
 }
 
 void Vectorscope::writeConfig()
@@ -131,6 +158,7 @@ void Vectorscope::writeConfig()
     scopeConfig.writeEntry("backgroundmode", ui->backgroundMode->currentIndex());
     scopeConfig.writeEntry("paintmode", ui->paintMode->currentIndex());
     scopeConfig.writeEntry("gain", ui->sliderGain->value());
+    scopeConfig.writeEntry("colorspace_ypbpr", m_aColorSpace_YPbPr->isChecked());
     scopeConfig.sync();
 }
 
@@ -224,9 +252,12 @@ QImage Vectorscope::renderScope(uint accelerationFactor, const QImage qimage)
         qDebug() << "Scope size not known yet. Aborting.";
     } else {
 
+        VectorscopeGenerator::ColorSpace colorSpace = m_aColorSpace_YPbPr->isChecked() ?
+                                                      VectorscopeGenerator::ColorSpace_YPbPr : VectorscopeGenerator::ColorSpace_YUV;
+        VectorscopeGenerator::PaintMode paintMode = (VectorscopeGenerator::PaintMode) ui->paintMode->itemData(ui->paintMode->currentIndex()).toInt();
         scope = m_vectorscopeGenerator->calculateVectorscope(m_scopeRect.size(),
                                                              qimage,
-                                                             m_gain, (VectorscopeGenerator::PaintMode) ui->paintMode->itemData(ui->paintMode->currentIndex()).toInt(),
+                                                             m_gain, paintMode, colorSpace,
                                                              m_aAxisEnabled->isChecked(), accelerationFactor);
 
     }
@@ -250,6 +281,9 @@ QImage Vectorscope::renderBackground(uint)
     case BG_CHROMA:
         bg = m_colorTools->yuvColorWheel(m_scopeRect.size(), (unsigned char) 255, 1/VectorscopeGenerator::scaling, true, true);
         break;
+    case BG_YPbPr:
+        bg = m_colorTools->yPbPrColorWheel(m_scopeRect.size(), (unsigned char) 128, 1/VectorscopeGenerator::scaling, true);
+        break;
     default:
         qDebug() << "No background.";
         bg = QImage(cw, cw, QImage::Format_ARGB32);
@@ -269,29 +303,55 @@ QImage Vectorscope::renderBackground(uint)
     davinci.drawEllipse(0, 0, cw, cw);
 
     // Draw RGB/CMY points with 100% chroma
-    vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_R);
-    davinci.drawEllipse(vinciPoint, 4,4);
-    davinci.drawText(vinciPoint-QPoint(20, -10), "R");
+    if (m_aColorSpace_YUV->isChecked()) {
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_R);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint-QPoint(20, -10), "R");
+
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_G);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint-QPoint(20, 0), "G");
+
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_B);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint+QPoint(15, 10), "B");
+
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_Cy);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint+QPoint(15, -5), "Cy");
+
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_Mg);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint+QPoint(15, 10), "Mg");
+
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_Yl);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint-QPoint(25, 0), "Yl");
+    } else {
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YPbPr_R);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint-QPoint(20, -10), "R");
 
-    vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_G);
-    davinci.drawEllipse(vinciPoint, 4,4);
-    davinci.drawText(vinciPoint-QPoint(20, 0), "G");
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YPbPr_G);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint-QPoint(20, 0), "G");
 
-    vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_B);
-    davinci.drawEllipse(vinciPoint, 4,4);
-    davinci.drawText(vinciPoint+QPoint(15, 10), "B");
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YPbPr_B);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint+QPoint(15, 10), "B");
 
-    vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_Cy);
-    davinci.drawEllipse(vinciPoint, 4,4);
-    davinci.drawText(vinciPoint+QPoint(15, -5), "Cy");
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YPbPr_Cy);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint+QPoint(15, -5), "Cy");
 
-    vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_Mg);
-    davinci.drawEllipse(vinciPoint, 4,4);
-    davinci.drawText(vinciPoint+QPoint(15, 10), "Mg");
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YPbPr_Mg);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint+QPoint(15, 10), "Mg");
 
-    vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YUV_Yl);
-    davinci.drawEllipse(vinciPoint, 4,4);
-    davinci.drawText(vinciPoint-QPoint(25, 0), "Yl");
+        vinciPoint = m_vectorscopeGenerator->mapToCircle(m_scopeRect.size(), VectorscopeGenerator::scaling*YPbPr_Yl);
+        davinci.drawEllipse(vinciPoint, 4,4);
+        davinci.drawText(vinciPoint-QPoint(25, 0), "Yl");
+    }
 
     switch (ui->backgroundMode->itemData(ui->backgroundMode->currentIndex()).toInt()) {
     case BG_NONE:
@@ -389,3 +449,24 @@ void Vectorscope::slotBackgroundChanged()
     }
     forceUpdateBackground();
 }
+
+void Vectorscope::slotColorSpaceChanged()
+{
+    int index;
+    if (m_aColorSpace_YPbPr->isChecked()) {
+        if (ui->backgroundMode->itemData(ui->backgroundMode->currentIndex()).toInt() == BG_YUV) {
+            index = ui->backgroundMode->findData(QVariant(BG_YPbPr));
+            if (index >= 0) {
+                ui->backgroundMode->setCurrentIndex(index);
+            }
+        }
+    } else {
+        if (ui->backgroundMode->itemData(ui->backgroundMode->currentIndex()).toInt() == BG_YPbPr) {
+            index = ui->backgroundMode->findData(QVariant(BG_YUV));
+            if (index >= 0) {
+                ui->backgroundMode->setCurrentIndex(index);
+            }
+        }
+    }
+    forceUpdate();
+}