From 6107d7275dda1d2c28c85777faeecdf76a05cd79 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Tue, 18 Jan 2011 12:29:01 -0500
Subject: [PATCH] Display the Tickcounts in the editor.

---
 src/NoteField.cpp | 28 ++++++++++++++++++++++++++++
 src/NoteField.h   |  1 +
 2 files changed, 29 insertions(+)

diff --git a/src/NoteField.cpp b/src/NoteField.cpp
index ae57b6a238..4c64875f16 100644
--- a/src/NoteField.cpp
+++ b/src/NoteField.cpp
@@ -460,6 +460,21 @@ void NoteField::DrawTimeSignatureText( const float fBeat, int iNumerator, int iD
 	m_textMeasureNumber.Draw();
 }
 
+void NoteField::DrawTickcountText( const float fBeat, int iTicks )
+{
+	const float fYOffset	= ArrowEffects::GetYOffset( m_pPlayerState, 0, fBeat );
+ 	const float fYPos	= ArrowEffects::GetYPos(    m_pPlayerState, 0, fYOffset, m_fYReverseOffsetPixels );
+	const float fZoom	= ArrowEffects::GetZoom(    m_pPlayerState );
+	
+	m_textMeasureNumber.SetZoom( fZoom );
+	m_textMeasureNumber.SetHorizAlign( align_left );
+	m_textMeasureNumber.SetDiffuse( RageColor(0,1,0,1) );
+	m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) );
+	m_textMeasureNumber.SetText( ssprintf("%d", iTicks) );
+	m_textMeasureNumber.SetXY( GetWidth()/2.f + 10*fZoom, fYPos );
+	m_textMeasureNumber.Draw();
+}
+
 void NoteField::DrawAttackText( const float fBeat, const Attack &attack )
 {
 	const float fYOffset	= ArrowEffects::GetYOffset( m_pPlayerState, 0, fBeat );
@@ -712,6 +727,19 @@ void NoteField::DrawPrimitives()
 					DrawTimeSignatureText( fBeat, vTimeSignatureSegments[i].m_iNumerator, vTimeSignatureSegments[i].m_iDenominator );
 			}
 		}
+		
+		// Tickcount text
+		const vector<TickcountSegment> &tTickcountSegments = GAMESTATE->m_pCurSong->m_Timing.m_TickcountSegments;
+		for( unsigned i=0; i<tTickcountSegments.size(); i++ )
+		{
+			if( tTickcountSegments[i].m_iStartRow >= iFirstRowToDraw &&
+			    tTickcountSegments[i].m_iStartRow <= iLastRowToDraw)
+			{
+				float fBeat = NoteRowToBeat(tTickcountSegments[i].m_iStartRow);
+				if( IS_ON_SCREEN(fBeat) )
+					DrawTickcountText( fBeat, tTickcountSegments[i].m_iTicks );
+			}
+		}
 
 		// todo: add warp text -aj
 
diff --git a/src/NoteField.h b/src/NoteField.h
index 364bf769e6..eb4d3b0645 100644
--- a/src/NoteField.h
+++ b/src/NoteField.h
@@ -60,6 +60,7 @@ protected:
 	void DrawBPMText( const float fBeat, const float fBPM );
 	void DrawFreezeText( const float fBeat, const float fBPM, const float bDelay );
 	void DrawTimeSignatureText( const float fBeat, int iNumerator, int iDenominator );
+	void DrawTickcountText( const float fBeat, int iTicks );
 	void DrawAttackText( const float fBeat, const Attack &attack );
 	void DrawBGChangeText( const float fBeat, const RString sNewBGName );
 	float GetWidth() const;