Add enum for step to make coffee

FACT-Team · Apr 13, 2015 · 3e5f5d5 · 3e5f5d5
1 parent ea79c4f
commit 3e5f5d5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 25 deletions.
diff --git a/src/database/customerdatabase.cpp b/src/database/customerdatabase.cpp
@@ -238,7 +238,6 @@ QPixmap CustomerDatabase::getCustomerImage(const int pId)
 
 void CustomerDatabase::setCustomerImage(Models::Customer &pCustomer) {
     QSqlQuery q;
-    qDebug() << pCustomer.getLastname() << " - " << pCustomer.getImage()->size();
     QByteArray byteArray = Gui::Utils::Image::pixmapToBytes(
                 *pCustomer.getImage(),
                 pCustomer.getExtensionImage());
@@ -256,8 +255,6 @@ void CustomerDatabase::setCustomerImage(Models::Customer &pCustomer) {
                     lastError(q),
                     1.3);
     }
-    qDebug() << pCustomer.getLastname() << " - " << "Image inserted";
-
 }
 
 QSharedPointer<Models::Customer> CustomerDatabase::getCustomer(const int pId) {

diff --git a/src/gui/widgets/coffeeeastereggwidget.cpp b/src/gui/widgets/coffeeeastereggwidget.cpp
@@ -17,7 +17,7 @@ CoffeeEasterEggWidget::~CoffeeEasterEggWidget()
 }
 
 void CoffeeEasterEggWidget::setupUI() {
-    _state = 0;
+    _state = INIT;
     _drinked = 0;
     ui->lbCoffee->setPixmap(
                 Gui::Utils::Image::getImage(":/icons/img/coffee_level0.png"));
@@ -30,63 +30,61 @@ void CoffeeEasterEggWidget::setupUI() {
 
 void CoffeeEasterEggWidget::makeCoffeeInProgress() {
     _timer = new QTimer(this);
-    _state = 1;
+    _state = FIRST_STEP;
     connect(_timer, SIGNAL(timeout()), this, SLOT(nextState()));
     _timer->start(1000);
-    qDebug() << "makeCoffeeInProgress";
-
 }
 
 void CoffeeEasterEggWidget::makeCoffeeFirstStep() {
-    _state = 1;
+    _state = FIRST_STEP;
     ui->lbCoffee->setPixmap(
                 Gui::Utils::Image::getImage(":/icons/img/coffee_level1.png"));
     ui->lbScreenControl->setText("<html><head/><body><p align=""center"">"
                                  "Chauffage de l'eau..."
                                  "</p></body></html>");
     ui->btnCoffeeMaker->setText("Faire le café !");
     ui->btnCoffeeMaker->setEnabled(false);
-    _state = 2;
+    _state = SECOND_STEP;
 }
 
 void CoffeeEasterEggWidget::makeCoffeeSecondStep() {
-    _state = 2;
+    _state = SECOND_STEP;
     ui->lbCoffee->setPixmap(
                 Gui::Utils::Image::getImage(":/icons/img/coffee_level2.png"));
     ui->lbScreenControl->setText("<html><head/><body><p align=""center"">"
                                  "En train de moudre le café..."
                                  "</p></body></html>");
     ui->btnCoffeeMaker->setText("Faire le café !");
     ui->btnCoffeeMaker->setEnabled(false);
-    _state = 3;
+   _state = THIRD_STEP;
 }
 
 void CoffeeEasterEggWidget::makeCoffeeThirdStep() {
-    _state = 3;
+   _state = THIRD_STEP;
     ui->lbCoffee->setPixmap(
                 Gui::Utils::Image::getImage(":/icons/img/coffee_level3.png"));
     ui->lbScreenControl->setText("<html><head/><body><p align=""center"">"
                                  "Préparation du café"
                                  "</p></body></html>");
     ui->btnCoffeeMaker->setText("Faire le café !");
     ui->btnCoffeeMaker->setEnabled(false);
-    _state = 4;
+    _state = FOURTH_STEP;
 }
 
 void CoffeeEasterEggWidget::makeCoffeeFourthStep() {
-    _state = 4;
+    _state = FOURTH_STEP;
     ui->lbCoffee->setPixmap(
                 Gui::Utils::Image::getImage(":/icons/img/coffee_level4.png"));
     ui->lbScreenControl->setText("<html><head/><body><p align=""center"">"
                                  "Préparation du café..."
                                  "</p></body></html>");
     ui->btnCoffeeMaker->setText("Faire le café !");
     ui->btnCoffeeMaker->setEnabled(false);
-    _state = 5;
+    _state = READY;
 }
 
 void CoffeeEasterEggWidget::makeCoffeeReadyStep() {
-    _state = 5;
+    _state = READY;
     if (!isDrinked()) {
         ui->lbCoffee->setPixmap(
                     Gui::Utils::Image::getImage(":/icons/img/coffee_ready.png"));
@@ -110,24 +108,23 @@ bool CoffeeEasterEggWidget::isDrinked() {
 }
 
 void CoffeeEasterEggWidget::nextState() {
-    qDebug() << "nextState -->" + _state;
     switch(_state) {
-    case 0:
+    case INIT:
         setupUI();
         break;
-    case 1:
+    case FIRST_STEP:
         makeCoffeeFirstStep();
         break;
-    case 2:
+    case SECOND_STEP:
         makeCoffeeSecondStep();
         break;
-    case 3:
+    case THIRD_STEP:
         makeCoffeeThirdStep();
         break;
-    case 4:
+    case FOURTH_STEP:
         makeCoffeeFourthStep();
         break;
-    case 5:
+    case READY:
         makeCoffeeReadyStep();
         break;
     default:

diff --git a/src/gui/widgets/coffeeeastereggwidget.h b/src/gui/widgets/coffeeeastereggwidget.h
@@ -13,6 +13,18 @@ class CoffeeEasterEggWidget;
 namespace Gui {
 namespace Widgets {
 
+/**
+ * @brief The CoffeeState enum
+ */
+enum CoffeeState {
+    INIT,
+    FIRST_STEP,
+    SECOND_STEP,
+    THIRD_STEP,
+    FOURTH_STEP,
+    READY
+};
+
 /**
  * @author Florent Berbie
  * @brief The CoffeeEasterEggWidget class Easter egg class because we need
@@ -22,6 +34,7 @@ class CoffeeEasterEggWidget : public QWidget
 {
     Q_OBJECT
 
+
 public:
     /**
      * @brief CoffeeEasterEggWidget::CoffeeEasterEggWidget Construct a
@@ -86,8 +99,8 @@ public slots:
     void nextState();
 private:
     Ui::CoffeeEasterEggWidget *ui;  //!< User interface
-    QTimer *_timer;                  //!< Timer of coffeeMaker
-    int _state;                     //!< current state to make coffee
+    QTimer *_timer;                 //!< Timer of coffeeMaker
+    CoffeeState _state;             //!< current state to make coffee
     int _drinked;                   //!< coffee has been drinked
 };
 }