[Lmuse-cvs-traffic] muse/muse/waveedit waveedit.cpp,1.22,1.23 waveedit.h,1.15,1.16 waveview.cpp,1.16,1.17 waveview.h,1.7,1.8

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

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

Modified Files:
	waveedit.cpp waveedit.h waveview.cpp waveview.h 
Log Message:
reorganized pianoroll editor and drum editor; part1


Index: waveview.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/waveedit/waveview.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** waveview.cpp	26 Sep 2005 18:26:21 -0000	1.16
--- waveview.cpp	28 Sep 2005 20:26:38 -0000	1.17
***************
*** 22,27 ****
  //---------------------------------------------------------
  
! WaveView::WaveView(GraphMidiEditor* pr, QWidget* parent)
!    : TimeCanvas(parent)
        {
        curPart = 0;
--- 22,27 ----
  //---------------------------------------------------------
  
! WaveView::WaveView(GraphMidiEditor* pr)
!    : TimeCanvas(TIME_CANVAS)
        {
        curPart = 0;
***************
*** 55,59 ****
        setHRange(start, end);
  
- //      connect(song, SIGNAL(posChanged(int,unsigned,bool)), SLOT(setPos(int,unsigned,bool)));
  //      connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
  //      songChanged(SC_SELECTION);
--- 55,58 ----

Index: waveedit.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/waveedit/waveedit.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** waveedit.h	26 Sep 2005 18:26:21 -0000	1.15
--- waveedit.h	28 Sep 2005 20:26:38 -0000	1.16
***************
*** 27,31 ****
  class WaveEdit : public GraphMidiEditor {
        WaveView* view;
- //      QSlider* ymag;
        QToolBar* tools;
        QToolBar* tb1;
--- 27,30 ----
***************
*** 37,41 ****
  
        Q_OBJECT
-       virtual void closeEvent(QCloseEvent*);
        virtual void resizeEvent(QResizeEvent* ev);
        virtual void keyPressEvent(QKeyEvent*);
--- 36,39 ----
***************
*** 56,62 ****
        void configChanged();
  
-    signals:
-       void deleted(int);
- 
     public:
        WaveEdit(PartList*);
--- 54,57 ----

Index: waveview.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/waveedit/waveview.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** waveview.h	26 Sep 2005 18:26:21 -0000	1.7
--- waveview.h	28 Sep 2005 20:26:38 -0000	1.8
***************
*** 83,87 ****
  
     public:
!       WaveView(GraphMidiEditor*, QWidget*);
        QString getCaption() const;
        void cmd(int n);
--- 83,87 ----
  
     public:
!       WaveView(GraphMidiEditor*);
        QString getCaption() const;
        void cmd(int n);

Index: waveedit.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/waveedit/waveedit.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** waveedit.cpp	26 Sep 2005 18:26:21 -0000	1.22
--- waveedit.cpp	28 Sep 2005 20:26:38 -0000	1.23
***************
*** 6,20 ****
  //=========================================================
  
- #include "al/xml.h"
  #include "waveedit.h"
- // #include "widgets/mtscale.h"
- // #include "widgets/scrollscale.h"
- // #include "widgets/intlabel.h"
- #include "globals.h"
  #include "waveview.h"
- #include "widgets/utils.h"
  #include "song.h"
  #include "awl/poslabel.h"
- #include "gconfig.h"
  #include "esettings.h"
  #include "al/tempo.h"
--- 6,13 ----
***************
*** 27,41 ****
  
  //---------------------------------------------------------
- //   closeEvent
- //---------------------------------------------------------
- 
- void WaveEdit::closeEvent(QCloseEvent* e)
-       {
-       emit deleted((int)this);
-       e->accept();
-       //!@TODO: Set zoom, offset, etc...
-       }
- 
- //---------------------------------------------------------
  //   WaveEdit
  //---------------------------------------------------------
--- 20,23 ----
***************
*** 145,156 ****
  
  //      hscroll = new ScrollScale(1, -32768, xscale, 10000, Qt::Horizontal, mainw, 0, true, 10000.0);
!       view = new WaveView(this, mainw);
        view->setRaster(0);
!       connect(song, SIGNAL(posChanged(int,unsigned,bool)), view, SLOT(setLocatorPos(int,unsigned)));
        view->setLocatorPos(0, song->cpos());
        view->setLocatorPos(1, song->lpos());
        view->setLocatorPos(2, song->rpos());
        connect(view, SIGNAL(cursorPos(unsigned)), SIGNAL(setTime(unsigned)));
!       connect(view, SIGNAL(posChanged(int,unsigned)), song, SLOT(setTickPos(int,unsigned)));
  
  //      wview   = view;   // HACK!
--- 127,138 ----
  
  //      hscroll = new ScrollScale(1, -32768, xscale, 10000, Qt::Horizontal, mainw, 0, true, 10000.0);
!       view = new WaveView(this);
        view->setRaster(0);
!       connect(song, SIGNAL(posChanged(int,const AL::Pos&,bool)), view, SLOT(setLocatorPos(int,const AL::Pos&)));
        view->setLocatorPos(0, song->cpos());
        view->setLocatorPos(1, song->lpos());
        view->setLocatorPos(2, song->rpos());
        connect(view, SIGNAL(cursorPos(unsigned)), SIGNAL(setTime(unsigned)));
!       connect(view, SIGNAL(posChanged(int,const AL::Pos&)), song, SLOT(setPos(int,const AL::Pos&)));
  
  //      wview   = view;   // HACK!
***************
*** 163,166 ****
--- 145,153 ----
  //      time->setOrigin(0, 0);
  
+       QWidget* mw = new QWidget;
+       setCentralWidget(mw);
+       QGridLayout* mainGrid = new QGridLayout;
+       mw->setLayout(mainGrid);
+ 
        mainGrid->setRowStretch(0, 100);
        mainGrid->setColStretch(0, 100);