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

Improve readability of yearly statistics

Browse source 
Make the entries for years bold, keep the months non-bold.
It's still a sea of data, but this is an improvement.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-06-19 10:30:36 -07:00
parent 07a16574e9
commit 138a00bd10
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
qt-ui/models.cpp
View file

@ -822,12 +822,13 @@ QVariant TreeModel::data(const QModelIndex& index, int role) const
if (!index.isValid()) if (!index.isValid())
return QVariant(); return QVariant();
if (role == Qt::FontRole) {
return defaultModelFont();
}
TreeItem* item = static_cast<TreeItem*>(index.internalPointer()); TreeItem* item = static_cast<TreeItem*>(index.internalPointer());
QVariant val = item->data(index.column(), role);
return item->data(index.column(), role); if (role == Qt::FontRole && !val.isValid())
return defaultModelFont();
else
return val;
} }
QModelIndex TreeModel::index(int row, int column, const QModelIndex& parent) QModelIndex TreeModel::index(int row, int column, const QModelIndex& parent)
@ -1309,9 +1310,14 @@ QVariant YearStatisticsItem::data(int column, int role) const
{ {
double value; double value;
QVariant ret; QVariant ret;
if (role != Qt::DisplayRole)
return ret;
if (role == Qt::FontRole) {
QFont font = defaultModelFont();
font.setBold(stats_interval.is_year);
return font;
} else if (role != Qt::DisplayRole) {
return ret;
}
switch(column) { switch(column) {
case YEAR: ret = stats_interval.period; break; case YEAR: ret = stats_interval.period; break;
case DIVES: ret = stats_interval.selection_size; break; case DIVES: ret = stats_interval.selection_size; break;

2
statistics.c
View file

@ -128,6 +128,7 @@ void process_all_dives(struct dive *dive, struct dive **prev_dive)
return; return;
memset(stats_yearly, 0, size); memset(stats_yearly, 0, size);
memset(stats_monthly, 0, size); memset(stats_monthly, 0, size);
stats_yearly[0].is_year = TRUE;
/* this relies on the fact that the dives in the dive_table /* this relies on the fact that the dives in the dive_table
* are in chronological order */ * are in chronological order */
@ -148,6 +149,7 @@ void process_all_dives(struct dive *dive, struct dive **prev_dive)
if (current_year != tm.tm_year + 1900) { if (current_year != tm.tm_year + 1900) {
current_year = tm.tm_year + 1900; current_year = tm.tm_year + 1900;
process_dive(dp, &(stats_yearly[++year_iter])); process_dive(dp, &(stats_yearly[++year_iter]));
stats_yearly[year_iter].is_year = TRUE;
} else { } else {
process_dive(dp, &(stats_yearly[year_iter])); process_dive(dp, &(stats_yearly[year_iter]));
} }

1
statistics.h
View file

@ -30,6 +30,7 @@ typedef struct {
unsigned int combined_count; unsigned int combined_count;
unsigned int selection_size; unsigned int selection_size;
unsigned int total_sac_time; unsigned int total_sac_time;
bool is_year;
} stats_t; } stats_t;
extern stats_t stats_selection; extern stats_t stats_selection;
extern stats_t *stats_yearly; extern stats_t *stats_yearly;