X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.h;h=a2b0db111335f64d2cba8917778ab6385de1e5f9;hp=1bff23fdb57607009fe3e3def8a1a0083ceb08ad;hb=8e632531fde7c8197a7cdba1842838fa50a44626;hpb=0b3bb271ac40b5f8bcfc5a417d4423e92c4483b1;ds=sidebyside

diff --git a/bigscreen/groupscreen.h b/bigscreen/groupscreen.h
index 1bff23f..a2b0db1 100644
--- a/bigscreen/groupscreen.h
+++ b/bigscreen/groupscreen.h
@@ -14,19 +14,33 @@
 /* A screen class showing a group in the tournament */
 class GroupScreen : public GenericScreen {
 private:
-	unsigned tournament, round, parallel, machine, num_machines;
+	unsigned tournament, round, parallel, machine, num_machines, players_per_machine;
 	FlagTrigger scores_changed;
 	pqxx::connection &conn;
 	bool valid;
 	struct timeval last_updated;
 	std::vector<TextDefer> last_text;
 
+	unsigned get_show_players(const Group &group);
+	void draw_main_heading(std::vector<TextDefer> &td);
+	void draw_column_headings(std::vector<TextDefer> &td, const Group &group, const std::vector<unsigned> &colwidth);
+	void draw_scores(std::vector<TextDefer> &td, const Group &group, const std::vector<unsigned> &colwidth);
+	const Player *get_next_player(const Group &group);
+	void draw_next_up_player(unsigned char *buf, const Group &group, const Player &player, const Score &song, bool last_song,
+		std::map<unsigned, unsigned> &song_scores, std::map<unsigned, unsigned> &player_scores,
+		const std::vector<unsigned> &max_score, const std::vector<unsigned> &min_score);
+	void draw_next_up_single(unsigned char *buf, const Group &group,
+		std::map<unsigned, unsigned> &song_scores, std::map<unsigned, unsigned> &player_scores,
+		const std::vector<unsigned> &max_score, const std::vector<unsigned> &min_score);
+	void find_column_widths(const Group &group, std::vector<unsigned> &colwidth);
+	
 public:
-	GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines);
+	// the last two parameters should probably not be there, but fetched from GroupScreen itself
+	GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines, unsigned players_per_machine);
 	virtual ~GroupScreen();
 
 	bool check_invalidated();
-	void draw(unsigned char *buf);
+	void draw(unsigned char *buf, unsigned width, unsigned height);
 	int get_priority();
 };