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

Display the statistics

Browse source 
This would be correct if the current selection code wasn't broken. Right
now we only add to our internal notion of what is selected - we never
deselect anything.

Once that is fixed, thestatistics should be correctly displayed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-05-19 22:42:24 -07:00
parent e818f0352b
commit 11a6b18690
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
qt-ui/maintab.cpp
View file

@ -139,9 +139,11 @@ void MainTab::updateDiveInfo(int dive)
// click on the item and check its objectName, // click on the item and check its objectName,
// the access is ui->objectName from here on. // the access is ui->objectName from here on.
volume_t sacVal; volume_t sacVal;
temperature_t temp;
struct dive *prevd; struct dive *prevd;
struct dive *d = get_dive(dive); struct dive *d = get_dive(dive);
process_selected_dives();
process_all_dives(d, &prevd); process_all_dives(d, &prevd);
currentDive = d; currentDive = d;
UPDATE_TEXT(d, notes); UPDATE_TEXT(d, notes);
@ -172,7 +174,7 @@ void MainTab::updateDiveInfo(int dive)
if (prevd) if (prevd)
ui->surfaceIntervalText->setText(get_time_string(d->when - (prevd->when + prevd->duration.seconds), 4)); ui->surfaceIntervalText->setText(get_time_string(d->when - (prevd->when + prevd->duration.seconds), 4));
if ((sacVal.mliter = d->sac) > 0) if ((sacVal.mliter = d->sac) > 0)
ui->sacText->setText(get_volume_string(sacVal, TRUE).append("/min")); ui->sacText->setText(get_volume_string(sacVal, TRUE).append(tr("/min")));
else else
ui->sacText->clear(); ui->sacText->clear();
if (d->surface_pressure.mbar) if (d->surface_pressure.mbar)
@ -181,6 +183,29 @@ void MainTab::updateDiveInfo(int dive)
else else
ui->airPressureText->clear(); ui->airPressureText->clear();
ui->visibility->setCurrentStars(d->visibility); ui->visibility->setCurrentStars(d->visibility);
ui->maximumDepthAllText->setText(get_depth_string(stats_selection.max_depth, TRUE));
ui->minimumDepthAllText->setText(get_depth_string(stats_selection.min_depth, TRUE));
ui->averageDepthAllText->setText(get_depth_string(stats_selection.avg_depth, TRUE));
ui->maximumSacAllText->setText(get_volume_string(stats_selection.max_sac, TRUE).append(tr("/min")));
ui->minimumSacAllText->setText(get_volume_string(stats_selection.min_sac, TRUE).append(tr("/min")));
ui->averageSacAllText->setText(get_volume_string(stats_selection.avg_sac, TRUE).append(tr("/min")));
ui->divesAllText->setText(QString::number(stats_selection.selection_size));
temp.mkelvin = stats_selection.max_temp;
ui->maximumTemperatureAllText->setText(get_temperature_string(temp, TRUE));
temp.mkelvin = stats_selection.min_temp;
ui->minimumTemperatureAllText->setText(get_temperature_string(temp, TRUE));
if (stats_selection.combined_temp && stats_selection.combined_count) {
const char *unit;
get_temp_units(0, &unit);
ui->averageTemperatureAllText->setText(QString("%1%2").arg(stats_selection.combined_temp / stats_selection.combined_count, 0, 'f', 1).arg(unit));
}
ui->totalTimeAllText->setText(get_time_string(stats_selection.total_time.seconds, 0));
int seconds = stats_selection.total_time.seconds;
if (stats_selection.selection_size)
seconds /= stats_selection.selection_size;
ui->averageTimeAllText->setText(get_time_string(seconds, 0));
ui->longestAllText->setText(get_time_string(stats_selection.longest_time.seconds, 0));
ui->shortestAllText->setText(get_time_string(stats_selection.shortest_time.seconds, 0));
} else { } else {
/* make the fields read-only */ /* make the fields read-only */
ui->location->setReadOnly(true); ui->location->setReadOnly(true);

1
statistics.h
View file

@ -41,6 +41,7 @@ extern void process_all_dives(struct dive *dive, struct dive **prev_dive);
extern void get_selected_dives_text(char *buffer, int size); extern void get_selected_dives_text(char *buffer, int size);
extern volume_t get_gas_used(struct dive *dive); extern volume_t get_gas_used(struct dive *dive);
extern char *get_gaslist(struct dive *dive); extern char *get_gaslist(struct dive *dive);
extern void process_selected_dives(void);
#ifdef __cplusplus #ifdef __cplusplus
} }