[Gtab-cvs] src/factory DefaultDrawerFactory.cpp,1.45,1.46 DefaultDrawerFactory.h,1.15,1.16

[m0ta <m0...@us...>]

Update of /cvsroot/gtab/src/factory
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25877/factory

Modified Files:
	DefaultDrawerFactory.cpp DefaultDrawerFactory.h 
Log Message:
* midi stack takes all pages into account, though 2nd page plays one quarter after the other
* time signature is used, now everything works even the common time symbols
* clef works

Index: DefaultDrawerFactory.cpp
===================================================================
RCS file: /cvsroot/gtab/src/factory/DefaultDrawerFactory.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** DefaultDrawerFactory.cpp	28 Feb 2006 07:15:24 -0000	1.45
--- DefaultDrawerFactory.cpp	5 Apr 2006 15:01:18 -0000	1.46
***************
*** 35,38 ****
--- 35,39 ----
  // -- memory leak detection
  #include "DefaultDrawerFactory.h"
+ #include "timesig.h"
  #include "../drawobjects/CursorDrawer.h"
  #include "../dataobjects/documentdata.h"
***************
*** 147,151 ****
  }
  
! PageData* DefaultDrawerFactory::createPage(DocumentData* dd, const wxString& descr, int strings, int key)
  {
      PageData* pd = new PageData(descr, strings);
--- 148,153 ----
  }
  
! PageData* DefaultDrawerFactory::createPage(DocumentData* dd, const wxString& descr, 
!     int strings, int key, int clef, TimeSignature ts)
  {
      PageData* pd = new PageData(descr, strings);
***************
*** 154,161 ****
      SectionData* sectd = new SectionData;
      *pd << sectd;
!     StaffData* staffd = new StaffData(strings);
      *sectd << staffd;
      MeasureData* measd = new MeasureData;
      measd->setShowKeySignature(true);
      measd->setKeySignature(key);
      *staffd << measd;
--- 156,164 ----
      SectionData* sectd = new SectionData;
      *pd << sectd;
!     StaffData* staffd = new StaffData(strings, clef);
      *sectd << staffd;
      MeasureData* measd = new MeasureData;
      measd->setShowKeySignature(true);
+     measd->setTimeSignature(ts);
      measd->setKeySignature(key);
      *staffd << measd;

Index: DefaultDrawerFactory.h
===================================================================
RCS file: /cvsroot/gtab/src/factory/DefaultDrawerFactory.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DefaultDrawerFactory.h	7 Jan 2006 17:52:21 -0000	1.15
--- DefaultDrawerFactory.h	5 Apr 2006 15:01:18 -0000	1.16
***************
*** 41,44 ****
--- 41,45 ----
  class PageData;
  class DrawObject;
+ class TimeSignature;
  
  class DefaultDrawerFactory :
***************
*** 64,68 ****
      
      // add description, maybe initial values
!     virtual PageData* createPage(DocumentData*, const wxString& descr, int strings, int key);
      // 
  /*    virtual SectionData* createSection(PageData*); 
--- 65,70 ----
      
      // add description, maybe initial values
!     virtual PageData* createPage(DocumentData*, const wxString& descr, 
!                 int strings, int key, int clef, TimeSignature ts);
      // 
  /*    virtual SectionData* createSection(PageData*);