Levels: Can be displayed unscaled.

svn path=/trunk/kdenlive/; revision=4626

diff --git a/src/levels.cpp b/src/levels.cpp
index 4ab37633984a15f1bf4dc66bd9c3b0ba863ded64..0c6ebe7a6b928189d2d773d170c912732e71dc74 100644 (file)
--- a/src/levels.cpp
+++ b/src/levels.cpp
@@ -8,6 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#include <QMenu>
 #include <QTime>
 #include "levelsgenerator.h"
 #include "levels.h"
@@ -24,17 +25,26 @@ Levels::Levels(Monitor *projMonitor, Monitor *clipMonitor, QWidget *parent) :
     ui->cbG->setChecked(true);
     ui->cbB->setChecked(true);
 
+
+    m_aUnscaled = new QAction(i18n("Unscaled"), this);
+    m_aUnscaled->setCheckable(true);
+    m_menu->addSeparator();
+    m_menu->addAction(m_aUnscaled);
+
     bool b = true;
     b &= connect(ui->cbY, SIGNAL(toggled(bool)), this, SLOT(forceUpdateScope()));
     b &= connect(ui->cbR, SIGNAL(toggled(bool)), this, SLOT(forceUpdateScope()));
     b &= connect(ui->cbG, SIGNAL(toggled(bool)), this, SLOT(forceUpdateScope()));
     b &= connect(ui->cbB, SIGNAL(toggled(bool)), this, SLOT(forceUpdateScope()));
+    b &= connect(m_aUnscaled, SIGNAL(toggled(bool)), this, SLOT(forceUpdateScope()));
     Q_ASSERT(b);
+
 }
 
 Levels::~Levels()
 {
     delete ui;
+    delete m_aUnscaled;
 }
 
 QString Levels::widgetName() const { return QString("Levels"); }
@@ -66,9 +76,9 @@ QImage Levels::renderScope(uint accelFactor)
                                | (ui->cbB->isChecked() ? 1 : 0) * LevelsGenerator::ComponentB;
 
     QImage levels = m_levelsGenerator->calculateLevels(m_scopeRect.size(), m_activeRender->extractFrame(m_activeRender->seekFramePosition()),
-                                                       componentFlags, false, accelFactor);
+                                                       componentFlags, m_aUnscaled->isChecked(), accelFactor);
 
-    emit signalScopeRenderingFinished(0, 1);
+    emit signalScopeRenderingFinished(start.elapsed(), accelFactor);
     return levels;
 }
 QImage Levels::renderBackground(uint)

diff --git a/src/levels.h b/src/levels.h
index 43df14e68666d99b76e7f42aad5e1817a7df3d4c..0a67bfc2f5cfd90898b9f729fe3b9d47f03e8e76 100644 (file)
--- a/src/levels.h
+++ b/src/levels.h
@@ -27,6 +27,7 @@ public:
 
 private:
     LevelsGenerator *m_levelsGenerator;
+    QAction *m_aUnscaled;
 
     QRect scopeRect();
     bool isHUDDependingOnInput() const;

diff --git a/src/widgets/levels_ui.ui b/src/widgets/levels_ui.ui
index 5bd67cd732113c186a554b0b283e6aa51affa5e5..227e9767af4c07733eb81ad0674b224dc6ac4284 100644 (file)
--- a/src/widgets/levels_ui.ui
+++ b/src/widgets/levels_ui.ui
@@ -14,35 +14,35 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+   <item row="0" column="1">
     <widget class="QCheckBox" name="cbY">
      <property name="text">
       <string>Y</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="0" column="2">
     <widget class="QCheckBox" name="cbR">
      <property name="text">
       <string>R</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="2">
+   <item row="0" column="3">
     <widget class="QCheckBox" name="cbG">
      <property name="text">
       <string>G</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="3">
+   <item row="0" column="4">
     <widget class="QCheckBox" name="cbB">
      <property name="text">
       <string>B</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="4">
+   <item row="1" column="1" colspan="4">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -55,6 +55,13 @@
      </property>
     </spacer>
    </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="lblComponents">
+     <property name="text">
+      <string>Components</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>