[Traverso-commit] traverso/src core/ResourcesManager.h traverso/s...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/25 13:45:18

Modified files:
        src/core       : ResourcesManager.h 
        src/traverso/songcanvas: CurveView.cpp PluginChainView.cpp 
                                 PluginChainView.h PluginView.cpp 
                                 PluginView.h TrackView.cpp 
        src/traverso   : traverso.qrc 

Log message:
        * CurveView: never remove first node!
        * Plugin(Chain)View: small cleanups, align at left of the viewport, 
        independent of hscrollbar value.
        This obviously needs more work :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ResourcesManager.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PluginChainView.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PluginChainView.h?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PluginView.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PluginView.h?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackView.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.qrc?cvsroot=traverso&r1=1.16&r2=1.17

Patches:
Index: core/ResourcesManager.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/ResourcesManager.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- core/ResourcesManager.h     24 Apr 2007 23:57:10 -0000      1.3
+++ core/ResourcesManager.h     25 Apr 2007 13:45:18 -0000      1.4
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2006 Remon Sijrier 
+Copyright (C) 2006-2007 Remon Sijrier 
 
 This file is part of Traverso
 
@@ -17,7 +17,6 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: ResourcesManager.h,v 1.3 2007/04/24 23:57:10 r_sijrier Exp $
 */
 
 #ifndef RESOURCES_MANAGER_H

Index: traverso/songcanvas/CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- traverso/songcanvas/CurveView.cpp   25 Apr 2007 12:43:32 -0000      1.37
+++ traverso/songcanvas/CurveView.cpp   25 Apr 2007 13:45:18 -0000      1.38
@@ -471,6 +471,11 @@
 {
        PENTER;
        if (m_blinkingNode) {
+               // Never remove first node, temp fix since curves should have 
+               // some kind of 'fixed' default node that can't be removed ?
+               if (m_blinkingNode == m_nodeViews.first()) {
+                       return 0;
+               }
                CurveNode* node = m_blinkingNode->get_curve_node();
                m_blinkingNode = 0;
                return m_curve->remove_node(node);

Index: traverso/songcanvas/PluginChainView.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/PluginChainView.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- traverso/songcanvas/PluginChainView.cpp     20 Apr 2007 12:17:31 -0000      
1.9
+++ traverso/songcanvas/PluginChainView.cpp     25 Apr 2007 13:45:18 -0000      
1.10
@@ -17,14 +17,16 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-    $Id: PluginChainView.cpp,v 1.9 2007/04/20 12:17:31 r_sijrier Exp $
+    $Id: PluginChainView.cpp,v 1.10 2007/04/25 13:45:18 r_sijrier Exp $
 */
 
 #include "PluginChainView.h"
 
-#include <QGraphicsScene>
+#include <QScrollBar>
 
 #include "TrackView.h"
+#include "SongView.h"
+#include "ClipsViewPort.h"
 #include "PluginView.h"
 #include "Themer.h"
 #include <PluginChain.h>
@@ -42,15 +44,16 @@
 #include "Debugger.h"
 
 
-PluginChainView::PluginChainView(TrackView* parent, PluginChain* chain)
+PluginChainView::PluginChainView(SongView* sv, ViewItem* parent, PluginChain* 
chain)
        : ViewItem(parent, parent)
-       , m_trackView(parent)
+               , m_sv(sv)
+       , m_pluginchain(chain)
 {
        PENTERCONS;
        
-       setZValue(parent->zValue() + 1);
+       setZValue(parent->zValue() + 2);
        
-       m_trackView->scene()->addItem(this);
+       parent->scene()->addItem(this);
        m_boundingRect = QRectF(0, 0, 0, 44);
        
        QList<Plugin* >* pluginList = chain->get_plugin_list();
@@ -61,6 +64,8 @@
        
        connect(chain, SIGNAL(pluginAdded(Plugin*)), this, 
SLOT(add_new_pluginview(Plugin*)));
        connect(chain, SIGNAL(pluginRemoved(Plugin*)), this, 
SLOT(remove_pluginview(Plugin*)));
+       connect(m_sv->get_clips_viewport()->horizontalScrollBar(), 
SIGNAL(valueChanged(int)),
+               this, SLOT(scrollbar_value_changed(int)));
        
 }
 
@@ -71,7 +76,7 @@
 
 void PluginChainView::add_new_pluginview( Plugin * plugin )
 {
-       PluginView* view = new PluginView(m_trackView, plugin, 
m_pluginViews.size());
+       PluginView* view = new PluginView(this, m_pluginchain, plugin, 
m_pluginViews.size());
        scene()->addItem(view);
        
        int x = 6;
@@ -97,7 +102,14 @@
                m_pluginViews.at(i)->set_index(i);
        }
        
-       m_trackView->update();
+       int x = 6;
+       foreach(PluginView* view, m_pluginViews) {
+               view->setPos(x, m_boundingRect.height() - 
view->boundingRect().height());
+               x += view->boundingRect().width() + 6;
+       }
+       
+       
+       m_parentViewItem->update();
 }
 
 void PluginChainView::paint( QPainter * painter, const 
QStyleOptionGraphicsItem * option, QWidget * widget )
@@ -107,5 +119,10 @@
        Q_UNUSED(widget);
 }
 
