[Gtab-cvs] src addpagedlg.cpp,1.19,1.20 controller.cpp,1.78,1.79 controller.h,1.42,1.43 frame.cpp,1.102,1.103 timesig.cpp,1.12,1.13 timesig.h,1.8,1.9 gui.xrc,1.14,NONE

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

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

Modified Files:
	addpagedlg.cpp controller.cpp controller.h frame.cpp 
	timesig.cpp timesig.h 
Removed Files:
	gui.xrc 
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: addpagedlg.cpp
===================================================================
RCS file: /cvsroot/gtab/src/addpagedlg.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** addpagedlg.cpp	28 Feb 2006 07:15:23 -0000	1.19
--- addpagedlg.cpp	5 Apr 2006 15:01:15 -0000	1.20
***************
*** 284,290 ****
      long beatvalue = -1;
      str.ToLong(&beatvalue);
!     TimeSignature t(spinControlBeats_->GetValue(), beatvalue,
!     	checkBoxCommonTime_->GetValue(), checkBoxCutTime_->GetValue());
! 	return t;
  }
  
--- 284,293 ----
      long beatvalue = -1;
      str.ToLong(&beatvalue);
!     TimeSignature ts;
!     ts.setBeats(spinControlBeats_->GetValue());
!     ts.setBeatValue(beatvalue);
!     ts.setUseCommonTime(checkBoxCommonTime_->GetValue());
!     ts.setUseCutTime(checkBoxCutTime_->GetValue());
! 	return ts;
  }
  

--- gui.xrc DELETED ---

Index: frame.cpp
===================================================================
RCS file: /cvsroot/gtab/src/frame.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** frame.cpp	28 Feb 2006 07:15:24 -0000	1.102
--- frame.cpp	5 Apr 2006 15:01:15 -0000	1.103
***************
*** 481,485 ****
      AddPageDialog dialog(this);
      if (dialog.ShowModal() == wxID_OK) {
! 		controller_->addPage(dialog.getCaption(), dialog.getStrings(), dialog.getKeySig());
  	}
  }
--- 481,486 ----
      AddPageDialog dialog(this);
      if (dialog.ShowModal() == wxID_OK) {
!         TimeSignature ts = dialog.getTimeSig();
! 		controller_->addPage(dialog.getCaption(), dialog.getStrings(), dialog.getKeySig(), dialog.getClef(), dialog.getTimeSig());
  	}
  }

Index: controller.h
===================================================================
RCS file: /cvsroot/gtab/src/controller.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** controller.h	26 Feb 2006 13:46:08 -0000	1.42
--- controller.h	5 Apr 2006 15:01:15 -0000	1.43
***************
*** 64,68 ****
      // creation
      DocumentData* createEmptyDocument();
! 	void addPage(const wxString& descr, int strings, int key);	
  	void addSection();					
  	void attachStaff(int where);
--- 64,68 ----
      // creation
      DocumentData* createEmptyDocument();
! 	void addPage(const wxString& descr, int strings, int key, int clef, TimeSignature ts);	
  	void addSection();					
  	void attachStaff(int where);

Index: controller.cpp
===================================================================
RCS file: /cvsroot/gtab/src/controller.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** controller.cpp	28 Feb 2006 07:15:23 -0000	1.78
--- controller.cpp	5 Apr 2006 15:01:15 -0000	1.79
***************
*** 141,148 ****
  
  //------------------------------------------------------------------------------
! void Controller::addPage(const wxString& descr, int strings, int key)
  {
      wxASSERT(getDocument());
!     FACTORY->createPage(getDocument(), descr, strings, key);
      Reflect();
  }
--- 141,148 ----
  
  //------------------------------------------------------------------------------
! void Controller::addPage(const wxString& descr, int strings, int key, int clef, TimeSignature ts)
  {
      wxASSERT(getDocument());
!     FACTORY->createPage(getDocument(), descr, strings, key, clef, ts);
      Reflect();
  }

