[Traverso-commit] traverso/src/traverso CorrelationMeterWidget.cp...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/23 16:23:28

Modified files:
        src/traverso   : CorrelationMeterWidget.cpp 
                         SpectralMeterWidget.cpp SpectralMeterWidget.h 

Log message:
        * plugins sometimes stopped processing when moving the dockwidget 
around, should work again now

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.cpp?cvsroot=traverso&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.h?cvsroot=traverso&r1=1.21&r2=1.22

Patches:
Index: CorrelationMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- CorrelationMeterWidget.cpp  5 Nov 2007 19:19:24 -0000       1.26
+++ CorrelationMeterWidget.cpp  23 Nov 2007 16:23:28 -0000      1.27
@@ -279,7 +279,14 @@
 
 void CorrelationMeterView::show_event()
 {
+       if (m_song) {
+               if (m_meter) {
+                       
Command::process_command(m_song->get_plugin_chain()->add_plugin(m_meter, 
false));
+                       timer.start(40);
+               } else {
        set_song(m_song);
+               }
+       }
 }
 
 

Index: SpectralMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- SpectralMeterWidget.cpp     5 Nov 2007 19:19:24 -0000       1.45
+++ SpectralMeterWidget.cpp     23 Nov 2007 16:23:28 -0000      1.46
@@ -65,22 +65,45 @@
 
 void SpectralMeterWidget::resizeEvent( QResizeEvent *  )
 {
-       if (m_item) {
-               m_item->resize();
-       }
+       PENTER;
+       get_item()->resize();
 }
 
 void SpectralMeterWidget::hideEvent(QHideEvent * event)
 {
+       PENTER;
        QWidget::hideEvent(event);
-       if (m_item) {
-               m_item->hide_event();
-       }
+       get_item()->hide_event();
 }
 
 
 void SpectralMeterWidget::showEvent(QShowEvent * event)
 {
+       PENTER;
+       QWidget::showEvent(event);
+       get_item()->show_event();
+}
+
+QSize SpectralMeterWidget::minimumSizeHint() const
+{
+       return QSize(150, 50);
+}
+
+QSize SpectralMeterWidget::sizeHint() const
+{
+       return QSize(300, 50);
+}
+
+void SpectralMeterWidget::get_pointed_context_items(QList<ContextItem* > &list)
+{
+       QList<QGraphicsItem *> itemlist = 
items(cpointer().on_first_input_event_x(), cpointer().on_first_input_event_y());
+       foreach(QGraphicsItem* item, itemlist) {
+               list.append((ViewItem*)item);
+       }
+}
+
+SpectralMeterView * SpectralMeterWidget::get_item()
+{
        if (!m_item) {
                setMinimumWidth(40);
                setMinimumHeight(10);
@@ -103,27 +126,9 @@
                setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
        }
        
-       QWidget::showEvent(event);
-       m_item->show_event();
-}
-
-QSize SpectralMeterWidget::minimumSizeHint() const
-{
-       return QSize(150, 50);
+       return m_item;
 }
 
-QSize SpectralMeterWidget::sizeHint() const
-{
-       return QSize(300, 50);
-}
-
-void SpectralMeterWidget::get_pointed_context_items(QList<ContextItem* > &list)
-{
-       QList<QGraphicsItem *> itemlist = 
items(cpointer().on_first_input_event_x(), cpointer().on_first_input_event_y());
-       foreach(QGraphicsItem* item, itemlist) {
-               list.append((ViewItem*)item);
-       }
-}
 
 
 
@@ -398,7 +403,14 @@
 
 void SpectralMeterView::show_event()
 {
+       if (m_song) {
+               if (m_meter) {
+                       
Command::process_command(m_song->get_plugin_chain()->add_plugin(m_meter, 
false));
+                       timer.start(UPDATE_INTERVAL);
+               } else {
        set_song(m_song);
+               }
+       }
 }
 
 
@@ -1190,3 +1202,4 @@
 }
 
 //eof
+

Index: SpectralMeterWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- SpectralMeterWidget.h       25 Oct 2007 15:36:51 -0000      1.21
+++ SpectralMeterWidget.h       23 Nov 2007 16:23:28 -0000      1.22
@@ -76,6 +76,7 @@
        
 private:
        SpectralMeterView* m_item;
+       SpectralMeterView* get_item();
 };
 
 
@@ -98,7 +99,6 @@
        
        void resize();
        void hide_event();
-       void show_event();
 
 private:
        SpectralMeterWidget* m_widget;
@@ -158,6 +158,7 @@
        void            set_project( Project* );
        void            load_configuration();
        void            set_song( Song* );
+       void            show_event();
        
        Command*        edit_properties();
        Command*        set_mode();