add proper states and a sane API for players

[multypo.git] / qt / player.cpp

diff --git a/qt/player.cpp b/qt/player.cpp
index 871ecb9d474182fd1ad50ddd6790fff4a4d71d42..485382300e993e7913e1b3508d2ca5f6295f9b31 100644 (file)
--- a/qt/player.cpp
+++ b/qt/player.cpp
@@ -1,46 +1,60 @@
 #include "player.h"
 
 #include <QLayout>
 #include "player.h"
 
 #include <QLayout>

+#include <QDebug>

 
 

-static QString colorToString(QColor col)
-{
-       return QString("#%1%2%3").arg(col.red(), 2, 16, QChar('0'))
-                       .arg(col.green(), 2, 16, QChar('0'))
-                       .arg(col.blue(), 2, 16, QChar('0'));
-}
-
-Player::Player(QWidget* parent) {
+Player::Player(QWidget* parent) : score(0), state(Naming) {

        theLabel = new QLabel (parent);
        parent->layout()->addWidget(theLabel);
        theLabel = new QLabel (parent);
        parent->layout()->addWidget(theLabel);

+       qDebug() << "Player created";

 }
 
 }
 

-
-bool Player::hasName() {
-       return !name.isNull();
+void Player::handleKey(QString str)
+{
+    // edit "current line"
+    if (str.length() == 1) {
+        currentWord += str;
+    }
+    else if (str == "BackSpace") {
+        currentWord.chop(1);
+    }
+    // see if this does anything useful
+    switch (state) {
+        case Naming:
+            theLabel->setText(currentWord);
+            if (str == "Return") {
+                name = currentWord;
+                state = Waiting;
+                theLabel->setText("<READY>");
+            }
+            break;
+        case Waiting:
+            break;
+        case Typing:
+            theLabel->setText(currentWord);
+            break;
+    }

 }
 
 }
 

-QString Player::getName() {
-       return name;
+void Player::wordComplete(int points)
+{
+    score += points;
+    state = Waiting;
+    theLabel->setText("<COMPLETE>");

 }
 
 }
 

-QString Player::getCurrentLine() {
-       return currentLine;
+QString Player::getCurrentWord() {
+    Q_ASSERT(state == Typing);
+       return currentWord;

 }
 
 }
 

-void Player::resetText() {
-       currentLine.clear();
-       theLabel->setText(currentLine);
+void Player::nextWord() {
+       currentWord = "";
+    theLabel->setText(currentWord);
+       state = Typing;

 }
 
 }
 

-void Player::handleKey(QString str) {
-       if (str.length() == 1) {
-               currentLine += str;
-       } else if (!hasName() && str == "Return") {
-               // set name
-               name = currentLine;
-               currentLine = "";
-       } else if (str == "BackSpace") {
-               currentLine.chop(1);
-       }
-       theLabel->setText(currentLine);
+void Player::showScore() {
+    Q_ASSERT(state == Waiting);
+    theLabel->setText(QString ("Spieler %1 hat %2 Punkte.").arg(name).arg(score));

 }
 }