+void PluginChainView::scrollbar_value_changed(int value)
+{
+       setPos(value, y());
+}
+
 //eof
 

Index: traverso/songcanvas/PluginChainView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/PluginChainView.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- traverso/songcanvas/PluginChainView.h       25 Jan 2007 19:21:20 -0000      
1.4
+++ traverso/songcanvas/PluginChainView.h       25 Apr 2007 13:45:18 -0000      
1.5
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-    $Id: PluginChainView.h,v 1.4 2007/01/25 19:21:20 r_sijrier Exp $
+    $Id: PluginChainView.h,v 1.5 2007/04/25 13:45:18 r_sijrier Exp $
 */
 
 #ifndef PLUGIN_CHAIN_VIEW_H
@@ -27,7 +27,7 @@
 #include "ViewItem.h"
 #include <QString>
 
-class TrackView;
+class SongView;
 class Plugin;
 class PluginChain;
 class PluginView;
@@ -37,18 +37,20 @@
         Q_OBJECT
 
 public:
-        PluginChainView(TrackView* view, PluginChain* chain);
+        PluginChainView(SongView* sv, ViewItem* parent, PluginChain* chain);
         ~PluginChainView();
 
         void paint(QPainter* painter, const QStyleOptionGraphicsItem *option, 
QWidget *widget);
 
 private:
-        TrackView*             m_trackView;
+       PluginChain* m_pluginchain;
+        SongView* m_sv;
         QList<PluginView* >    m_pluginViews;
 
 public slots:
         void add_new_pluginview(Plugin* plugin);
         void remove_pluginview(Plugin* plugin);
+       void scrollbar_value_changed(int value);
 };
 
 #endif

Index: traverso/songcanvas/PluginView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/PluginView.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- traverso/songcanvas/PluginView.cpp  20 Apr 2007 12:17:31 -0000      1.14
+++ traverso/songcanvas/PluginView.cpp  25 Apr 2007 13:45:18 -0000      1.15
@@ -23,11 +23,13 @@
 
 #include <QPainter>
 
-#include <Track.h>
 #include "TrackView.h"
+#include "PluginChainView.h"
 
-#include "Themer.h"
+#include <Themer.h>
 #include <Plugin.h>
+#include <PluginChain.h>
+#include <Track.h>
 #include <Utils.h>
 
 #if defined (LV2_SUPPORT)
@@ -38,9 +40,9 @@
 // in case we run with memory leak detection enabled!
 #include "Debugger.h"
 