Index: timesig.cpp
===================================================================
RCS file: /cvsroot/gtab/src/timesig.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** timesig.cpp	28 Feb 2006 07:15:24 -0000	1.12
--- timesig.cpp	5 Apr 2006 15:01:15 -0000	1.13
***************
*** 40,56 ****
  #endif
  
! TimeSignature::TimeSignature(int beats, int beatvalue, bool useCommonTime, bool useCutTime)
! 	: beats_(beats), beatvalue_(beatvalue)
  {
-  	checkCommonTime(useCommonTime);
- 	checkCutTime(useCutTime);
  }
  
! TimeSignature::TimeSignature(const TimeSignature& ref) :
! 	beats_(ref.beats_), beatvalue_(ref.beatvalue_),
! 	useCommonTime_(ref.useCommonTime_), useCutTime_(ref.useCutTime_)
  {
  }
  
  void TimeSignature::setUseCommonTime(bool use)
  {
--- 40,64 ----
  #endif
  
! TimeSignature::TimeSignature() : beats_(4), beatvalue_(4), useCommonTime_(false),
!     useCutTime_(false)
  {
  }
  
! TimeSignature::TimeSignature(const TimeSignature& rh) :
! 	beats_(rh.beats_), beatvalue_(rh.beatvalue_),
! 	useCommonTime_(rh.useCommonTime_), useCutTime_(rh.useCutTime_)
  {
  }
  
+ const TimeSignature& TimeSignature::operator=(const TimeSignature& rh) {
+     if (this != &rh) {
+         beats_ = rh.beats_;
+         beatvalue_ = rh.beatvalue_;
+         useCommonTime_ = rh.useCommonTime_;
+         useCutTime_ = rh.useCutTime_;
+     }
+     return *this;
+ }
+ 
  void TimeSignature::setUseCommonTime(bool use)
  {
***************
*** 65,79 ****
  void TimeSignature::checkCommonTime(bool useCommonTime)
  {
!     if ((beats_ == 4) && (beatvalue_ == 4) && (useCommonTime))
!     	useCommonTime_ = true;
! 	else
! 		useCommonTime_ = false;
  }
  
  void TimeSignature::checkCutTime(bool useCutTime)
  {
!     if ((beats_ == 2) && (beatvalue_ == 2) && (useCutTime))
!     	useCutTime_ = true;
! 	else
! 		useCutTime_ = false;
  }
--- 73,81 ----
  void TimeSignature::checkCommonTime(bool useCommonTime)
  {
!     useCommonTime_ = (beats_ == 4) && (beatvalue_ == 4) && (useCommonTime);
  }
  
  void TimeSignature::checkCutTime(bool useCutTime)
  {
!    	useCutTime_ = (beats_ == 2) && (beatvalue_ == 2) && (useCutTime);
  }

Index: timesig.h
===================================================================
RCS file: /cvsroot/gtab/src/timesig.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** timesig.h	20 Aug 2005 15:37:46 -0000	1.8
--- timesig.h	5 Apr 2006 15:01:15 -0000	1.9
***************
*** 35,47 ****
  class TimeSignature {
  public:
!     /**
!      * @param beats Number of beats per measure.
!      * @param beatvalue Pulse per beat.
!      * @param useCommonTime Set if the common time symbol should be drawn for 4/4.
!      * @param useCutTime Set if cut time symbol should be drawn.
!      */
!     TimeSignature(int beats, int beatvalue, bool useCommonTime, bool useCutTime);
      TimeSignature(const TimeSignature& ref);
      
      void setBeats(int beats) { beats_ = beats; }
      void setBeatValue(int beatvalue) { beatvalue_ = beatvalue; }
--- 35,42 ----
  class TimeSignature {
  public:
!     TimeSignature();
      TimeSignature(const TimeSignature& ref);
      
+     const TimeSignature& TimeSignature::operator=(const TimeSignature& rh);
      void setBeats(int beats) { beats_ = beats; }
      void setBeatValue(int beatvalue) { beatvalue_ = beatvalue; }