Changeset 199 for trunk

Timestamp:

05/03/2009 05:12:43 PM (3 years ago)

Author:

guyru

Message:

Simple statistics dialog, make statistics class store last reset date

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (4 diffs)
• MainFrame.h (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• statistics.cpp (modified) (6 diffs)
• statistics.h (modified) (2 diffs)
• statistics_dialog.cpp (added)
• statistics_dialog.h (added)

trunk/src/MainFrame.cpp

@@ -34 +34 @@
 #include "configuration.h"
 #include "settings_dialog.h"
+#include "statistics_dialog.h"
 #include "../config.h"
 #include <iostream>
@@ -150 +151 @@
         gameMenu->Append(wxID_UNDO,wxT("&Undo\tCtrl+Z"));
         gameMenu->Append(ID_SHOWHIGHSCORE,wxT("Show Highscores\tCtrl+H"));
+        gameMenu->Append(ID_STATISTICS,wxT("Statistics..."));
         gameMenu->Append(ID_SETTINGS,wxT("Settings"));
         gameMenu->Append(wxID_EXIT);
@@ -347 +349 @@
         Connect(wxID_UNDO, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnUndo));
         Connect(ID_SHOWHIGHSCORE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnShowHighscore));
+        Connect(ID_STATISTICS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnStatistics));
         Connect(ID_SETTINGS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnSettings));
         //END connecting the menu items' events
@@ -522 +525 @@
         dialog->ShowModal();
 
+        delete dialog;
+}
+
+void MainFrame::OnStatistics(wxCommandEvent &event)
+{
+        statistics_dialog::StatisticsDialog *dialog = new statistics_dialog::StatisticsDialog(this, m_stats);
+        dialog->ShowModal();
         delete dialog;
 }

trunk/src/MainFrame.h

@@ -53 +53 @@
         void OnUndo (wxCommandEvent& event);
         void OnShowHighscore (wxCommandEvent& event);
+        void OnStatistics (wxCommandEvent& event);
         void OnSettings (wxCommandEvent& event);
         void OnSendComment (wxCommandEvent& event);
@@ -142 +143 @@
         ID_PANEL,
         ID_SHOWHIGHSCORE,
+        ID_STATISTICS,
         ID_SETTINGS,
         ID_THEMES,

trunk/src/Makefile.am

@@ -16 +16 @@
         ScoreDice.cpp \
         statistics.cpp \
+        statistics_dialog.cpp \
         wxDynamicBitmap.cpp \
         one.xpm \
@@ -34 +35 @@
         ScoreDice.h \
         statistics.h \
+        statistics_dialog.h \
         wxDynamicBitmap.h \
         ../openyahtzee.vcproj \

trunk/src/statistics.cpp

@@ -20 +20 @@
 
 #include <string>
+#include <sstream>
 #include <cstdlib>
 #include <boost/foreach.hpp>
@@ -38 +39 @@
         
         tmp = backend->get("statistics_games_started");
-        games_started = atoi(tmp.c_str());
+        _games_started = atoi(tmp.c_str());
 
         tmp = backend->get("statistics_games_finished");
-        games_finished = atoi(tmp.c_str());
+        _games_finished = atoi(tmp.c_str());
 
         tmp = backend->get("statistics_score_distribution");
@@ -53 +54 @@
                 score_distribution.push_back(atoi(i.c_str()));
         }
+
+        istringstream i(tmp);
+        i >> _last_reset;
 }
 
 void Statistics::game_started()
 {       
-        games_started++;
+        _games_started++;
         save();
 }
@@ -64 +68 @@
 {       
         int score_slot;
-        games_finished++;
+        _games_finished++;
 
         score_slot = score/score_distribution_granuality;
@@ -74 +78 @@
 void Statistics::save() {
         string tmp;
-        backend->set("statistics_games_started", stringify(games_started));
-        backend->set("statistics_games_finished", stringify(games_finished));
+        backend->set("statistics_games_started", stringify(_games_started));
+        backend->set("statistics_games_finished", stringify(_games_finished));
+        backend->set("statistics_last_reset", stringify(_last_reset));
 
         tmp = "";
@@ -89 +94 @@
 
 void Statistics::reset() {
-        games_started = 0;
-        games_finished = 0;
+        _games_started = 0;
+        _games_finished = 0;
+        _last_reset = time(NULL);
 
         score_distribution = vector<int>(score_distributions_slots, 0);

trunk/src/statistics.h

@@ -45 +45 @@
         void reset();
 
+        int games_started() { return _games_started; }
+        int games_finished() { return _games_finished; }
+        time_t last_reset() { return _last_reset; }
+
 private:
         /**
@@ -51 +55 @@
         void save();
 
-        int games_started;
-        int games_finished;
+        int _games_started;
+        int _games_finished;
+        time_t _last_reset;
+
         std::vector<int> score_distribution;
         configuration::Configuration *backend;