mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

desktop UI: only show salinity warning when DC salinity is different

Browse source 
There were two cases that were handled incorrectly:
- if the user hasn't entered a salinity, obviously there shouldn't be a warning
- if this is a manually entered dive, there is no salinity downloaded from a
  dive computer, so equally, no warning

Suggested-by: willemferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-01-05 11:20:51 -08:00
parent c03731b220
commit 254f42e396
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
desktop-widgets/tab-widgets/TabDiveInformation.cpp
View file

@ -200,7 +200,7 @@ void TabDiveInformation::checkDcSalinityOverWritten()
int dc_value = current_dc->salinity; int dc_value = current_dc->salinity;
int user_value = current_dive->user_salinity; int user_value = current_dive->user_salinity;
bool show_indicator = false; bool show_indicator = false;
if (user_value != dc_value) if (!manualDive && user_value != 0 && user_value != dc_value)
show_indicator = true; show_indicator = true;
ui->salinityOverWrittenIcon->setVisible(show_indicator); ui->salinityOverWrittenIcon->setVisible(show_indicator);
} }
@ -301,7 +301,8 @@ void TabDiveInformation::on_waterTypeCombo_activated(int index) {
else else
ui->salinityText->clear(); ui->salinityText->clear();
divesEdited(Command::editWaterTypeUser(combobox_salinity, false)); divesEdited(Command::editWaterTypeUser(combobox_salinity, false));
if (dc_salinity == combobox_salinity) // If salinity differs from that of dc, then save it // If salinity differs from that downloaded from dc, show warning
if (manualDive || dc_salinity == combobox_salinity)
ui->salinityOverWrittenIcon->setVisible(false); ui->salinityOverWrittenIcon->setVisible(false);
else else
ui->salinityOverWrittenIcon->setVisible(true); ui->salinityOverWrittenIcon->setVisible(true);