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

Simplify: remove the gas variable

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-01-11 16:37:10 -02:00 • committed by Dirk Hohndel
parent 28f4e12725
commit 3a72699bfd
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
subsurface-core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -36,23 +36,6 @@ static QString getFormattedCylinder(struct dive *dive, unsigned int idx)
DiveObjectHelper::DiveObjectHelper(struct dive *d) : DiveObjectHelper::DiveObjectHelper(struct dive *d) :
m_dive(d) m_dive(d)
{ {
int added = 0;
QString gas, gases;
for (int i = 0; i < MAX_CYLINDERS; i++) {
if (!is_cylinder_used(d, i))
continue;
gas = d->cylinder[i].type.description;
gas += QString(!gas.isEmpty() ? " " : "") + gasname(&d->cylinder[i].gasmix);
// if has a description and if such gas is not already present
if (!gas.isEmpty() && gases.indexOf(gas) == -1) {
if (added > 0)
gases += QString(" / ");
gases += gas;
added++;
}
}
m_gas = gases;
for (int i = 0; i < MAX_CYLINDERS; i++) for (int i = 0; i < MAX_CYLINDERS; i++)
m_cylinders << getFormattedCylinder(d, i); m_cylinders << getFormattedCylinder(d, i);
@ -171,7 +154,25 @@ QString DiveObjectHelper::tags() const
QString DiveObjectHelper::gas() const QString DiveObjectHelper::gas() const
{ {
return m_gas; /*WARNING: here should be the gastlist, returned
* from the get_gas_string function or this is correct?
*/
QString gas, gases;
for (int i = 0; i < MAX_CYLINDERS; i++) {
if (!is_cylinder_used(m_dive, i))
continue;
gas = m_dive->cylinder[i].type.description;
if (!gas.isEmpty())
gas += QChar(' ');
gas += gasname(&m_dive->cylinder[i].gasmix);
// if has a description and if such gas is not already present
if (!gas.isEmpty() && gases.indexOf(gas) == -1) {
if (!gases.isEmpty())
gases += QString(" / ");
gases += gas;
}
}
return gases;
} }
QString DiveObjectHelper::sac() const QString DiveObjectHelper::sac() const

1
subsurface-core/subsurface-qt/DiveObjectHelper.h
View file

@ -64,7 +64,6 @@ public:
private: private:
QString m_date; QString m_date;
QString m_time; QString m_time;
QString m_gas;
QStringList m_weights; QStringList m_weights;
QStringList m_cylinders; QStringList m_cylinders;
struct dive *m_dive; struct dive *m_dive;