fixed rating

Author: lilyreber

client/client_socket.cpp

@@ -49,8 +49,7 @@ void client_processor::process() {
             emit run_change_skin(query.user().skin());
             break;
         case ChitChatMessage::Query_FeedbackType_SCORE_CHANGED:
-            // emit run_score_changed(query.)
-            // TODO
+            // e
             break;
         case ChitChatMessage::Query_FeedbackType_DATABASE_ERROR:
             emit run_error();
@@ -60,5 +59,8 @@ void client_processor::process() {
         case ChitChatMessage::Query_FeedbackType_NEW_USER_CONNECTED:
             emit run_connect_roommate(query);
             break;
+        case ChitChatMessage::Query_FeedbackType_SCORE:
+            emit run_change_score(query.user().name(), query.score(),
+                                  query.game_name());
     }
 }

client/client_socket.h

@@ -53,6 +53,8 @@ class client_processor : public network::query_processor {
     void run_connect_roommate(ChitChatMessage::Query);
 
     void run_change_skin(const std::string &);
+
+    void run_change_score(const std::string, int, const std::string);
 };
 
 #endif  // CLIENT_SOCKET_H

client/game_selection.h

@@ -17,6 +17,7 @@ class Q_DECL_IMPORT game_selection : public QWidget {
 
 public:
     explicit game_selection(QWidget *parent = nullptr);
+    rating games_rating;
 
     ~game_selection() override;
 
@@ -30,13 +31,7 @@ private slots:
 
     void start_game(const std::string &name);
 
-<<<<<<< HEAD
     void send_score(int score, std::string game_name);
-=======
-    void send_score(int score, std::string game_name) {
-        emit run_send_score(score, game_name);
-    }
->>>>>>> 5403007bbcd7f989db28212db7060cae62b4e951
 
 signals:
     void game_chosen(const std::string &name);
@@ -46,7 +41,6 @@ private slots:
 private:
     Ui::game_selection *ui;
     QLibrary *game = nullptr;
-    rating games_rating;
 };
 
 #endif  // GAME_SELECTION_H

client/main_window.cpp

