Get Pitch position at date (in progress)

grame-cncm · Dec 6, 2023 · 041f750 · 041f750
1 parent 47503f8
commit 041f750
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/src/engine/lib/GUIDOEngine.cpp b/src/engine/lib/GUIDOEngine.cpp
@@ -637,12 +637,8 @@ GUIDOAPI GuidoErrCode GuidoGetPitchPos( CGRHandler inHandleGR, int staffnum, int
 		return guidoErrInvalidHandle;
 
 	TYPE_TIMEPOSITION tp (date.num, date.denom);
-	GRStaff* staff = inHandleGR->grmusic->getStaff (staffnum, tp);
-	if (!staff)
-		return guidoErrBadParameter;
-
 	GRPitchYVisitor v;
-	NVPoint p = v.getPitchPos (staff, pitch, tp);
+	NVPoint p = v.getPitchPos (inHandleGR->grmusic, staffnum, pitch, tp);
 	if (!p.x)
 		return guidoErrBadParameter;
 	x = p.x;

diff --git a/src/engine/operations/GRPitchYVisitor.cpp b/src/engine/operations/GRPitchYVisitor.cpp
@@ -14,6 +14,7 @@
 #include "GuidoDefs.h"
 #include "GRClef.h"
 #include "GREmpty.h"
+#include "GRMusic.h"
 #include "GROctava.h"
 #include "GREvent.h"
 #include "GRSingleNote.h"
@@ -23,8 +24,10 @@
 using namespace std;
 
 //-------------------------------------------------------------------------------
-NVPoint GRPitchYVisitor::getPitchPos (GRStaff* staff, int midipitch, TYPE_TIMEPOSITION date)
+NVPoint GRPitchYVisitor::getPitchPos (GRMusic* music, int staffNum, int midipitch, TYPE_TIMEPOSITION date)
 {
+	fTargetStaff = staffNum;
+	fCurrentStaff = 0;
 	fBasePitch 	= NOTE_G;
 	fBaseLine 	= 3;
 	fBaseOct 	= 1;
@@ -33,27 +36,36 @@ NVPoint GRPitchYVisitor::getPitchPos (GRStaff* staff, int midipitch, TYPE_TIMEPO
 	fLastDate = -1;
 	fLastX = -1;
 	fDone = false;
-	staff->accept (*this);
+	fStaff = nullptr;
+	music->accept (*this);
 	NVPoint p;
-	if (fDone) {
+	if (fDone && fStaff) {
 		// convert midi pitch in pitch class and octava
 		int oct = (midipitch / 12) - 4;
 		int pitch = midipitch % 12;
 		pitch = ((pitch < 5) ? (pitch / 2) : (pitch+1) / 2) + 2;
-cerr << "GRPitchYVisitor::getPitchPos " << pitch << " " << oct << " date: " << date << endl;
-		float y = staff->getNotePosition ( pitch, oct, fBasePitch, fBaseLine, fBaseOct);
+//cerr << "GRPitchYVisitor::getPitchPos " << pitch << " " << oct << " date: " << date << endl;
+		float y = fStaff->getNotePosition ( pitch, oct, fBasePitch, fBaseLine, fBaseOct);
 		p.x = fLastX;
 		p.y = y;
 	}
-cerr << "   resultat : " << p << endl;
 	return p;
 }
 
 //-------------------------------------------------------------------------------
-void GRPitchYVisitor::visitStart (GRSingleNote* o)
+void GRPitchYVisitor::visitStart (GRStaff* o)
 {
 	if (fDone) return;
-cerr << "GRPitchYVisitor::visitStart GRSingleNote " << o << endl;
+	fCurrentStaff = o->getStaffNumber();
+//cerr << "GRPitchYVisitor::visitStart GRStaff " << fCurrentStaff << endl;
+	fStaff = o;
+}
+
+//-------------------------------------------------------------------------------
+void GRPitchYVisitor::visitStart (GRSingleNote* o)
+{
+	if (fDone || (fCurrentStaff != fTargetStaff)) return;
+//cerr << "GRPitchYVisitor::visitStart GRSingleNote " << o << endl;
 	TYPE_TIMEPOSITION date = o->getRelativeTimePosition();
 	if (date > fTargetDate) fDone = true;
 	else fLastX = o->getPosition().x;
@@ -62,8 +74,8 @@ cerr << "GRPitchYVisitor::visitStart GRSingleNote " << o << endl;
 //-------------------------------------------------------------------------------
 void GRPitchYVisitor::visitStart (GREmpty* o)
 {
-	if (fDone) return;
-cerr << "GRPitchYVisitor::visitStart GREmpty " << o << endl;
+	if (fDone || (fCurrentStaff != fTargetStaff)) return;
+//cerr << "GRPitchYVisitor::visitStart GREmpty " << o << endl;
 	TYPE_TIMEPOSITION date = o->getRelativeTimePosition();
 	if (date > fTargetDate) fDone = true;
 	else fLastX = o->getPosition().x;
@@ -72,22 +84,22 @@ cerr << "GRPitchYVisitor::visitStart GREmpty " << o << endl;
 //-------------------------------------------------------------------------------
 void GRPitchYVisitor::visitStart (GRSingleRest* o)
 {
-	if (fDone) return;
-cerr << "GRPitchYVisitor::visitStart GRSingleRest " << o << endl;
+	if (fDone || (fCurrentStaff != fTargetStaff)) return;
+//cerr << "GRPitchYVisitor::visitStart GRSingleRest " << o << endl;
 	TYPE_TIMEPOSITION date = o->getRelativeTimePosition();
 	if (date > fTargetDate) fDone = true;
 	else fLastX = o->getPosition().x;
 }
 
 void GRPitchYVisitor::visitStart (GRClef* o)
 {
-	if (fDone) return;
+	if (fDone || (fCurrentStaff != fTargetStaff)) return;
 	fBasePitch = o->getBasePitch();
 	fBaseOct = o->getBaseOct();
 }
 
 void GRPitchYVisitor::visitStart (GROctava* o)
 {
-	if (fDone) return;
+	if (fDone || (fCurrentStaff != fTargetStaff)) return;
 	fOctava = o->getOctava();
 }
diff --git a/src/engine/operations/GRPitchYVisitor.h b/src/engine/operations/GRPitchYVisitor.h
@@ -17,6 +17,8 @@
 
 class GRPitchYVisitor : public GRVisitor
 {
+	int fTargetStaff;
+	int fCurrentStaff;
 	int fBasePitch;
 	int fBaseLine;
 	int fBaseOct;
@@ -25,20 +27,22 @@ class GRPitchYVisitor : public GRVisitor
 	TYPE_TIMEPOSITION fLastDate = 0;
 	TYPE_TIMEPOSITION fTargetDate = 0;
 	bool fDone = false;
+	const GRStaff * fStaff;
 
 	public:
 				 GRPitchYVisitor() {}
 		virtual ~GRPitchYVisitor() {}
 
-		NVPoint getPitchPos (GRStaff* staff, int pitch, TYPE_TIMEPOSITION date);
+		NVPoint getPitchPos (GRMusic* music, int staffNum, int pitch, TYPE_TIMEPOSITION date);
 
-		virtual bool voiceMode () { return true; }
+		virtual bool voiceMode () { return false; }
 
 		virtual void visitStart (GRClef* o);
 		virtual void visitStart (GROctava* o);
 		virtual void visitStart (GRSingleNote* o);
 		virtual void visitStart (GRSingleRest* o);
 		virtual void visitStart (GREmpty* o);
+		virtual void visitStart (GRStaff* o);
 };
 
 #endif