X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=7b0175a62b8a617b5f15c00e6c8dd73b67f5cfef;hp=2b541203aa9d3dd02f57255905f89cab82c44f38;hb=8963fce7337a09bdcfea051a81c0c3d9281acd6e;hpb=181cf14f1581ddf26cb956ffa24642dcccba5f40

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 2b54120..7b0175a 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -1,10 +1,11 @@
 #include <cstdio>
 #include <algorithm>
+#include <map>
 
 #include "groupscreen.h"
 #include "fetch_group.h"
-#include "fetch_max_score_for_song.h"
-#include "fetch_max_score_for_player.h"
+#include "fetch_max_score_for_songs.h"
+#include "fetch_max_score_for_players.h"
 #include "fetch_needs_update.h"
 #include "fetch_highscore.h"
 #include "fonts.h"
@@ -40,6 +41,14 @@ void GroupScreen::draw(unsigned char *buf)
 	
 	scores_changed.reset_flag();
 
+	/*
+	 * We'll probably need some values from here later on (although not all), just fetch them
+	 * all while we're at it.
+	 */
+	std::map<unsigned, unsigned> song_scores, player_scores;
+	conn.perform(FetchMaxScoreForSongs(tournament, &song_scores));
+	conn.perform(FetchMaxScoreForPlayers(tournament, round, &player_scores));
+	
 	Group group;
 	conn.perform(FetchGroup(tournament, round, parallel, &group));
 	gettimeofday(&last_updated, NULL);
@@ -135,8 +144,11 @@ void GroupScreen::draw(unsigned char *buf)
 	my_draw_text_deferred(td, "Rank", 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
 	
 	// show all the players and the scores
-	unsigned y = 140;
-	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+	unsigned show_players = std::min(group.players.size(), 9U);
+	unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
+	
+	unsigned row = 0;
+	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i, ++row) {
 		my_draw_text_deferred(td, i->nick, 18.0, 20, y);
 
 		unsigned x = 40 + width[0];
@@ -174,7 +186,10 @@ void GroupScreen::draw(unsigned char *buf)
 			x += width[num_scores + 1] + 20;
 		}
 
-		y += 40;
+		if (show_players > 7)
+			y += 40 - (show_players - 7) * 4;
+		else 
+			y += 40;
 	}
 	
 	/*
@@ -197,8 +212,6 @@ void GroupScreen::draw(unsigned char *buf)
 	 * matter of sorting; the best attainable rank for player X is obtained if 
 	 * X gets max score and all others get min score, the worst attainable rank
 	 * is obtained if X gets min score and all others get max score.
-	 *
-	 * This is a bit SQL-heavy, but heck...
 	 */
 	std::vector<unsigned> max_score, min_score;
 	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
@@ -212,9 +225,9 @@ void GroupScreen::draw(unsigned char *buf)
 				unsigned max_score_this_song;
 				if (j->song.id != -1) {
 					// random song, or we know what song the player picked
-					conn.perform(FetchMaxScoreForSong(tournament, j->song.id, &max_score_this_song));
+					max_score_this_song = song_scores[j->song.id];
 				} else {
-					conn.perform(FetchMaxScoreForPlayer(tournament, i->id, round, &max_score_this_song));
+					max_score_this_song = player_scores[i->id];
 				}
 				max_score_tp += max_score_this_song;
 			}
@@ -224,8 +237,8 @@ void GroupScreen::draw(unsigned char *buf)
 	}
 
 	// now finally find min and max rank, and draw it all
-	y = 140;
-	for (unsigned i = 0; i < group.players.size(); ++i) {
+	y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
+	for (unsigned i = 0; i < show_players; ++i) {
 		unsigned best_rank = 1, worst_rank = 1;
 		for (unsigned j = 0; j < group.players.size(); ++j) {
 			if (i == j)
@@ -246,7 +259,10 @@ void GroupScreen::draw(unsigned char *buf)
 		unsigned this_width = my_draw_text(text, NULL, 22.0);
 		my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y);
 
-		y += 40;
+		if (show_players > 7)
+			y += 40 - (show_players - 7) * 4;
+		else 
+			y += 40;
 	}
 		
 	/*
@@ -341,9 +357,9 @@ void GroupScreen::draw(unsigned char *buf)
 			unsigned max_score_this_song;
 			if (next_song->song.id != -1) {
 				// random song, or we know what song the player picked
-				conn.perform(FetchMaxScoreForSong(tournament, next_song->song.id, &max_score_this_song));
+				max_score_this_song = song_scores[next_song->song.id];
 			} else {
-				conn.perform(FetchMaxScoreForPlayer(tournament, next_player->id, round, &max_score_this_song));
+				max_score_this_song = player_scores[next_player->id];
 			}
 
 			unsigned y = 520;