added distribution menu

src/Core/Bag.h

@@ -2,6 +2,7 @@
 
 #include "../Pieces/Piece.h"
 #include "PiecesList.h"
+#include "DistributionMode.h"
 
 #include <vector>
 #include <memory>
@@ -18,7 +19,7 @@ class Bag {
         std::shared_ptr<PiecesList> piecesList;          // the list of loaded pieces
         int highestSize;                                 // the highest size of piece in the bag
         std::vector<std::pair<int, int>> selectedPieces; // the list of pieces that can be given to the player
-        PiecesDistributionMode distributionMode;         // the distribution mode
+        DistributionMode distributionMode;               // the distribution mode
         std::vector<double> propotionsPerSize;           // the proportion of pieces for each size
         std::pair<int, int> next;                        // the next piece to give
         std::vector<PieceBag> currentBags;               // for each size, the list of pieces that are still to be taken out before starting a new bag

src/Core/DistributionMode.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <string>
+
+
+/**
+ * The modes of pieces distribution managed by the app
+ */
+enum DistributionMode {
+    DEFAULT,
+    UNIFORM,
+    CUSTOM
+};
+
+
+/**
+ * @return A string containing the name of the given distribution mode
+ */
+inline std::string getPiecesDistributionName(DistributionMode distributionMode) {
+    static const std::string DISTRIBUTION_NAMES[] = {
+        "DEFAULT",
+        "UNIFORM",
+        "CUSTOM"
+    };
+
+    return DISTRIBUTION_NAMES[distributionMode];
+}

src/Core/PiecesList.cpp

@@ -2,6 +2,7 @@
 
 #include "../Pieces/Piece.h"
 #include "../Pieces/PiecesFiles.h"
+#include "DistributionMode.h"
 
 #include <vector>
 #include <utility>
@@ -91,7 +92,7 @@ void PiecesList::unselectAll() {
     this->selectedPieces.clear();
 }
 
-bool PiecesList::setDistributionMode(PiecesDistributionMode distributionMode) {
+bool PiecesList::setDistributionMode(DistributionMode distributionMode) {
     if (distributionMode == DEFAULT || distributionMode == UNIFORM || distributionMode == CUSTOM) {
         this->distributionMode = distributionMode;
         return true;
@@ -113,7 +114,7 @@ std::vector<std::pair<int, int>> PiecesList::getSelectedPieces() const {
     return this->selectedPieces;
 }
 
-PiecesDistributionMode PiecesList::getDistributionMode() const {
+DistributionMode PiecesList::getDistributionMode() const {
     return this->distributionMode;
 }
 

src/Core/PiecesList.h

@@ -1,21 +1,12 @@
 #pragma once
 
 #include "../Pieces/Piece.h"
+#include "DistributionMode.h"
 
 #include <vector>
 #include <utility>
 
 
-/**
- * The type of pieces distribution managed by the game
- */
-enum PiecesDistributionMode {
-    DEFAULT,
-    UNIFORM,
-    CUSTOM
-};
-
-
 /**
  * A container for all loaded pieces to prevent loading and copying them multiple times,
  * also allows for the player to select a list of pieces to be used in a game
@@ -28,7 +19,7 @@ class PiecesList {
         std::vector<std::vector<int>> holelessPieces;    // the list of holeless loaded pieces by size
         std::vector<std::vector<int>> otherPieces;       // the list of other loaded pieces by size
         std::vector<std::pair<int, int>> selectedPieces; // the list of all currently selected pieces
-        PiecesDistributionMode distributionMode;         // the current pieces distribution mode
+        DistributionMode distributionMode;               // the current pieces distribution mode
         std::vector<double> proportionsPerSize;          // the proportion of piece for each sizes
         std::vector<double> customProportionsPerSize;    // the proportion of piece for each sizes when the distribution mode is set to custom
 
@@ -83,7 +74,7 @@ class PiecesList {
          * Changes the current pieces distribution mode
          * @return If the mode is supported
          */
-        bool setDistributionMode(PiecesDistributionMode distributionMode);
+        bool setDistributionMode(DistributionMode distributionMode);
 
         /**
          * Changes the distribution of the specified size for when the distribution mode is set to custom,
@@ -110,7 +101,7 @@ class PiecesList {
         /**
          * @return The current distribution mode
          */
-        PiecesDistributionMode getDistributionMode() const;
+        DistributionMode getDistributionMode() const;
 
         /**
          * @return The proportion of pieces for each loaded size