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

Don't show a SAC of 0.0l/min (or cuft/min)

Browse source 
When we have no data about the gas consumption it makes no sense to show a
SAC of 0. Instead we should show either "unknown" or nothing.

Fixes #693

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-08-06 07:38:18 -07:00
parent eb63ccfed5
commit 74e7b8e879
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
qt-ui/maintab.cpp
View file

@ -477,7 +477,7 @@ void MainTab::updateDiveInfo(bool clear)
per_cylinder_mean_depth(&displayed_dive, select_dc(&displayed_dive), mean, duration); per_cylinder_mean_depth(&displayed_dive, select_dc(&displayed_dive), mean, duration);
volume_t sac; volume_t sac;
QString SACs; QString SACs;
if (mean[0] && duration[0]) { if (mean[0] && duration[0] && gases[0].mliter) {
sac.mliter = gases[0].mliter / (depth_to_atm(mean[0], &displayed_dive) * duration[0] / 60.0); sac.mliter = gases[0].mliter / (depth_to_atm(mean[0], &displayed_dive) * duration[0] / 60.0);
SACs = get_volume_string(sac, true).append(tr("/min")); SACs = get_volume_string(sac, true).append(tr("/min"));
} else { } else {
@ -485,7 +485,7 @@ void MainTab::updateDiveInfo(bool clear)
} }
for (int i = 1; i < MAX_CYLINDERS && gases[i].mliter != 0; i++) { for (int i = 1; i < MAX_CYLINDERS && gases[i].mliter != 0; i++) {
volumes.append("\n" + get_volume_string(gases[i], true)); volumes.append("\n" + get_volume_string(gases[i], true));
if (duration[i]) { if (duration[i] && gases[i].mliter) {
sac.mliter = gases[i].mliter / (depth_to_atm(mean[i], &displayed_dive) * duration[i] / 60); sac.mliter = gases[i].mliter / (depth_to_atm(mean[i], &displayed_dive) * duration[i] / 60);
SACs.append("\n" + get_volume_string(sac, true).append(tr("/min"))); SACs.append("\n" + get_volume_string(sac, true).append(tr("/min")));
} else { } else {
@ -520,9 +520,18 @@ void MainTab::updateDiveInfo(bool clear)
// ui.depthLimits->setAverage(get_depth_string(stats_selection.avg_depth, true)); // ui.depthLimits->setAverage(get_depth_string(stats_selection.avg_depth, true));
ui.depthLimits->overrideMaxToolTipText(tr("Deepest dive")); ui.depthLimits->overrideMaxToolTipText(tr("Deepest dive"));
ui.depthLimits->overrideMinToolTipText(tr("Shallowest dive")); ui.depthLimits->overrideMinToolTipText(tr("Shallowest dive"));
ui.sacLimits->setMaximum(get_volume_string(stats_selection.max_sac, true).append(tr("/min"))); if (stats_selection.max_sac.mliter)
ui.sacLimits->setMinimum(get_volume_string(stats_selection.min_sac, true).append(tr("/min"))); ui.sacLimits->setMaximum(get_volume_string(stats_selection.max_sac, true).append(tr("/min")));
ui.sacLimits->setAverage(get_volume_string(stats_selection.avg_sac, true).append(tr("/min"))); else
ui.sacLimits->setMaximum("");
if (stats_selection.min_sac.mliter)
ui.sacLimits->setMinimum(get_volume_string(stats_selection.min_sac, true).append(tr("/min")));
else
ui.sacLimits->setMinimum("");
if (stats_selection.avg_sac.mliter)
ui.sacLimits->setAverage(get_volume_string(stats_selection.avg_sac, true).append(tr("/min")));
else
ui.sacLimits->setAverage("");
ui.divesAllText->setText(QString::number(stats_selection.selection_size)); ui.divesAllText->setText(QString::number(stats_selection.selection_size));
temp.mkelvin = stats_selection.max_temp; temp.mkelvin = stats_selection.max_temp;
ui.tempLimits->setMaximum(get_temperature_string(temp, true)); ui.tempLimits->setMaximum(get_temperature_string(temp, true));

11
qt-ui/models.cpp
View file

@ -1263,10 +1263,13 @@ QString DiveItem::displaySac() const
{ {
QString str; QString str;
struct dive *dive = get_dive_by_uniq_id(diveId); struct dive *dive = get_dive_by_uniq_id(diveId);
const char *unit; if (dive->sac) {
int decimal; const char *unit;
double value = get_volume_units(dive->sac, &decimal, &unit); int decimal;
return QString::number(value, 'f', decimal).append(unit).append(tr("/min")); double value = get_volume_units(dive->sac, &decimal, &unit);
return QString::number(value, 'f', decimal).append(unit).append(tr("/min"));
}
return QString("");
} }
QString DiveItem::displayWeight() const QString DiveItem::displayWeight() const