(no commit message)

[ccbs] / bigscreen / groupscreen.cpp

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index fbdcc5ed89aac1ea9e44fe3ad7159b53e81b5936..d0370de55c9514cc26e50a49625bc082e8f8674f 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -5,7 +5,7 @@
 #include "groupscreen.h"
 #include "fetch_group.h"
 #include "fetch_max_score_for_songs.h"
-#include "fetch_max_score_for_player.h"
+#include "fetch_max_score_for_players.h"
 #include "fetch_needs_update.h"
 #include "fetch_highscore.h"
 #include "fonts.h"
@@ -45,8 +45,9 @@ void GroupScreen::draw(unsigned char *buf)
         * 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;
+       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));
@@ -164,7 +165,7 @@ void GroupScreen::draw(unsigned char *buf)
                                my_draw_text_deferred(td, text, 22.0, x + max_num_width - this_width, y);
 
                                // draw the long name if we can, otherwise use the short one
-                               if (my_draw_text(j->song.title, NULL, 12.0) > width[col]) {
+                               if (my_draw_text(j->song.title, NULL, 12.0) > (width[col] - 10 - max_num_width)) {
                                        my_draw_text_deferred(td, j->song.short_title, 12.0, x + max_num_width + 10, y);
                                } else {
                                        my_draw_text_deferred(td, j->song.title, 12.0, x + max_num_width + 10, y);
@@ -211,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) {
@@ -228,7 +227,7 @@ void GroupScreen::draw(unsigned char *buf)
                                        // random song, or we know what song the player picked
                                        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;
                        }
@@ -360,7 +359,7 @@ void GroupScreen::draw(unsigned char *buf)
                                // random song, or we know what song the player picked
                                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;
@@ -435,38 +434,46 @@ void GroupScreen::draw(unsigned char *buf)
                        // print out the lines we can attain
                        if (next_player->total + max_score_this_song > lead_beat && (lead_beat != win_beat)) {
                                int lead_need = std::max(lead_beat - next_player->total + 1, 0U);
-                               
-                               text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need));
-                               this_width = my_draw_text(text, NULL, 18.0);
-                               my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
+                       
+                               if (lead_need > 0) {
+                                       text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need));
+                                       this_width = my_draw_text(text, NULL, 18.0);
+                                       my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
 
-                               y += 30;
+                                       y += 30;
+                               }
                        }
                        
                        if (next_player->total + max_score_this_song > win_beat) {
                                int win_need = std::max(win_beat - next_player->total + 1, 0U);
                                
-                               text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need));
+                               if (win_need > 0) {
+                                       text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need));
 
-                               this_width = my_draw_text(text, NULL, 18.0);
-                               my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
+                                       this_width = my_draw_text(text, NULL, 18.0);
+                                       my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
 
-                               y += 30;
+                                       y += 30;
+                               }
                        }
 
-                       if (next_player->total + max_score_this_song > qualify_beat_worst_case && (qualify_beat_worst_case != win_beat)) {
+                       if (group.num_qualifying > 0 &&
+                           next_player->total + max_score_this_song > unsigned(qualify_beat_worst_case) &&
+                           (unsigned(qualify_beat_worst_case) != win_beat)) {
                                int qual_need = std::max(qualify_beat_worst_case - next_player->total + 1, 0U);
                                
-                               if (qualify_beat_worst_case == qualify_beat_best_case) {
-                                       text = widestring("Needs to qualify: ") + widestring(pqxx::to_string(qual_need));
-                               } else {
-                                       text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need));
-                               }
+                               if (qual_need > 0) {
+                                       if (qualify_beat_worst_case == qualify_beat_best_case) {
+                                               text = widestring("Needs to qualify: ") + widestring(pqxx::to_string(qual_need));
+                                       } else {
+                                               text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need));
+                                       }
+                                       
+                                       this_width = my_draw_text(text, NULL, 18.0);
+                                       my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
                                
-                               this_width = my_draw_text(text, NULL, 18.0);
-                               my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
-
-                               y += 30;
+                                       y += 30;
+                               }
                        }
                }
        }