From 63ccfc7f9727e7aac48d6577a9217d9ec59deae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Sat, 8 Jan 2011 12:35:04 +0100
Subject: [PATCH] Merge of d71f055dfc1f9b9d8f3ad8bbb8048f2d2bab9522

---
 src/model/User.h        |  5 +++++
 src/view/StatsPanel.cpp | 41 +++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/model/User.h b/src/model/User.h
index 3e9b689..509186d 100644
--- a/src/model/User.h
+++ b/src/model/User.h
@@ -51,14 +51,19 @@ public:
     wxString GetCategoryName(wxString& catId);
     wxString GetCategoryId(wxString& catName);
     const wxFont GetCategoryFont(wxString& catId);
+
     Account GetAccount(const wxString& accountId);
     wxString GetAccountName(const wxString& accountId);
     wxString GetAccountId(wxString& accountName);
+
     int GetCategoriesNumber();
     int GetAccountsNumber();
     int GetOperationsNumber(int month, int year);
+
     wxLanguage GetLanguage();
+
     void LinkOrUnlinkOperation(Operation& op);
+
     void Group(const Operation& op);
     bool Group(std::vector<Operation>* ops, const Operation& op);
     void UnGroup(const Operation& op);
diff --git a/src/view/StatsPanel.cpp b/src/view/StatsPanel.cpp
index 62ca913..f285d2f 100644
--- a/src/view/StatsPanel.cpp
+++ b/src/view/StatsPanel.cpp
@@ -54,10 +54,12 @@ StatsPanel::StatsPanel(KissCount* kiss, wxUI *parent) : wxPanel(&(*parent)), _ki
         _yearTo->Append(wxString::Format(wxT("%d"), it->first));
     }
 
-    _monthFrom->Select(0);
-    _monthTo->Select(11);
+    if (i) i--;
+
     _yearFrom->Select(i);
     _yearTo->Select(i);
+    _monthFrom->Select(0);
+    _monthTo->Select(11);
 
     wxStaticText* label = new wxStaticText(this, wxID_ANY, _("From"));
     hbox->Add(label);
@@ -152,12 +154,11 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT
     std::map<wxString, std::map<int, std::map<int, double> > > accountAmounts;
     std::map<wxString, double> categories;
     std::map<wxString, std::vector<double> > operations;
-    std::map<wxString, std::vector<double> >::iterator accountIdIt2;
+    std::vector<Account>::iterator accountIt;
     std::map<wxString, double>::iterator categoriesIt;
-    std::map<wxString, std::map<int, std::map<int, double> > >::iterator accountIdIt;
     std::map<int, std::map<int, double> >::iterator accountYearIt;
     double total;
-    int size, i, a, b, percents, account, nbDays;
+    int account, size, i, a, b, percents, nbDays;
     double *amounts;
     wxString value;
     User* user = _kiss->GetUser();
@@ -193,10 +194,10 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT
 	dataset->AddSerie((double *) amounts, nbDays);
 	delete[] amounts;
 
-	for (account = 0, i = 0, accountIdIt2 = operations.begin(); accountIdIt2 != operations.end(); 
-	     accountIdIt2++, i++, account++)
+	for (account = 0, i = 0, accountIt = user->_accounts.begin(); accountIt != user->_accounts.end(); 
+	     account++, accountIt++, i++)
 	{
-	    if (!((wxCheckListBox*)_account)->IsChecked(account)) 
+	    if (!_account->IsChecked(account)) 
 	    { 
 		i-- ; 
 		continue;
@@ -207,11 +208,11 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT
 	    for (a=0; a<nbDays; a++)
 	    {
 		amounts[a*2+0] = a;
-		amounts[a*2+1] = operations[accountIdIt2->first][a];
+		amounts[a*2+1] = operations[accountIt->id][a];
 	    }
 	    dataset->AddSerie((double *) amounts, nbDays);
 	    // set serie names to be displayed on legend
-	    dataset->SetSerieName(i+1, user->GetAccountName(accountIdIt2->first));
+	    dataset->SetSerieName(i+1, user->GetAccountName(accountIt->id));
 	    delete[] amounts;
 	}
     }
@@ -234,34 +235,34 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT
 	dataset->AddSerie((double *) amounts, size);
 	delete[] amounts;
 
-	for (account = 0, i = 0, accountIdIt = accountAmounts.begin(); accountIdIt != accountAmounts.end(); 
-	     accountIdIt++, i++, account++)
+	for (account = 0, i = 0, accountIt = user->_accounts.begin(); accountIt != user->_accounts.end(); 
+	     account++, accountIt++, i++)
 	{
-	    if (!((wxCheckListBox*)_account)->IsChecked(account)) 
+	    if (!_account->IsChecked(account)) 
 	    { 
 		i-- ; 
 		continue;
 	    }
 
-	    size = accountAmounts[accountIdIt->first].size();
+	    size = accountAmounts[accountIt->id].size();
 	    amounts = new double[size*12*2];
 	    size = 0;
-	    for(a = 0, accountYearIt = accountAmounts[accountIdIt->first].begin();
-		accountYearIt != accountAmounts[accountIdIt->first].end();
+	    for(a = 0, accountYearIt = accountAmounts[accountIt->id].begin();
+		accountYearIt != accountAmounts[accountIt->id].end();
 		accountYearIt++, a++)
 	    {
 		for(b = 0; b<12; b++)
 		{
-		    if (!accountAmounts[accountIdIt->first][accountYearIt->first].count(b))
+		    if (!accountAmounts[accountIt->id][accountYearIt->first].count(b))
 			continue;
 		    amounts[size*2+0] = a*12+b;
-		    amounts[size*2+1] = accountAmounts[accountIdIt->first][accountYearIt->first][b];
+		    amounts[size*2+1] = accountAmounts[accountIt->id][accountYearIt->first][b];
 		    size++;
 		}
 	    }
 	    dataset->AddSerie((double *) amounts, size);
 	    // set serie names to be displayed on legend
-	    dataset->SetSerieName(i+1, user->GetAccountName(accountIdIt->first));
+	    dataset->SetSerieName(i+1, user->GetAccountName(accountIt->id));
 	    delete[] amounts;
 	}
     }
@@ -340,7 +341,7 @@ void StatsPanel::OnRangeChange(wxCommandEvent& event)
     monthTo = _monthTo->GetCurrentSelection();
     _yearTo->GetStringSelection().ToLong(&yearTo);
 
-    if (yearTo > yearFrom ||
+    if (yearTo < yearFrom ||
         (yearFrom == yearTo && monthFrom > monthTo))
     {
         wxMessageBox(_("Invalide date range"), _("KissCount"), wxICON_ERROR | wxOK);