amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 14:07:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

restored old style stats panel (with an #ifdef)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@891 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-05-30 18:45:33 +00:00
parent d45a14b869
commit a1e968b305
1 changed files with 105 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/stats_panel.cpp
+105 -90
View File
@@ -25,6 +25,9 @@ DECLARE_TYPEOF_COLLECTION(CardP);
typedef pair<StatsDimensionP,String> pair_StatsDimensionP_String; typedef pair<StatsDimensionP,String> pair_StatsDimensionP_String;
DECLARE_TYPEOF_COLLECTION(pair_StatsDimensionP_String); DECLARE_TYPEOF_COLLECTION(pair_StatsDimensionP_String);
// Pick the style here:
#define USE_DIMENSION_LISTS 0
// ----------------------------------------------------------------------------- : StatCategoryList // ----------------------------------------------------------------------------- : StatCategoryList
/// A list of fields of which the statistics can be shown /// A list of fields of which the statistics can be shown
@@ -187,10 +190,13 @@ StatsPanel::StatsPanel(Window* parent, int id)
{ {
// init controls // init controls
wxSplitterWindow* splitter; wxSplitterWindow* splitter;
//%categories = new StatCategoryList(this, ID_FIELD_LIST); #if USE_DIMENSION_LISTS
for (int i = 0 ; i < 3 ; ++i) { for (int i = 0 ; i < 3 ; ++i) {
dimensions[i] = new StatDimensionList(this, ID_FIELD_LIST, i > 0); 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); splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
graph = new GraphControl (splitter, wxID_ANY); graph = new GraphControl (splitter, wxID_ANY);
card_list = new FilteredCardList(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); splitter->SplitHorizontally(graph, card_list, -170);
// init sizer // init sizer
wxSizer* s = new wxBoxSizer(wxHORIZONTAL); wxSizer* s = new wxBoxSizer(wxHORIZONTAL);
//%s->Add(categories, 0, wxEXPAND | wxRIGHT, 2); #if USE_DIMENSION_LISTS
wxSizer* s2 = new wxBoxSizer(wxVERTICAL); wxSizer* s2 = new wxBoxSizer(wxVERTICAL);
s2->Add(dimensions[0], 1, wxBOTTOM, 2); s2->Add(dimensions[0], 1, wxBOTTOM, 2);
s2->Add(dimensions[1], 1, wxBOTTOM, 2); s2->Add(dimensions[1], 1, wxBOTTOM, 2);
s2->Add(dimensions[2], 1); s2->Add(dimensions[2], 1);
s->Add(s2, 0, wxEXPAND | wxRIGHT, 2); s->Add(s2, 0, wxEXPAND | wxRIGHT, 2);
#else
s->Add(categories, 0, wxEXPAND | wxRIGHT, 2);
#endif
s->Add(splitter, 1, wxEXPAND); s->Add(splitter, 1, wxEXPAND);
s->SetSizeHints(this); s->SetSizeHints(this);
SetSizer(s); SetSizer(s);
@@ -213,8 +222,11 @@ StatsPanel::StatsPanel(Window* parent, int id)
void StatsPanel::onChangeSet() { void StatsPanel::onChangeSet() {
card_list->setSet(set); card_list->setSet(set);
//%categories->show(set->game); #if USE_DIMENSION_LISTS
for (int i = 0 ; i < 3 ; ++i) dimensions[i]->show(set->game); for (int i = 0 ; i < 3 ; ++i) dimensions[i]->show(set->game);
#else
categories->show(set->game);
#endif
onChange(); onChange();
} }
@@ -277,58 +289,14 @@ void StatsPanel::onChange() {
void StatsPanel::showCategory() { void StatsPanel::showCategory() {
up_to_date = true; up_to_date = true;
// change graph data // change graph data
GraphDataPre d; #if USE_DIMENSION_LISTS
// create axes
vector<StatsDimensionP> dims;
for (int i = 0 ; i < 3 ; ++i) {
StatsDimensionP dim = dimensions[i]->getSelection();
if (!dim) continue;
dims.push_back(dim);
d.axes.push_back(new_intrusive5<GraphAxis>(
dim->name,
dim->colors.empty() ? AUTO_COLOR_EVEN : AUTO_COLOR_NO,
dim->numeric,
&dim->colors,
dim->groups.empty() ? nullptr : &dim->groups
)
);
}
// find values
FOR_EACH(card, set->cards) {
Context& ctx = set->getContext(card);
GraphElementP e(new GraphElement);
bool show = true;
FOR_EACH(dim, dims) {
String value = untag(dim->script.invoke(ctx)->toString());
e->values.push_back(value);
if (value.empty() && !dim->show_empty) {
// don't show this element
show = false;
break;
}
}
if (show) {
d.elements.push_back(e);
}
}
// split lists
size_t dim_id = 0;
FOR_EACH(dim, dims) {
if (dim->split_list) d.splitList(dim_id);
++dim_id;
}
graph->setLayout(dims.size() == 1 ? GRAPH_TYPE_BAR
:dims.size() == 2 ? GRAPH_TYPE_STACK
: GRAPH_TYPE_SCATTER_PIE);
graph->setData(d);
filterCards();
/*
if (categories->hasSelection()) {
StatsCategory& cat = categories->getSelection();
GraphDataPre d; GraphDataPre d;
cat.find_dimensions(set->game->statistics_dimensions);
// create axes // create axes
FOR_EACH(dim, cat.dimensions) { vector<StatsDimensionP> dims;
for (int i = 0 ; i < 3 ; ++i) {
StatsDimensionP dim = dimensions[i]->getSelection();
if (!dim) continue;
dims.push_back(dim);
d.axes.push_back(new_intrusive5<GraphAxis>( d.axes.push_back(new_intrusive5<GraphAxis>(
dim->name, dim->name,
dim->colors.empty() ? AUTO_COLOR_EVEN : AUTO_COLOR_NO, dim->colors.empty() ? AUTO_COLOR_EVEN : AUTO_COLOR_NO,
@@ -343,7 +311,7 @@ void StatsPanel::showCategory() {
Context& ctx = set->getContext(card); Context& ctx = set->getContext(card);
GraphElementP e(new GraphElement); GraphElementP e(new GraphElement);
bool show = true; bool show = true;
FOR_EACH(dim, cat.dimensions) { FOR_EACH(dim, dims) {
String value = untag(dim->script.invoke(ctx)->toString()); String value = untag(dim->script.invoke(ctx)->toString());
e->values.push_back(value); e->values.push_back(value);
if (value.empty() && !dim->show_empty) { if (value.empty() && !dim->show_empty) {
@@ -358,46 +326,93 @@ void StatsPanel::showCategory() {
} }
// split lists // split lists
size_t dim_id = 0; size_t dim_id = 0;
FOR_EACH(dim, cat.dimensions) { FOR_EACH(dim, dims) {
if (dim->split_list) d.splitList(dim_id); if (dim->split_list) d.splitList(dim_id);
++dim_id; ++dim_id;
} }
graph->setLayout(cat.type); graph->setLayout(dims.size() == 1 ? GRAPH_TYPE_BAR
:dims.size() == 2 ? GRAPH_TYPE_STACK
: GRAPH_TYPE_SCATTER_PIE);
graph->setData(d); graph->setData(d);
filterCards(); filterCards();
} #else
*/ if (categories->hasSelection()) {
StatsCategory& cat = categories->getSelection();
GraphDataPre d;
cat.find_dimensions(set->game->statistics_dimensions);
// create axes
FOR_EACH(dim, cat.dimensions) {
d.axes.push_back(new_intrusive5<GraphAxis>(
dim->name,
dim->colors.empty() ? AUTO_COLOR_EVEN : AUTO_COLOR_NO,
dim->numeric,
&dim->colors,
dim->groups.empty() ? nullptr : &dim->groups
)
);
}
// find values
FOR_EACH(card, set->cards) {
Context& ctx = set->getContext(card);
GraphElementP e(new GraphElement);
bool show = true;
FOR_EACH(dim, cat.dimensions) {
String value = untag(dim->script.invoke(ctx)->toString());
e->values.push_back(value);
if (value.empty() && !dim->show_empty) {
// don't show this element
show = false;
break;
}
}
if (show) {
d.elements.push_back(e);
}
}
// split lists
size_t dim_id = 0;
FOR_EACH(dim, cat.dimensions) {
if (dim->split_list) d.splitList(dim_id);
++dim_id;
}
graph->setLayout(cat.type);
graph->setData(d);
filterCards();
}
#endif
} }
void StatsPanel::onGraphSelect(wxCommandEvent&) { void StatsPanel::onGraphSelect(wxCommandEvent&) {
filterCards(); filterCards();
} }
void StatsPanel::filterCards() { void StatsPanel::filterCards() {
/*if (!categories->hasSelection()) return; #if USE_DIMENSION_LISTS
intrusive_ptr<StatsFilter> filter(new StatsFilter(*set)); intrusive_ptr<StatsFilter> filter(new StatsFilter(*set));
StatsCategory& cat = categories->getSelection(); int dims = 0;
vector<pair<StatsDimensionP, String> > values; for (int i = 0 ; i < 3 ; ++i) {
int i = 0; StatsDimensionP dim = dimensions[i]->getSelection();
FOR_EACH(dim, cat.dimensions) { if (!dim) continue;
if (graph->hasSelection(i)) { ++dims;
filter->values.push_back(make_pair(dim, graph->getSelection(i))); if (graph->hasSelection(i)) {
filter->values.push_back(make_pair(dim, graph->getSelection(i)));
}
} }
i++; if (dims == 0) return;
} card_list->setFilter(filter);
card_list->setFilter(filter); #else
*/ if (!categories->hasSelection()) return;
intrusive_ptr<StatsFilter> filter(new StatsFilter(*set)); intrusive_ptr<StatsFilter> filter(new StatsFilter(*set));
int dims = 0; StatsCategory& cat = categories->getSelection();
for (int i = 0 ; i < 3 ; ++i) { vector<pair<StatsDimensionP, String> > values;
StatsDimensionP dim = dimensions[i]->getSelection(); int i = 0;
if (!dim) continue; FOR_EACH(dim, cat.dimensions) {
++dims; if (graph->hasSelection(i)) {
if (graph->hasSelection(i)) { filter->values.push_back(make_pair(dim, graph->getSelection(i)));
filter->values.push_back(make_pair(dim, graph->getSelection(i))); }
i++;
} }
} card_list->setFilter(filter);
if (dims == 0) return; #endif
card_list->setFilter(filter);
} }
BEGIN_EVENT_TABLE(StatsPanel, wxPanel) BEGIN_EVENT_TABLE(StatsPanel, wxPanel)