restored old style stats panel (with an #ifdef)

src/gui/set/stats_panel.cpp

@@ -25,6 +25,9 @@ DECLARE_TYPEOF_COLLECTION(CardP);
 typedef pair<StatsDimensionP,String> pair_StatsDimensionP_String;
 DECLARE_TYPEOF_COLLECTION(pair_StatsDimensionP_String);
 
+// Pick the style here:
+#define USE_DIMENSION_LISTS 0
+
 // ----------------------------------------------------------------------------- : StatCategoryList
 
 /// A list of fields of which the statistics can be shown
@@ -187,10 +190,13 @@ StatsPanel::StatsPanel(Window* parent, int id)
 {
 	// init controls
 	wxSplitterWindow* splitter;
-	//%categories = new StatCategoryList(this, ID_FIELD_LIST);
+	#if USE_DIMENSION_LISTS
 		for (int i = 0 ; i < 3 ; ++i) {
 			dimensions[i] = new StatDimensionList(this, ID_FIELD_LIST, i > 0);
 		}
+	#else
+		categories = new StatCategoryList(this, ID_FIELD_LIST);
+	#endif
 	splitter   = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
 	graph      = new GraphControl    (splitter, wxID_ANY);
 	card_list  = new FilteredCardList(splitter, wxID_ANY);
@@ -200,12 +206,15 @@ StatsPanel::StatsPanel(Window* parent, int id)
 	splitter->SplitHorizontally(graph, card_list, -170);
 	// init sizer
 	wxSizer* s = new wxBoxSizer(wxHORIZONTAL);
-	//%s->Add(categories, 0, wxEXPAND | wxRIGHT, 2);
+	#if USE_DIMENSION_LISTS
 		wxSizer* s2 = new wxBoxSizer(wxVERTICAL);
 			s2->Add(dimensions[0], 1, wxBOTTOM, 2);
 			s2->Add(dimensions[1], 1, wxBOTTOM, 2);
 			s2->Add(dimensions[2], 1);
 		s->Add(s2, 0, wxEXPAND | wxRIGHT, 2);
+	#else
+		s->Add(categories, 0, wxEXPAND | wxRIGHT, 2);
+	#endif
 	s->Add(splitter,   1, wxEXPAND);
 	s->SetSizeHints(this);
 	SetSizer(s);
@@ -213,8 +222,11 @@ StatsPanel::StatsPanel(Window* parent, int id)
 
 void StatsPanel::onChangeSet() {
 	card_list->setSet(set);
-	//%categories->show(set->game);
+	#if USE_DIMENSION_LISTS
 		for (int i = 0 ; i < 3 ; ++i) dimensions[i]->show(set->game);
+	#else
+		categories->show(set->game);
+	#endif
 	onChange();
 }
 
@@ -277,6 +289,7 @@ void StatsPanel::onChange() {
 void StatsPanel::showCategory() {
 	up_to_date = true;
 	// change graph data
+	#if USE_DIMENSION_LISTS
 		GraphDataPre d;
 		// create axes
 		vector<StatsDimensionP> dims;
@@ -322,7 +335,7 @@ void StatsPanel::showCategory() {
 						:                   GRAPH_TYPE_SCATTER_PIE);
 		graph->setData(d);
 		filterCards();
-	/*
+	#else
 		if (categories->hasSelection()) {
 			StatsCategory& cat = categories->getSelection();
 			GraphDataPre d;
@@ -366,26 +379,14 @@ void StatsPanel::showCategory() {
 			graph->setData(d);
 			filterCards();
 		}
-	*/
+	#endif
 }
 void StatsPanel::onGraphSelect(wxCommandEvent&) {
 	filterCards();
 }
 
 void StatsPanel::filterCards() {
-	/*if (!categories->hasSelection()) return;
-	intrusive_ptr<StatsFilter> filter(new StatsFilter(*set));
-	StatsCategory& cat = categories->getSelection();
-	vector<pair<StatsDimensionP, String> > values;
-	int i = 0;
-	FOR_EACH(dim, cat.dimensions) {
-		if (graph->hasSelection(i)) {
-			filter->values.push_back(make_pair(dim, graph->getSelection(i)));
-		}
-		i++;
-	}
-	card_list->setFilter(filter);
-	*/
+	#if USE_DIMENSION_LISTS
 		intrusive_ptr<StatsFilter> filter(new StatsFilter(*set));
 		int dims = 0;
 		for (int i = 0 ; i < 3 ; ++i) {
@@ -398,6 +399,20 @@ void StatsPanel::filterCards() {
 		}
 		if (dims == 0) return;
 		card_list->setFilter(filter);
+	#else
+		if (!categories->hasSelection()) return;
+		intrusive_ptr<StatsFilter> filter(new StatsFilter(*set));
+		StatsCategory& cat = categories->getSelection();
+		vector<pair<StatsDimensionP, String> > values;
+		int i = 0;
+		FOR_EACH(dim, cat.dimensions) {
+			if (graph->hasSelection(i)) {
+				filter->values.push_back(make_pair(dim, graph->getSelection(i)));
+			}
+			i++;
+		}
+		card_list->setFilter(filter);
+	#endif
 }
 
 BEGIN_EVENT_TABLE(StatsPanel, wxPanel)