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

Printing: print depth unit in table

Browse source 
When adding the method that includes the depth unit to the DiveItem class
I realized that this was yet another implementation of our depth unit
conversion. We should just call the existing helper instead.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-07-11 21:59:21 -07:00
parent 236ff5c89d
commit e1ae7ebab2
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qt-ui/models.cpp
View file

@ -1189,17 +1189,14 @@ QString DiveItem::displayDate() const
QString DiveItem::displayDepth() const
{
QString fract, str;
const int scale = 1000;
struct dive *dive = get_dive_by_uniq_id(diveId);
if (get_units()->length == units::METERS) {
fract = QString::number((unsigned)(dive->maxdepth.mm % scale) / 100);
str = QString("%1.%2").arg((unsigned)(dive->maxdepth.mm / scale)).arg(fract, 1, QChar('0'));
}
if (get_units()->length == units::FEET) {
str = QString::number(mm_to_feet(dive->maxdepth.mm), 'f', 0);
}
return str;
return get_depth_string(dive->maxdepth);
}
QString DiveItem::displayDepthWithUnit() const
{
struct dive *dive = get_dive_by_uniq_id(diveId);
return get_depth_string(dive->maxdepth, true);
}
QString DiveItem::displayDuration() const

1
qt-ui/models.h
View file

@ -206,6 +206,7 @@ struct DiveItem : public TreeItem {
QString displayDate() const;
QString displayDuration() const;
QString displayDepth() const;
QString displayDepthWithUnit() const;
QString displayTemperature() const;
QString displayWeight() const;
QString displaySac() const;

2
qt-ui/printlayout.cpp
View file

@ -422,7 +422,7 @@ void PrintLayout::addTablePrintDataRow(TablePrintModel *model, int row, struct d
model->insertRow();
model->setData(model->index(row, 0), QString::number(dive->number), Qt::DisplayRole);
model->setData(model->index(row, 1), di.displayDate(), Qt::DisplayRole);
model->setData(model->index(row, 2), di.displayDepth(), Qt::DisplayRole);
model->setData(model->index(row, 2), di.displayDepthWithUnit(), Qt::DisplayRole);
model->setData(model->index(row, 3), di.displayDuration(), Qt::DisplayRole);
model->setData(model->index(row, 4), dive->divemaster, Qt::DisplayRole);
model->setData(model->index(row, 5), dive->buddy, Qt::DisplayRole);