mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Added position_hint to statistics categories, for customizable ordering of the items in the statistics panel
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@452 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -17,15 +17,17 @@ DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
|
||||
// ----------------------------------------------------------------------------- : Statistics dimension
|
||||
|
||||
StatsDimension::StatsDimension()
|
||||
: automatic (false)
|
||||
, numeric (false)
|
||||
, show_empty(false)
|
||||
: automatic (false)
|
||||
, position_hint(0)
|
||||
, numeric (false)
|
||||
, show_empty (false)
|
||||
{}
|
||||
|
||||
StatsDimension::StatsDimension(const Field& field)
|
||||
: automatic (true)
|
||||
, name (field.name)
|
||||
, description (field.description)
|
||||
, position_hint(0)
|
||||
, icon_filename(field.icon_filename)
|
||||
, numeric (false)
|
||||
, show_empty (false)
|
||||
@@ -63,6 +65,7 @@ IMPLEMENT_REFLECTION_NO_GET_MEMBER(StatsDimension) {
|
||||
if (!automatic) {
|
||||
REFLECT(name);
|
||||
REFLECT(description);
|
||||
REFLECT(position_hint);
|
||||
REFLECT_N("icon", icon_filename);
|
||||
REFLECT(script);
|
||||
REFLECT(numeric);
|
||||
@@ -76,6 +79,7 @@ IMPLEMENT_REFLECTION_NO_GET_MEMBER(StatsDimension) {
|
||||
|
||||
StatsCategory::StatsCategory()
|
||||
: automatic(false)
|
||||
, position_hint(0)
|
||||
, type(GRAPH_TYPE_BAR)
|
||||
{}
|
||||
|
||||
@@ -83,6 +87,7 @@ StatsCategory::StatsCategory(const StatsDimensionP& dim)
|
||||
: automatic(true)
|
||||
, name (dim->name)
|
||||
, description (dim->description)
|
||||
, position_hint(dim->position_hint)
|
||||
, icon_filename(dim->icon_filename)
|
||||
, dimensions(1, dim)
|
||||
, type(GRAPH_TYPE_BAR)
|
||||
@@ -92,6 +97,7 @@ IMPLEMENT_REFLECTION_NO_GET_MEMBER(StatsCategory) {
|
||||
if (!automatic) {
|
||||
REFLECT(name);
|
||||
REFLECT(description);
|
||||
REFLECT(position_hint);
|
||||
REFLECT_N("icon", icon_filename);
|
||||
REFLECT(type);
|
||||
REFLECT_N("dimensions", dimension_names);
|
||||
|
||||
@@ -27,9 +27,10 @@ class StatsDimension : public IntrusivePtrBase<StatsDimension> {
|
||||
StatsDimension();
|
||||
StatsDimension(const Field&);
|
||||
|
||||
bool automatic; ///< Based on a card field?
|
||||
const bool automatic; ///< Based on a card field?
|
||||
String name; ///< Name of this dimension
|
||||
String description; ///< Description, used in status bar
|
||||
int position_hint; ///< Hint for the ordering
|
||||
String icon_filename; ///< Icon for lists
|
||||
OptionalScript script; ///< Script that determines the value(s)
|
||||
bool numeric; ///< Are the values numeric? If so, they require special sorting
|
||||
@@ -49,9 +50,10 @@ class StatsCategory : public IntrusivePtrBase<StatsCategory> {
|
||||
StatsCategory();
|
||||
StatsCategory(const StatsDimensionP&);
|
||||
|
||||
bool automatic; ///< Automatically generated?
|
||||
const bool automatic; ///< Automatically generated?
|
||||
String name; ///< Name/label
|
||||
String description; ///< Description, used in status bar
|
||||
int position_hint; ///< Hint for the ordering
|
||||
String icon_filename; ///< Icon for lists
|
||||
Bitmap icon; ///< The loaded icon (optional of course)
|
||||
vector<String> dimension_names;///< Names of the dimensions to use
|
||||
|
||||
Reference in New Issue
Block a user