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: add a sort mode for categorical bar charts

Browse source 
This was a user request: Sort bar charts by height of the bars.
Obviously, this can only work for categorical charts, not for
histograms.

The UI is a break from the old concept: the sorting is chosen
based on the chart, whereas for the rest of the features, the
viable charts are presented based on the binning, etc.

I found it confusing to have the possible charts be selected
based on sorting. I.e. if a non-bin sort mode is selected,
the histogram charts disappear. On the flip side, this would
be more consistent. We can change it later.

For value-based bar charts, there are three sort modes: by
bin, by count (i.e. number of dives in that bar) and by
value (i.e. length of the bar). This hopefully satisfies all
needs.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-12-31 18:29:06 +01:00 • committed by Dirk Hohndel
parent f76752ee03
commit 1e5191e33e
10 changed files with 137 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

61
stats/statsstate.cpp
View file

@ -3,7 +3,7 @@
#include "statstranslations.h"
#include "statsvariables.h"
// Attn: The order must correspond to the enum above
// Attn: The order must correspond to the enum ChartSubType
static const char *chart_subtype_names[] = {
QT_TRANSLATE_NOOP("StatsTranslations", "vertical"),
QT_TRANSLATE_NOOP("StatsTranslations", "grouped vertical"),
@ -16,6 +16,13 @@ static const char *chart_subtype_names[] = {
QT_TRANSLATE_NOOP("StatsTranslations", "piechart"),
};
// Attn: The order must correspond to the enum ChartSortMode
static const char *sortmode_names[] = {
QT_TRANSLATE_NOOP("StatsTranslations", "Bin"),
QT_TRANSLATE_NOOP("StatsTranslations", "Count"),
QT_TRANSLATE_NOOP("StatsTranslations", "Value"),
};
enum class SupportedVariable {
None,
Categorical, // Implies that the variable is binned
@ -167,7 +174,8 @@ StatsState::StatsState() :
confidence(true),
var1Binner(nullptr),
var2Binner(nullptr),
var2Operation(StatsOperation::Invalid)
var2Operation(StatsOperation::Invalid),
sortMode1(ChartSortMode::Bin)
{
validate(true);
}
@ -377,6 +385,40 @@ static std::vector<StatsState::Feature> createFeaturesList(int chartFeatures, co
return res;
}
// For creating the sort mode list, the ChartSortMode enum is misused to
// indicate which sort modes are allowed:
// bin -> none (list is redundant: only one mode)
// count -> bin, count
// value -> bin, count, value
// In principle, the "highest possible" mode is given. If a mode is possible,
// all the lower modes are likewise possible.
static StatsState::VariableList createSortModeList(ChartSortMode allowed, ChartSortMode selectedSortMode)
{
StatsState::VariableList res;
res.selected = -1;
if ((int)allowed <= (int)ChartSortMode::Bin)
return res;
for (int i = 0; i <= (int)allowed; ++i) {
ChartSortMode mode = static_cast<ChartSortMode>(i);
QString name = StatsTranslations::tr(sortmode_names[i]);
if (selectedSortMode == mode)
res.selected = (int)res.variables.size();
res.variables.push_back({ name, i });
}
return res;
}
static StatsState::VariableList createSortModeList1(ChartType type, ChartSortMode selectedSortMode)
{
ChartSortMode allowed = ChartSortMode::Bin; // Default: no extra sorting
if (type == ChartType::DiscreteBar || type == ChartType::DiscreteCount || type == ChartType::Pie)
allowed = ChartSortMode::Count;
else if (type == ChartType::DiscreteValue)
allowed = ChartSortMode::Value;
return createSortModeList(allowed, selectedSortMode);
}
StatsState::UIState StatsState::getUIState() const
{
UIState res;
@ -390,6 +432,7 @@ StatsState::UIState StatsState::getUIState() const
res.binners2 = createBinnerList(var2, var2Binner, var1Binner != nullptr, true);
res.operations2 = createOperationsList(var2, var2Operation, var1Binner);
res.features = createFeaturesList(chartFeatures, *this);
res.sortMode1 = createSortModeList1(type, sortMode1);
return res;
}
@ -461,6 +504,12 @@ void StatsState::var2OperationChanged(int id)
validate(false);
}
void StatsState::sortMode1Changed(int id)
{
sortMode1 = (ChartSortMode)id;
validate(false);
}
void StatsState::chartChanged(int id)
{
std::tie(type, subtype) = fromInt(id); // use std::tie to assign two values at once
@ -604,4 +653,12 @@ void StatsState::validate(bool varChanged)
// Median and mean currently only if the first variable is numeric
if (!var1 || var1->type() != StatsVariable::Type::Numeric)
chartFeatures &= ~(ChartFeatureMedian | ChartFeatureMean);
// By default, sort according to the used bin. Only for pie charts,
// sort by count, if the binning is on a categorical variable.
if (varChanged) {
sortMode1 = type == ChartType::Pie &&
var1->type() == StatsVariable::Type::Discrete ? ChartSortMode::Count :
ChartSortMode::Bin;
}
}