Add ClocksWidget

[chessclock] / classes / chessclock.cpp

diff --git a/classes/chessclock.cpp b/classes/chessclock.cpp
index 896f654..308d82d 100644 (file)
--- a/classes/chessclock.cpp
+++ b/classes/chessclock.cpp
@@ -40,7 +40,7 @@ ChessClock::ChessClock(bool white, QWidget *parent) :
 
     // Set updating timer
     updateTimer_.setInterval( UPDATEINTERVAL );
-    connect( &updateTimer_, SIGNAL(timeout),this,SLOT(updateClock()));
+    connect( &updateTimer_, SIGNAL(timeout()),this,SLOT(updateClock()));
 }
 
 void ChessClock::startTurn()
@@ -50,6 +50,7 @@ void ChessClock::startTurn()
     // Turn information for this new turn
     currentTurn_ = new TurnInformation(turn_, isWhite_);
     clockTime_.restart();
+    updateTimer_.start();
     status_=Running;
 
     // Repaint clock
@@ -58,6 +59,7 @@ void ChessClock::startTurn()
 
 void ChessClock::pauseTurn()
 {
+    updateTimer_.stop();
     // Update turn time
     currentTurn_->addTime( clockTime_.restart() );
     status_ = Paused;
@@ -70,25 +72,28 @@ void ChessClock::continueTurn()
     // Add pause duration to information object
     currentTurn_->addPause( clockTime_.restart() );
     status_ = Running;
+    updateTimer_.start();
     updateClock();
 }
 
 
 TurnInformation* ChessClock::endTurn()
 {
-    status_ = NotRunning;
-    // Update turn time
-    currentTurn_->addTime( clockTime_.restart());
+    updateTimer_.stop();
     // Count time played
     timePlayedBeforeTurn_ = getTimePlayed();
     // Count time available
+    // This update current turn
     timeAvailableBeforeTurn_ = getTimeAvailable();
+
+    status_ = NotRunning;
     updateClock();
 
     // Close and return turn information
     currentTurn_->turnReady(timeAvailableBeforeTurn_ );
     TurnInformation* information = currentTurn_;
     currentTurn_ = 0;
+    emit turnEnded();
     return information;
 }
 
@@ -102,21 +107,52 @@ int ChessClock::getTimeAvailable()
     // Most simple - will be overwritten in more complex time controls:
     // subtract duration time!
     if( currentTurn_)
-        return timeAvailableBeforeTurn_-currentTurn_->getDuration();
+    {
+        // Update turn time
+        return timeAvailableBeforeTurn_-currentTurnPlayed();
+    }
     else
         return timeAvailableBeforeTurn_;
 }
 
 
-int ChessClock::getTimePlayed() const
+int ChessClock::getTimePlayed()
 {
     // Count time played time
     if( currentTurn_ )
-        return timePlayedBeforeTurn_ + currentTurn_->getDuration();
+        return timePlayedBeforeTurn_ + currentTurnPlayed();
     else
         return timePlayedBeforeTurn_;
 }
 
+
+void ChessClock::setTimeAvailable(int msecs)
+{
+    timeAvailableBeforeTurn_ = msecs;
+}
+
+
+void ChessClock::addTime(int msecs)
+{
+   timeAvailableBeforeTurn_ += msecs;
+}
+
+int ChessClock::currentTurnPlayed()
+{
+    if( currentTurn_ )
+    {
+        // Update current time
+        if( status_ == Running )
+            currentTurn_->addTime( clockTime_.restart());
+
+        // Return current time
+        return currentTurn_->getDuration();
+     }
+    else
+        // No current turn!
+        return 0;
+}
+
 void ChessClock::updateClock()
 {
     // Check loser