@@ -139,6 +139,7 @@ void main_window::connect_with_room(const ChitChatMessage::Query &data) {
 
     current_user.user_sprite->setFlag(QGraphicsItem::ItemIsFocusable);
     current_user.user_sprite->setFocus();
+    update_rating();
 }
 
 void main_window::user_changed_position(const std::string &name, int x, int y) {
@@ -151,6 +152,7 @@ void main_window::roommate_disconnect(const std::string &roommate_name) {
         users_in_the_room[roommate_name].user_sprite->name_display);
     scene->removeItem(users_in_the_room[roommate_name].user_sprite);
     users_in_the_room.erase(roommate_name);
+    update_rating();
 }
 
 void main_window::roommate_connect(
@@ -161,6 +163,7 @@ void main_window::roommate_connect(
     users_in_the_room.insert({u.get_name(), u});
     scene->addItem(u.user_sprite);
     scene->addItem(u.user_sprite->name_display);
+    update_rating();
 }
 
 void main_window::show_current_sprite() {
@@ -189,11 +192,35 @@ void main_window::send_skin(const std::string &skin) {
 }
 
 void main_window::send_score(int score, std::string game_name) {
-    auto q = current_user.serialize(
-        ChitChatMessage::Query_RequestType_GET_SCORE);
+    auto q =
+        current_user.serialize(ChitChatMessage::Query_RequestType_GET_SCORE);
     q.set_game_name(game_name);
     q.set_score(score);
     run_send_request(q);
+    update_rating();
+}
+
+void main_window::update_rating() {
+    scene->choose_game.games_rating.arkanoid_rating.clear();
+    scene->choose_game.games_rating.hangman_rating.clear();
+
+    for (auto &x : users_in_the_room) {
+        auto q = x.second.serialize(ChitChatMessage::Query::RequestType::
+                                    Query_RequestType_GET_SCORE);
+        q.set_game_name("hangman");
+        emit run_send_request(q);
+        q.set_game_name("arkanoid");
+        emit run_send_request(q);
+    }
+
+    auto q = current_user.serialize(
+        ChitChatMessage::Query::RequestType::Query_RequestType_GET_SCORE);
+    q.set_game_name("hangman");
+    emit run_send_request(q);
+    q.set_game_name("arkanoid");
+    emit run_send_request(q);
+
+    scene->choose_game.games_rating.update_rating();
 }
 
 void main_window::set_user_skin(const std::string &skin) {
@@ -224,8 +251,8 @@ void main_window::on_change_avatar_button_clicked() {
     text->setPen(avatar_pen);
 
     std::vector<std::string> characters = {
-        "finn",  "gambol",        "miku",   "mushroom", "rafael",
-        "sonic", "stormtroopers", "kermit", "pikachu"};
+                                           "finn",  "gambol",        "miku",   "mushroom", "rafael",
+                                           "sonic", "stormtroopers", "kermit", "pikachu"};
     for (int i = 0; i < 9; i++) {
         auto *skin = new sprite_for_choice(characters[i]);
         connect(skin, SIGNAL(add_curren_sprite()), this,
@@ -271,5 +298,6 @@ void main_window::initialize_user(client_user &u) {
     u.user_sprite->change_skin(u.get_skin());
 }
 void main_window::terminate() {
-    emit run_send_request(current_user.serialize(ChitChatMessage::Query_RequestType_DEBUG_TERMINATE));
+    emit run_send_request(current_user.serialize(
+        ChitChatMessage::Query_RequestType_DEBUG_TERMINATE));
 }

client/main_window.h

@@ -36,6 +36,7 @@ class main_window : public QMainWindow {
     model *current_session = nullptr;
 
     void set_user_sprite();
+    room *scene;
 
     ~main_window() override;
 
@@ -81,16 +82,17 @@ private slots:
     void send_skin(const std::string &skin);
 
     void send_score(int score, std::string game_name);
-    ;
+
+    void update_rating();
 
     void terminate();
 
 private:
     Ui::main_window *ui;
-    room *scene;
+
     QGraphicsView *view;
 
-    QPushButton *btn;  //убрать потом
+    QPushButton *btn;
 
     void initialize_user(client_user &u);
 
@@ -100,4 +102,5 @@ private slots:
     QPen pen;
     QBrush brush;
 };
+
 #endif  // MAIN_WINDOW_H

client/rating.cpp

@@ -3,28 +3,23 @@
 
 rating::rating(QWidget *parent) : QWidget(parent), ui(new Ui::rating) {
     ui->setupUi(this);
+    this->setWindowTitle("ChitChat");
+    move(QGuiApplication::screens().at(0)->geometry().center() -
+         frameGeometry().center());
 }
 
 rating::~rating() {
     delete ui;
 }
 
-void rating::initilize_users(std::vector<std::string> &users) {
-    current_users.clear();
-    for (auto &x : users) {
-        current_users.push_back(x);
-    }
-}
-
 void rating::on_back_to_room_button_clicked() {
     this->hide();
 }
 
 void rating::update_rating() {
-    hangman_rating.clear();
-    arkanoid_rating.clear();
     sort(hangman_rating.begin(), hangman_rating.end());
     sort(arkanoid_rating.begin(), arkanoid_rating.end());
+
     std::string hangman_names = "";
     std::string hangman_scores = "";
     std::string arkanoid_names = "";

client/rating.h

@@ -1,8 +1,10 @@
 #ifndef RATING_H
 #define RATING_H
 
+#include <client_user.h>
 #include <QWidget>
 #include <algorithm>
+#include <map>
 #include <string>
 #include <vector>
 
@@ -17,20 +19,29 @@ class rating : public QWidget {
     explicit rating(QWidget *parent = nullptr);
     void update_rating();
 
+    std::vector<std::pair<int, std::string>> hangman_rating;
+    std::vector<std::pair<int, std::string>> arkanoid_rating;
+
     ~rating();
 
 private slots:
 
-    void initilize_users(std::vector<std::string> &users);
-
     void on_back_to_room_button_clicked();
 
+    void change_score(const std::string &name,
+                      int score,
+                      const std::string &game) {
+        qDebug() << "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" << game.c_str();
+        if (game == "hangman") {
+            hangman_rating.push_back({score, name});
+        }
+        if (game == "arkanoid") {
+            arkanoid_rating.push_back({score, name});
+        }
+    };
+
 private:
     Ui::rating *ui;
-
-    std::vector<std::string> current_users;
-    std::vector<std::pair<int, std::string>> hangman_rating;
-    std::vector<std::pair<int, std::string>> arkanoid_rating;
 };
 
 #endif  // RATING_H

client/view.cpp

@@ -69,8 +69,10 @@ view::view() {
     connect(&current_session.processor, SIGNAL(run_change_skin(std::string)),
             &main_process.current_user, SLOT(change_skin(std::string)));
 
-    connect(&current_session.processor, SIGNAL(run_change_skin(std::string)),
-            &main_process.current_user, SLOT(change_skin(std::string)));
+    connect(&current_session.processor,
+            SIGNAL(run_change_score(std::string, int, std::string)),
+            &main_process.scene->choose_game.games_rating,
+            SLOT(change_score(std::string, int, std::string)));
 }
 
 void view::start() {