Changeset 202

Timestamp:

05/04/2009 12:22:36 PM (3 years ago)

Author:

guyru

Message:

Add simple histogram to statistics

Location:

trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• simple_histogram.cpp (added)
• simple_histogram.h (added)
• statistics.cpp (modified) (6 diffs)
• statistics.h (modified) (2 diffs)
• statistics_dialog.cpp (modified) (3 diffs)
• statistics_dialog.h (modified) (2 diffs)

trunk/src/Makefile.am

@@ -15 +15 @@
         settings_dialog.h \
         ScoreDice.cpp \
+        simple_histogram.cpp \
         statistics.cpp \
         statistics_dialog.cpp \
@@ -34 +35 @@
         MainFrame.h \
         ScoreDice.h \
+        simple_histogram.h \
         statistics.h \
         statistics_dialog.h \

trunk/src/statistics.cpp

@@ -34 +34 @@
 Statistics::Statistics(configuration::Configuration *backend)
 {
+        this->backend = backend;
         try {
                 load_data();
@@ -45 +46 @@
         string tmp;
         vector<string> tmp_vec;
-        this->backend = backend;
         
         tmp = backend->get("statistics_games_started");
@@ -59 +59 @@
 
         BOOST_FOREACH(string i, tmp_vec) {
-                score_distribution.push_back(atoi(i.c_str()));
+                _score_distribution.push_back(atoi(i.c_str()));
         }
 
@@ -82 +82 @@
         score_slot = score/score_distribution_granuality;
         score_slot = score_slot<score_distributions_slots ? score_slot : score_slot;
-        score_distribution[score_slot]++;
+        _score_distribution[score_slot]++;
         save();
 }
@@ -93 +93 @@
 
         tmp = "";
-        BOOST_FOREACH(int i, score_distribution) {
+        BOOST_FOREACH(int i, _score_distribution) {
                 tmp += stringify(i) + ",";
         }
@@ -108 +108 @@
         _last_reset = time(NULL);
 
-        score_distribution = vector<int>(score_distributions_slots, 0);
+        _score_distribution = vector<int>(score_distributions_slots, 0);
         
         save();

trunk/src/statistics.h

@@ -49 +49 @@
         int games_finished() { return _games_finished; }
         time_t last_reset() { return _last_reset; }
+        std::vector<int> score_distribution() { return _score_distribution; }
 
 private:
@@ -65 +66 @@
         time_t _last_reset;
 
-        std::vector<int> score_distribution;
+        std::vector<int> _score_distribution;
         configuration::Configuration *backend;
 };

trunk/src/statistics_dialog.cpp

@@ -46 +46 @@
         games_started = new wxStaticText(this, wxID_ANY, wxT(""));
         games_finished = new wxStaticText(this, wxID_ANY, wxT(""));
+        histogram = new SimpleHistogram(this, wxID_ANY);
         statistics_reset_date = new wxStaticText(this, wxID_ANY, wxT(""));
 }
@@ -61 +62 @@
         tmp = wxT("Last reset: ") + reset_time.Format();
         statistics_reset_date->SetLabel(tmp);
+
+        vector<int> score_dist = m_stats->score_distribution();
+        vector<double> dist (score_dist.begin(), score_dist.end());
+        histogram->SetData(dist);
 }
 
@@ -71 +76 @@
         game_counts->AddStretchSpacer(10);
         game_counts->Add(games_finished);
-        top_sizer->Add(game_counts,10,wxEXPAND);
+        top_sizer->Add(game_counts,0,wxEXPAND,10);
 
         wxStaticBoxSizer* score_distribution = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Score Distribution") ), wxHORIZONTAL);
-        top_sizer->Add(score_distribution,10,wxEXPAND);
+        score_distribution->Add(histogram, 1, wxEXPAND, 10);
+        top_sizer->Add(score_distribution,10,wxEXPAND, 10);
 
-        top_sizer->Add(statistics_reset_date,10,wxEXPAND);
+        top_sizer->Add(statistics_reset_date,0,wxEXPAND,10);
         
         wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );

trunk/src/statistics_dialog.h

@@ -22 +22 @@
 
 #include "statistics.h"
+#include "simple_histogram.h"
 #include <wx/wx.h>
 #include <wx/dialog.h>
@@ -46 +47 @@
         wxStaticText *games_finished;
         wxStaticText *statistics_reset_date;
+        SimpleHistogram* histogram;
 
         statistics::Statistics* m_stats;