mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

statistics: split people binner

Browse source 
The people binner (called "buddies") is too coarse. Split into
buddies, dive guide and people (the old "buddies", which is
a combination of buddies and dive guide).

Reported-by: Peter Zaal <peter.zaal@gmail.com>
Reported-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-01-11 00:12:22 +01:00 • committed by Dirk Hohndel
parent 3cd795c71e
commit 233e686b92
1 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

59
stats/statsvariables.cpp
View file

@ -1420,9 +1420,9 @@ struct DiveModeVariable : public StatsVariableTemplate<StatsVariable::Type::Disc
} }
}; };
// ============ Buddy (including dive guides) ============ // ============ People, buddies and dive guides ============
struct BuddyBinner : public StringBinner<BuddyBinner, StringBin> { struct PeopleBinner : public StringBinner<PeopleBinner, StringBin> {
std::vector<QString> to_bin_values(const dive *d) const { std::vector<QString> to_bin_values(const dive *d) const {
std::vector<QString> dive_people; std::vector<QString> dive_people;
for (const QString &s: QString(d->buddy).split(",", SKIP_EMPTY)) for (const QString &s: QString(d->buddy).split(",", SKIP_EMPTY))
@ -1433,10 +1433,10 @@ struct BuddyBinner : public StringBinner<BuddyBinner, StringBin> {
} }
}; };
static BuddyBinner buddy_binner; static PeopleBinner people_binner;
struct BuddyVariable : public StatsVariableTemplate<StatsVariable::Type::Discrete> { struct PeopleVariable : public StatsVariableTemplate<StatsVariable::Type::Discrete> {
QString name() const override { QString name() const override {
return StatsTranslations::tr("Buddies"); return StatsTranslations::tr("People");
} }
QString diveCategories(const dive *d) const override { QString diveCategories(const dive *d) const override {
QString buddy = QString(d->buddy).trimmed(); QString buddy = QString(d->buddy).trimmed();
@ -1445,11 +1445,55 @@ struct BuddyVariable : public StatsVariableTemplate<StatsVariable::Type::Discret
buddy += ", "; buddy += ", ";
return buddy + divemaster; return buddy + divemaster;
} }
std::vector<const StatsBinner *> binners() const override {
return { &people_binner };
}
};
struct BuddyBinner : public StringBinner<BuddyBinner, StringBin> {
std::vector<QString> to_bin_values(const dive *d) const {
std::vector<QString> buddies;
for (const QString &s: QString(d->buddy).split(",", SKIP_EMPTY))
buddies.push_back(s.trimmed());
return buddies;
}
};
static BuddyBinner buddy_binner;
struct BuddyVariable : public StatsVariableTemplate<StatsVariable::Type::Discrete> {
QString name() const override {
return StatsTranslations::tr("Buddies");
}
QString diveCategories(const dive *d) const override {
return QString(d->buddy).trimmed();
}
std::vector<const StatsBinner *> binners() const override { std::vector<const StatsBinner *> binners() const override {
return { &buddy_binner }; return { &buddy_binner };
} }
}; };
struct DiveGuideBinner : public StringBinner<DiveGuideBinner, StringBin> {
std::vector<QString> to_bin_values(const dive *d) const {
std::vector<QString> dive_guides;
for (const QString &s: QString(d->divemaster).split(",", SKIP_EMPTY))
dive_guides.push_back(s.trimmed());
return dive_guides;
}
};
static DiveGuideBinner dive_guide_binner;
struct DiveGuideVariable : public StatsVariableTemplate<StatsVariable::Type::Discrete> {
QString name() const override {
return StatsTranslations::tr("Dive guides");
}
QString diveCategories(const dive *d) const override {
return QString(d->divemaster).trimmed();
}
std::vector<const StatsBinner *> binners() const override {
return { &dive_guide_binner };
}
};
// ============ Tags ============ // ============ Tags ============
struct TagBinner : public StringBinner<TagBinner, StringBin> { struct TagBinner : public StringBinner<TagBinner, StringBin> {
@ -1889,7 +1933,9 @@ static AirTemperatureVariable air_temperature_variable;
static WeightVariable weight_variable; static WeightVariable weight_variable;
static DiveNrVariable dive_nr_variable; static DiveNrVariable dive_nr_variable;
static DiveModeVariable dive_mode_variable; static DiveModeVariable dive_mode_variable;
static PeopleVariable people_variable;
static BuddyVariable buddy_variable; static BuddyVariable buddy_variable;
static DiveGuideVariable dive_guide_variable;
static TagVariable tag_variable; static TagVariable tag_variable;
static GasTypeVariable gas_type_variable; static GasTypeVariable gas_type_variable;
static GasContentO2Variable gas_content_o2_variable; static GasContentO2Variable gas_content_o2_variable;
@ -1907,7 +1953,8 @@ const std::vector<const StatsVariable *> stats_variables = {
&date_variable, &max_depth_variable, &mean_depth_variable, &duration_variable, &sac_variable, &date_variable, &max_depth_variable, &mean_depth_variable, &duration_variable, &sac_variable,
&water_temperature_variable, &air_temperature_variable, &weight_variable, &dive_nr_variable, &water_temperature_variable, &air_temperature_variable, &weight_variable, &dive_nr_variable,
&gas_content_o2_variable, &gas_content_o2_he_max_variable, &gas_content_he_variable, &gas_content_o2_variable, &gas_content_o2_he_max_variable, &gas_content_he_variable,
&dive_mode_variable, &buddy_variable, &tag_variable, &gas_type_variable, &suit_variable, &dive_mode_variable, &people_variable, &buddy_variable, &dive_guide_variable, &tag_variable,
&gas_type_variable, &suit_variable,
&weightsystem_variable, &cylinder_type_variable, &location_variable, &day_of_week_variable, &weightsystem_variable, &cylinder_type_variable, &location_variable, &day_of_week_variable,
&rating_variable, &visibility_variable &rating_variable, &visibility_variable
}; };