audiosignal now dockable and horizontal-/verticalable

but some optimize must follow

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

diff --git a/src/audiosignal.cpp b/src/audiosignal.cpp
index 36de4b825a7547ab3a262ed7a4bccc436c17e531..0b0b92cea8dffff40e23e5b7791f6704fb404b44 100644 (file)
--- a/src/audiosignal.cpp
+++ b/src/audiosignal.cpp
@@ -32,6 +32,7 @@ AudioSignal::AudioSignal(QWidget *parent): QWidget(parent)
     //label=new QLabel();
     //vbox->addWidget(label);
     setMinimumHeight(10);
+    setMinimumWidth(10);
     col << Qt::green <<  Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green ;
     col << Qt::yellow <<  Qt::yellow << Qt::yellow << Qt::yellow << Qt::yellow  ;
     col << Qt::darkYellow << Qt::darkYellow << Qt::darkYellow;
@@ -64,18 +65,24 @@ void AudioSignal::paintEvent(QPaintEvent* /*e*/)
     //p.fillRect(0,0,(unsigned char)channels[0]*width()/255,height()/2,QBrush(Qt::SolidPattern));
     //p.fillRect(0,height()/2,(unsigned char)channels[1]*width()/255,height()/2,QBrush(Qt::SolidPattern));
     int numchan = channels.size();
+    bool horiz=width() > height();
     for (int i = 0; i < numchan; i++) {
-        int maxx = (unsigned char)channels[i] * width() / 127;
-        int xdelta = width() / 20;
-        int y1 = height() * i / numchan;
-        int _h = height() / numchan - 1;
+        int maxx= (unsigned char)channels[i] * (horiz ? width() : height() ) / 127;
+        int xdelta=(horiz ? width():height() )  /20 ;
+        int _y2= (horiz ?  height() :width () ) / numchan - 1  ;
+        int _y1=(horiz ? height():width() ) *i/numchan;
+        int _x2=maxx >  xdelta ? xdelta - (horiz?1:3) : maxx - (horiz ?1 :3 );
+
         for (int x = 0; x < 20; x++) {
+            int _x1= x *xdelta;
             if (maxx > 0) {
-                p.fillRect(x * xdelta, y1, maxx > xdelta ? xdelta - 1 : maxx - 1, _h, QBrush(col.at(x), Qt::SolidPattern));
+                //p.fillRect(x * xdelta, y1, maxx > xdelta ? xdelta - 1 : maxx - 1, _h, QBrush(col.at(x), Qt::SolidPattern));
+                p.fillRect(horiz?_x1:_y1, horiz?_y1:height()-_x1, horiz?_x2:_y2,horiz? _y2:-_x2, QBrush(col.at(x), Qt::SolidPattern));
                 maxx -= xdelta;
             }
         }
-        p.fillRect(peeks.at(i)*width()/127-2,y1,3,_h,QBrush(Qt::black,Qt::SolidPattern));
+        int xp=peeks.at(i)*(horiz?width():height())/127-2;
+        p.fillRect(horiz?xp:_y1,horiz?_y1:height()-xdelta-xp,horiz?3:_y2,horiz?_y2:3,QBrush(Qt::black,Qt::SolidPattern));
     }
     p.end();
 }

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 10224477cfaf6c3703fb01461c75b1cd284c309b..811c5c58743eb97f042bb273d063750a70e766e2 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -39,6 +39,7 @@
 #include "transitionsettings.h"
 #include "renderwidget.h"
 #include "renderer.h"
+#include "audiosignal.h"
 #ifndef NO_JOGSHUTTLE
 #include "jogshuttle.h"
 #endif /* NO_JOGSHUTTLE */
@@ -267,6 +268,20 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString &
     m_scopesList.append(m_histogramDock);
 
 
+    m_audiosignal = new AudioSignal(m_projectMonitor);
+    m_audiosignalDock = new QDockWidget(i18n("AudioSignal"), this);
+    m_audiosignalDock->setObjectName("audiosignal");
+    m_audiosignalDock->setWidget(m_audiosignal);
+       addDockWidget(Qt::TopDockWidgetArea, m_audiosignalDock);
+    if (m_projectMonitor){
+       connect(m_projectMonitor->render, SIGNAL(showAudioSignal(const QByteArray&)), m_audiosignal, SLOT(showAudio(const QByteArray&)) );
+       }
+    if (m_clipMonitor){
+       connect(m_clipMonitor->render, SIGNAL(showAudioSignal(const QByteArray&)), m_audiosignal, SLOT(showAudio(const QByteArray&)) );
+       }
+    //connect(m_histogramDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+    //connect(m_histogram, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+
     m_undoViewDock = new QDockWidget(i18n("Undo History"), this);
     m_undoViewDock->setObjectName("undo_history");
     m_undoView = new QUndoView();

diff --git a/src/mainwindow.h b/src/mainwindow.h
index c0c12d74910ef327d06ea09c8f6552f95aaf2eda..723ca769c73c15ac172e212d8403ba82e1c995d1 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -66,7 +66,7 @@ class Vectorscope;
 class Waveform;
 class RGBParade;
 class KActionCollection;
-
+class AudioSignal;
 
 class MainWindow : public KXmlGuiWindow
 {
@@ -172,6 +172,9 @@ private:
     QDockWidget *m_histogramDock;
     Histogram *m_histogram;
 
+    QDockWidget *m_audiosignalDock;
+    AudioSignal *m_audiosignal;
+
     QDockWidget *m_undoViewDock;
     QUndoView *m_undoView;
     QUndoGroup *m_commandStack;

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 3424e8eecbb6cf44cd00d0ffee69b97819d2a751..366d0a2b797f29b9cd954d66b7db56ec6d93d508 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -26,7 +26,6 @@
 #include "monitorscene.h"
 #include "abstractclipitem.h"
 #include "kdenlivesettings.h"
-#include "audiosignal.h"
 
 #include <KDebug>
 #include <KLocale>
@@ -49,7 +48,6 @@
 Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) :
     QWidget(parent),
     render(NULL),
-    m_audiosignal(NULL),
     m_name(name),
     m_monitorManager(manager),
     m_currentClip(NULL),
@@ -158,12 +156,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
         m_monitorRefresh->setRenderer(render);
     }
 
-    QVBoxLayout *audioBox = new QVBoxLayout;
-    audioBox->setContentsMargins(0, 0, 0, 0);
-    m_audiosignal = new AudioSignal();
-    audioBox->addWidget(m_audiosignal);
-    m_ui.audio_monitor->setLayout(audioBox);
-    connect(render, SIGNAL(showAudioSignal(const QByteArray)), m_audiosignal, SLOT(showAudio(const QByteArray)));
     connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int)));
     connect(render, SIGNAL(durationChanged(int)), this, SLOT(adjustRulerSize(int)));
     connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int)));

diff --git a/src/monitor.h b/src/monitor.h
index 7f7a7ba6f1f32a543b28735a971617ca691e6e7b..c598dffc247527acb4e8310b76c446d824453aaa 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -44,7 +44,6 @@ class Transition;
 class ClipItem;
 class QGraphicsView;
 class QGraphicsPixmapItem;
-class AudioSignal;
 
 class MonitorRefresh : public QWidget
 {
@@ -111,7 +110,6 @@ protected:
 
 private:
     Ui::Monitor_UI m_ui;
-    AudioSignal *m_audiosignal;
     QString m_name;
     MonitorManager *m_monitorManager;
     DocClipBase *m_currentClip;