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

Added toolbar and menu for switching between graph layouts

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@914 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-05-31 20:15:21 +00:00
parent 44fd9dbb42
commit 78e154c481
9 changed files with 149 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/graph.cpp
+13 -3
View File
@@ -802,8 +802,8 @@ GraphControl::GraphControl(Window* parent, int id)
: wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS)
{}
void GraphControl::setLayout(GraphType type) {
if (graph && type == layout) return;
void GraphControl::setLayout(GraphType type, bool force) {
if (!force && graph && type == layout) return;
GraphDataP data = graph ? graph->getData() : GraphDataP();
switch (type) {
case GRAPH_TYPE_BAR: {
@@ -815,7 +815,8 @@ void GraphControl::setLayout(GraphType type) {
break;
} case GRAPH_TYPE_PIE: {
intrusive_ptr<GraphContainer> combined(new GraphContainer());
combined->add(new_intrusive1<PieGraph>(0));
combined->add(new_intrusive5<GraphWithMargins>(new_intrusive1<PieGraph>(0), 0,0,120,0));
combined->add(new_intrusive3<GraphLegend>(0, ALIGN_TOP_RIGHT, true));
graph = new_intrusive5<GraphWithMargins>(combined, 20,20,20,20);
break;
} case GRAPH_TYPE_STACK: {
@@ -847,6 +848,10 @@ void GraphControl::setLayout(GraphType type) {
layout = type;
}
GraphType GraphControl::getLayout() const {
return layout;
}
void GraphControl::setData(const GraphDataPre& data) {
setData(new_intrusive1<GraphData>(data));
}
@@ -858,6 +863,11 @@ void GraphControl::setData(const GraphDataP& data) {
Refresh(false);
}
size_t GraphControl::getDimensionality() const {
if (graph) return graph->getData()->axes.size();
else return 0;
}
void GraphControl::onPaint(wxPaintEvent&) {
wxBufferedPaintDC dc(this);
wxSize cs = GetClientSize();
src/gui/control/graph.hpp
+6 -1
View File
@@ -305,7 +305,7 @@ class GraphControl : public wxControl {
GraphControl(Window* parent, int id);
/// Set the type of graph used, from a number of predefined choices
void setLayout(GraphType type);
void setLayout(GraphType type, bool force_refresh = false);
/// Update the data in the graph
void setData(const GraphDataPre& data);
/// Update the data in the graph
@@ -316,6 +316,11 @@ class GraphControl : public wxControl {
/// Get the current item along the given axis
String getSelection(size_t axis) const;
/// Get the current layout
GraphType getLayout() const;
/// Get the current dimensionality
size_t getDimensionality() const;
private:
/// Graph object
GraphP graph;
src/gui/set/stats_panel.cpp
+64 -7
View File
@@ -11,6 +11,8 @@
#include <gui/control/graph.hpp>
#include <gui/control/gallery_list.hpp>
#include <gui/control/filtered_card_list.hpp>
#include <gui/icon_menu.hpp>
#include <gui/util.hpp>
#include <data/game.hpp>
#include <data/statistics.hpp>
#include <util/window_id.hpp>
@@ -26,7 +28,7 @@ typedef pair<StatsDimensionP,String> pair_StatsDimensionP_String;
DECLARE_TYPEOF_COLLECTION(pair_StatsDimensionP_String);
// Pick the style here:
#define USE_DIMENSION_LISTS 0
#define USE_DIMENSION_LISTS 1
// ----------------------------------------------------------------------------- : StatCategoryList
@@ -218,6 +220,18 @@ StatsPanel::StatsPanel(Window* parent, int id)
s->Add(splitter, 1, wxEXPAND);
s->SetSizeHints(this);
SetSizer(s);
// init menu
menuGraph = new IconMenu();
menuGraph->Append(ID_GRAPH_PIE, _("graph_pie"), _MENU_("pie"), _HELP_("pie"), wxITEM_CHECK);
menuGraph->Append(ID_GRAPH_BAR, _("graph_bar"), _MENU_("bar"), _HELP_("bar"), wxITEM_CHECK);
menuGraph->Append(ID_GRAPH_STACK, _("graph_stack"), _MENU_("stack"), _HELP_("stack"), wxITEM_CHECK);
menuGraph->Append(ID_GRAPH_SCATTER, _("graph_scatter"), _MENU_("scatter"), _HELP_("scatter"), wxITEM_CHECK);
menuGraph->Append(ID_GRAPH_SCATTER_PIE, _("graph_scatter_pie"), _MENU_("scatter pie"), _HELP_("scatter pie"), wxITEM_CHECK);
}
StatsPanel::~StatsPanel() {
delete menuGraph;
}
void StatsPanel::onChangeSet() {
@@ -234,12 +248,44 @@ void StatsPanel::onAction(const Action&, bool undone) {
onChange();
}
void StatsPanel::initUI (wxToolBar*, wxMenuBar*) {
void StatsPanel::initUI (wxToolBar* tb, wxMenuBar* mb) {
active = true;
if (!up_to_date) showCategory();
// Toolbar
#if USE_DIMENSION_LISTS
tb->AddTool(ID_GRAPH_PIE, _(""), load_resource_tool_image(_("graph_pie")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("pie"), _HELP_("pie"));
tb->AddTool(ID_GRAPH_BAR, _(""), load_resource_tool_image(_("graph_bar")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("bar"), _HELP_("bar"));
tb->AddTool(ID_GRAPH_STACK, _(""), load_resource_tool_image(_("graph_stack")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("stack"), _HELP_("stack"));
tb->AddTool(ID_GRAPH_SCATTER, _(""), load_resource_tool_image(_("graph_scatter")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("scatter"), _HELP_("scatter"));
tb->AddTool(ID_GRAPH_SCATTER_PIE, _(""), load_resource_tool_image(_("graph_scatter_pie")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("scatter pie"), _HELP_("scatter pie"));
tb->Realize();
// Menu
mb->Insert(2, menuGraph, _MENU_("graph"));
#endif
}
void StatsPanel::destroyUI(wxToolBar*, wxMenuBar*) {
void StatsPanel::destroyUI(wxToolBar* tb, wxMenuBar* mb) {
active = false;
#if USE_DIMENSION_LISTS
// Toolbar
tb->DeleteTool(ID_GRAPH_PIE);
tb->DeleteTool(ID_GRAPH_BAR);
tb->DeleteTool(ID_GRAPH_STACK);
tb->DeleteTool(ID_GRAPH_SCATTER);
tb->DeleteTool(ID_GRAPH_SCATTER_PIE);
// Menus
mb->Remove(2);
#endif
}
void StatsPanel::onUpdateUI(wxUpdateUIEvent& ev) {
switch (ev.GetId()) {
case ID_GRAPH_PIE: case ID_GRAPH_BAR: case ID_GRAPH_STACK: case ID_GRAPH_SCATTER: case ID_GRAPH_SCATTER_PIE: {
GraphType type = (GraphType)(ev.GetId() - ID_GRAPH_PIE);
ev.Check(graph->getLayout() == type);
ev.Enable(graph->getDimensionality() == dimensionality(type));
break;
}
}
}
void StatsPanel::onCommand(int id) {
@@ -248,6 +294,12 @@ void StatsPanel::onCommand(int id) {
onChange();
break;
}
case ID_GRAPH_PIE: case ID_GRAPH_BAR: case ID_GRAPH_STACK: case ID_GRAPH_SCATTER: case ID_GRAPH_SCATTER_PIE: {
GraphType type = (GraphType)(id - ID_GRAPH_PIE);
graph->setLayout(type);
graph->Refresh(false);
break;
}
}
}
@@ -330,9 +382,14 @@ void StatsPanel::showCategory() {
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);
GraphType layout = graph->getLayout();
if (dimensionality(layout) != dims.size()) {
// we must switch to another layout
layout = dims.size() == 1 ? GRAPH_TYPE_BAR
: dims.size() == 2 ? GRAPH_TYPE_STACK
: GRAPH_TYPE_SCATTER_PIE;
}
graph->setLayout(layout, true);
graph->setData(d);
filterCards();
#else
@@ -376,7 +433,7 @@ void StatsPanel::showCategory() {
++dim_id;
}
graph->setLayout(cat.type);
graph->setData(d);
graph->setData(d, true);
filterCards();
}
#endif
src/gui/set/stats_panel.hpp
+4
View File
@@ -16,6 +16,7 @@ class StatCategoryList;
class StatDimensionList;
class GraphControl;
class FilteredCardList;
class IconMenu;
// ----------------------------------------------------------------------------- : StatsPanel
@@ -23,6 +24,7 @@ class FilteredCardList;
class StatsPanel : public SetWindowPanel {
public:
StatsPanel(Window* parent, int id);
~StatsPanel();
// --------------------------------------------------- : UI
@@ -31,6 +33,7 @@ class StatsPanel : public SetWindowPanel {
virtual void initUI (wxToolBar*, wxMenuBar*);
virtual void destroyUI(wxToolBar*, wxMenuBar*);
virtual void onUpdateUI(wxUpdateUIEvent&);
virtual void onCommand(int id);
// --------------------------------------------------- : Selection
@@ -45,6 +48,7 @@ class StatsPanel : public SetWindowPanel {
StatDimensionList* dimensions[3];
GraphControl* graph;
FilteredCardList* card_list;
IconMenu* menuGraph;
bool up_to_date; ///< Are the graph and card list up to date?
bool active; ///< Is this panel selected?