[Lmuse-cvs-traffic] muse/muse/midiedit ecanvas.cpp,1.51,1.52 midieditor.cpp,1.1,1.2 midieditor.h,1.1,1.2 pianoroll.cpp,1.66,1.67

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

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

Modified Files:
	ecanvas.cpp midieditor.cpp midieditor.h pianoroll.cpp 
Log Message:
fix for last update


Index: midieditor.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/midieditor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** midieditor.h	23 Jan 2006 17:41:21 -0000	1.1
--- midieditor.h	23 Jan 2006 19:44:28 -0000	1.2
***************
*** 59,62 ****
--- 59,64 ----
        void genPartlist();
        void writeStatus(Xml&) const;
+ 
+    protected slots:
        void songChanged(int);
  

Index: midieditor.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/midieditor.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** midieditor.cpp	23 Jan 2006 17:41:21 -0000	1.1
--- midieditor.cpp	23 Jan 2006 19:44:28 -0000	1.2
***************
*** 30,33 ****
--- 30,34 ----
        tools   = 0;
        toolbar = 0;
+       connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
        }
  
***************
*** 110,115 ****
  	{
        settings.quant = val;
!       toolbar->setQuant(val);
!       if (canvas()->part())
              canvas()->part()->setQuant(val);
        }
--- 111,117 ----
  	{
        settings.quant = val;
!       if (toolbar)
! 	      toolbar->setQuant(val);
!       if (canvas() && canvas()->part())
              canvas()->part()->setQuant(val);
        }
***************
*** 122,128 ****
  	{
        settings.raster = val;
!       toolbar->setRaster(val);
!       if (canvas()->part())
              canvas()->part()->setRaster(val);
        }
  
--- 124,133 ----
  	{
        settings.raster = val;
!       if (toolbar)
! 	      toolbar->setRaster(val);
!       if (canvas() && canvas()->part()) {
! printf("setPartRaster %d\n", val);
              canvas()->part()->setRaster(val);
+             }
        }
  

Index: pianoroll.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/pianoroll.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** pianoroll.cpp	23 Jan 2006 17:41:21 -0000	1.66
--- pianoroll.cpp	23 Jan 2006 19:44:28 -0000	1.67
***************
*** 46,49 ****
--- 46,50 ----
        _playEvents = false;
  
+       tcanvas = new PianoCanvas(this);
        QMenuBar* mb = menuBar();
  
***************
*** 221,226 ****
        addToolBar(info);
  
-       tcanvas = new PianoCanvas(this);
- 
        setCentralWidget(tcanvas);
        tcanvas->setCornerWidget(new QSizeGrip(tcanvas));
--- 222,225 ----

Index: ecanvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/ecanvas.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** ecanvas.cpp	23 Jan 2006 17:41:21 -0000	1.51
--- ecanvas.cpp	23 Jan 2006 19:44:28 -0000	1.52
***************
*** 51,55 ****
              }
        else {
!             setCurPart(editor->parts()->begin()->second);
              }
        }
--- 51,59 ----
              }
        else {
!             curPart = editor->parts()->begin()->second;
!       	if (curPart->raster() != -1)
!             	editor->setRaster(curPart->raster());
! 	      if (curPart->quant() != -1)
!       	      editor->setQuant(curPart->quant());
              }
        }
***************
*** 164,167 ****
--- 168,172 ----
              }
        emit selectionChanged(x, event, part);
+       setPart(*curPart, curPart->end());
        widget()->update();
        }
***************
*** 1263,1267 ****
  
  //---------------------------------------------------------
! //   curPartChanged
  //---------------------------------------------------------
  
--- 1268,1272 ----
  
  //---------------------------------------------------------
! //   setCurPart
  //---------------------------------------------------------
  
***************
*** 1275,1278 ****
--- 1280,1285 ----
        if (curPart->quant() != -1)
              editor->setQuant(curPart->quant());
+       curPart->setRaster(editor->raster());
+       curPart->setQuant(editor->quant());
        setPart(*curPart, curPart->end());
        editor->setWindowTitle(getCaption());