Implement TopGradesGrouped sort order. Compiles fine, but untested.

diff --git a/src/GameConstantsAndTypes.cpp b/src/GameConstantsAndTypes.cpp
index 0604c0a..7ad3596 100644 (file)
--- a/src/GameConstantsAndTypes.cpp
+++ b/src/GameConstantsAndTypes.cpp
@@ -148,6 +148,7 @@ static const CString SortOrderNames[] = {
        "Bpm",
        "Popularity",
        "TopGrades",
+       "TopGradesGrouped"
        "Artist",
        "Genre",
        "SongLength",

diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h
index efe6728..cd8f141 100644 (file)
--- a/src/GameConstantsAndTypes.h
+++ b/src/GameConstantsAndTypes.h
@@ -100,6 +100,7 @@ enum SortOrder {
        SORT_BPM, 
        SORT_POPULARITY, 
        SORT_TOP_GRADES,
+       SORT_TOP_GRADES_GROUPED,
        SORT_ARTIST,
        SORT_GENRE,
        SORT_SONG_LENGTH,

diff --git a/src/SongUtil.cpp b/src/SongUtil.cpp
index 5a66e59..d66315e 100644 (file)
--- a/src/SongUtil.cpp
+++ b/src/SongUtil.cpp
@@ -281,6 +281,19 @@ CString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so
                        }
                        return GradeToThemedString( GRADE_NO_DATA );
                }
+       case SORT_TOP_GRADES_GROUPED:
+               {
+                       int iCounts[NUM_GRADES];
+                       PROFILEMAN->GetMachineProfile()->GetGrades( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType, iCounts );
+
+                       for( int i=GRADE_TIER01; i<NUM_GRADES; ++i )
+                       {
+                               Grade g = (Grade)i;
+                               if( iCounts[i] > 0 )
+                                       return ssprintf( "%4s", GradeToThemedString(g).c_str());
+                       }
+                       return GradeToThemedString( GRADE_NO_DATA );
+               }
        case SORT_EASY_METER:
                {
                        Steps* pSteps = pSong->GetStepsByDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,DIFFICULTY_EASY);