[Gtab-cvs] src/dataobjects MeasureData.cpp,1.18,1.19 MeasureData.h,1.13,1.14

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

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

Modified Files:
	MeasureData.cpp MeasureData.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: MeasureData.cpp
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/MeasureData.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MeasureData.cpp	28 Feb 2006 07:15:24 -0000	1.18
--- MeasureData.cpp	5 Apr 2006 15:01:16 -0000	1.19
***************
*** 43,47 ****
  
  MeasureData::MeasureData()
!  :  MeasureDataAncestor(), keySignature_(0), showKeySignature_(false), beats_(4), beatValue_(4),
      showTimeSignature_(true)
  {
--- 43,47 ----
  
  MeasureData::MeasureData()
!  :  MeasureDataAncestor(), keySignature_(0), showKeySignature_(false),
      showTimeSignature_(true)
  {
***************
*** 49,58 ****
  
  MeasureData::MeasureData(int keySignature, bool showKeySignature)
!  :  MeasureDataAncestor(), keySignature_(keySignature), showKeySignature_(showKeySignature), beats_(4), beatValue_(4)
! {
! }
! 
! MeasureData::MeasureData(int beats, int beatValue, bool showTimeSignature)
!  :  MeasureDataAncestor(), beats_(beats), beatValue_(beatValue), showTimeSignature_(showTimeSignature)
  {
  }
--- 49,53 ----
  
  MeasureData::MeasureData(int keySignature, bool showKeySignature)
!  :  MeasureDataAncestor(), keySignature_(keySignature), showKeySignature_(showKeySignature)
  {
  }
***************
*** 62,69 ****
  }
  
! void MeasureData::getTimeSignature(int& beats, int& beatValue) const 
  { 
!     beats = beats_; 
!     beatValue = beatValue_;
  }
  
--- 57,68 ----
  }
  
! void MeasureData::setTimeSignature(TimeSignature ts)
! {
!     timeSignature_ = ts;
! }
! 
! TimeSignature& MeasureData::getTimeSignature()
  { 
!     return timeSignature_;
  }
  

Index: MeasureData.h
===================================================================
RCS file: /cvsroot/gtab/src/dataobjects/MeasureData.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MeasureData.h	24 Feb 2006 14:31:01 -0000	1.13
--- MeasureData.h	5 Apr 2006 15:01:16 -0000	1.14
***************
*** 34,37 ****
--- 34,38 ----
  #include "dataobject.h"
  #include "ColumnData.h"
+ #include "timesig.h"
  
  extern const int TIMESIG_SPACE;
***************
*** 50,54 ****
      MeasureData();
  	MeasureData(int keySignature, bool showKeySignature = false);
- 	MeasureData(int beats, int beatValue, bool showTimeSignature = false);
  	virtual ~MeasureData();
  	
--- 51,54 ----
***************
*** 57,62 ****
  	void setShowKeySignature(bool show) { showKeySignature_ = show; }
  	bool showKeySignature() const { return showKeySignature_; }
! 	void setTimeSignature(int beats, int beatValue);
! 	void getTimeSignature(int& beats, int& beatValue) const;
  	bool showTimeSignature() const { return showTimeSignature_; }
      ColumnData* newColumn();
--- 57,62 ----
  	void setShowKeySignature(bool show) { showKeySignature_ = show; }
  	bool showKeySignature() const { return showKeySignature_; }
! 	void setTimeSignature(TimeSignature ts);
! 	TimeSignature& getTimeSignature();
  	bool showTimeSignature() const { return showTimeSignature_; }
      ColumnData* newColumn();
***************
*** 68,75 ****
      int  keySignature_;
      bool showKeySignature_;
-     
-     int  beats_;
-     int  beatValue_;
      bool showTimeSignature_;
  };
  
--- 68,74 ----
      int  keySignature_;
      bool showKeySignature_;
      bool showTimeSignature_;
+     
+     TimeSignature timeSignature_;
  };