[Lmuse-cvs-traffic] muse/muse/arranger canvas.cpp,1.14,1.15 canvas.h,1.10,1.11

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/muse/arranger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17154/muse/arranger

Modified Files:
	canvas.cpp canvas.h 
Log Message:
pianoroll updates


Index: canvas.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/canvas.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** canvas.h	28 Sep 2005 20:26:37 -0000	1.10
--- canvas.h	3 Oct 2005 09:35:40 -0000	1.11
***************
*** 60,64 ****
        int dragy;
  
!       virtual void paint(QPainter&, QRect);
        void paintSubtrack(QPainter&, ArrangerTrack*, Track*, QRect);
        void drawWaveSubPart(QPainter& p, int, int, WavePart* wp, const QRect& r);
--- 60,64 ----
        int dragy;
  
!       virtual void paint(QPainter&, QRectF);
        void paintSubtrack(QPainter&, ArrangerTrack*, Track*, QRect);
        void drawWaveSubPart(QPainter& p, int, int, WavePart* wp, const QRect& r);
***************
*** 67,71 ****
        virtual void mousePress(QPoint);
        virtual void mouseMove(QPoint);
!       virtual void mouseRelease(QMouseEvent*);
        virtual void mouseDoubleClick(QPoint);
  
--- 67,71 ----
        virtual void mousePress(QPoint);
        virtual void mouseMove(QPoint);
!       virtual void mouseRelease(QPoint);
        virtual void mouseDoubleClick(QPoint);
  

Index: canvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/canvas.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** canvas.cpp	28 Sep 2005 20:26:37 -0000	1.14
--- canvas.cpp	3 Oct 2005 09:35:40 -0000	1.15
***************
*** 135,141 ****
  //---------------------------------------------------------
  
! void PartCanvas::paint(QPainter& p, QRect r)
        {
  // printf("canvas paint %d %d %d %d\n", r.x(), r.y(), r.width(), r.height());
        QFont f = font();
        f.setPointSize(8);
--- 135,143 ----
  //---------------------------------------------------------
  
! void PartCanvas::paint(QPainter& p, QRectF fr)
        {
+       QRect r = fr.toRect();
  // printf("canvas paint %d %d %d %d\n", r.x(), r.y(), r.width(), r.height());
+ 
        QFont f = font();
        f.setPointSize(8);
***************
*** 189,194 ****
                          }
  
!                   int x1 = r.x();
!                   int x2 = x1 + r.width();
                    if (x1 < pos)
                          x1 = pos;
--- 191,196 ----
                          }
  
!                   int x1 = from;
!                   int x2 = to;
                    if (x1 < pos)
                          x1 = pos;
***************
*** 899,905 ****
  //---------------------------------------------------------
  
! void PartCanvas::mouseRelease(QMouseEvent* event)
        {
!       int x = event->pos().x();
        int delta = startDrag.x() - x;
  
--- 901,907 ----
  //---------------------------------------------------------
  
! void PartCanvas::mouseRelease(QPoint pos)
        {
!       int x = pos.x();
        int delta = startDrag.x() - x;