-PluginView::PluginView(TrackView* parent, Plugin* plugin, int index)
+PluginView::PluginView(PluginChainView* parent, PluginChain* chain, Plugin* 
plugin, int index)
        : ViewItem(parent, plugin)
-       , m_trackView(parent)
+       , m_pluginchain(chain)
        ,  m_plugin(plugin)
        ,  m_index(index)
 {
@@ -52,7 +54,6 @@
 
        setZValue(parent->zValue() + 2);
        
-       m_track = m_trackView->get_track();
        m_name = plugin->get_name();
        
        QFontMetrics fm(themer()->get_font("Plugin:name"));
@@ -121,7 +122,7 @@
 
 Command* PluginView::remove_plugin()
 {
-       return m_track->remove_plugin(m_plugin);
+       return m_pluginchain->remove_plugin(m_plugin);
 }
 
 Plugin * PluginView::get_plugin( )

Index: traverso/songcanvas/PluginView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/PluginView.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- traverso/songcanvas/PluginView.h    17 Apr 2007 11:51:20 -0000      1.7
+++ traverso/songcanvas/PluginView.h    25 Apr 2007 13:45:18 -0000      1.8
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-    $Id: PluginView.h,v 1.7 2007/04/17 11:51:20 r_sijrier Exp $
+    $Id: PluginView.h,v 1.8 2007/04/25 13:45:18 r_sijrier Exp $
 */
 
 #ifndef PLUGIN_VIEW_H
@@ -32,8 +32,9 @@
 #endif
 
 class TrackView;
+class PluginChainView;
 class Plugin;
-class Track;
+class PluginChain;
 
 class PluginView : public ViewItem
 {
@@ -42,7 +43,7 @@
        Q_CLASSINFO("remove_plugin", tr("Remove"))
 
 public:
-        PluginView(TrackView* view, Plugin* plugin, int index);
+       PluginView(PluginChainView* pcv, PluginChain* chain, Plugin* plugin, 
int index);
         ~PluginView();
 
        enum {Type = UserType + 5};
@@ -54,8 +55,7 @@
        int type() const;
 
 private:
-        TrackView*     m_trackView;
-        Track*         m_track;
+       PluginChain*    m_pluginchain;
         Plugin*                m_plugin;
 
         int            m_index;

Index: traverso/songcanvas/TrackView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TrackView.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- traverso/songcanvas/TrackView.cpp   20 Apr 2007 13:16:49 -0000      1.29
+++ traverso/songcanvas/TrackView.cpp   25 Apr 2007 13:45:18 -0000      1.30
@@ -60,7 +60,7 @@
        m_panel = new TrackPanelView(this);
        calculate_bounding_rect();
        
-       m_pluginChainView = new PluginChainView(this, 
m_track->get_plugin_chain());
+       m_pluginChainView = new PluginChainView(m_sv, this, 
m_track->get_plugin_chain());
 
        connect(m_track, SIGNAL(audioClipAdded(AudioClip*)), this, 
SLOT(add_new_audioclipview(AudioClip*)));
        connect(m_track, SIGNAL(audioClipRemoved(AudioClip*)), this, 
SLOT(remove_audioclipview(AudioClip*)));

Index: traverso/traverso.qrc
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.qrc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- traverso/traverso.qrc       16 Apr 2007 18:44:26 -0000      1.16
+++ traverso/traverso.qrc       25 Apr 2007 13:45:18 -0000      1.17
@@ -1,6 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
        <qresource>
                <file 
alias="cursorDrag">../../resources/images/cursorDrag.xpm</file>
+               <file 
alias="cursorDragNode">../../resources/images/cursorDragNode.xpm</file>
                <file 
alias="cursorFloatOverClip">../../resources/images/cursorFloatOverClip.xpm</file>
                <file 
alias="cursorFloatOverPlugin">../../resources/images/cursorFloatOverPlugin.xpm</file>
                <file 
alias="cursorFloatOverFade">../../resources/images/cursorFloatOverFade.xpm</file>