[Gtab-cvs] src/drawobjects NoteMeasureDrawer.cpp,1.13,1.14 NoteStaffDrawer.cpp,1.22,1.23

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

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

Modified Files:
	NoteMeasureDrawer.cpp NoteStaffDrawer.cpp 
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: NoteMeasureDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/NoteMeasureDrawer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NoteMeasureDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.13
--- NoteMeasureDrawer.cpp	5 Apr 2006 15:01:17 -0000	1.14
***************
*** 64,74 ****
      if (data->showTimeSignature()) {
          wxString str;
!         int beats, beatvalue;
!         data->getTimeSignature(beats, beatvalue);
!         str << beatvalue;
          wxCoord charHeight, charWidth;
          dc_->GetTextExtent(str, &charWidth, &charHeight);
          dc_->DrawText(str, keypadding_, -16);
!         str = wxT(""); str << beats;
          dc_->DrawText(str, keypadding_, -32);
      }
--- 64,84 ----
      if (data->showTimeSignature()) {
          wxString str;
!         
!         TimeSignature ts = data->getTimeSignature();
!         if (ts.useCommonTime()) {
!             str << wxChar(0x63);
!             dc_->DrawText(str, keypadding_, -24);
!             return;
!         }
!         if (ts.useCutTime()) {
!             str << wxChar(0x43);
!             dc_->DrawText(str, keypadding_, -24);
!             return;
!         }
!         str << ts.getBeatValue();
          wxCoord charHeight, charWidth;
          dc_->GetTextExtent(str, &charWidth, &charHeight);
          dc_->DrawText(str, keypadding_, -16);
!         str = wxT(""); str << ts.getBeats();
          dc_->DrawText(str, keypadding_, -32);
      }

Index: NoteStaffDrawer.cpp
===================================================================
RCS file: /cvsroot/gtab/src/drawobjects/NoteStaffDrawer.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** NoteStaffDrawer.cpp	28 Feb 2006 07:15:24 -0000	1.22
--- NoteStaffDrawer.cpp	5 Apr 2006 15:01:17 -0000	1.23
***************
*** 65,69 ****
              wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("MusicalSymbols")));
  
! 	if (data->getClefType() == F_CLEF)	
  		dc_->DrawText(wxT("?"), 0, 0);
  	else
--- 65,69 ----
              wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("MusicalSymbols")));
  
! 	if (data->getClefType() == F_CLEF)
  		dc_->DrawText(wxT("?"), 0, 0);
  	else