mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-03 15:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Quick whitespace cleanup

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-04-17 08:06:11 -07:00
parent 9ddef367b5
commit 1a1cbc296b
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
qt-ui/diveplanner.cpp
View file

@ -72,11 +72,10 @@ DivePlannerGraphics::DivePlannerGraphics(QWidget *parent) : QGraphicsView(parent
timeLine->setMaximum(TIME_INITIAL_MAX); timeLine->setMaximum(TIME_INITIAL_MAX);
timeLine->setTickInterval(10); timeLine->setTickInterval(10);
timeLine->setColor(getColor(TIME_GRID)); timeLine->setColor(getColor(TIME_GRID));
timeLine->setLine( timeLine->setLine(fromPercent(10, Qt::Horizontal),
fromPercent(10, Qt::Horizontal), fromPercent(85, Qt::Vertical),
fromPercent(85, Qt::Vertical), fromPercent(90, Qt::Horizontal),
fromPercent(90, Qt::Horizontal), fromPercent(85, Qt::Vertical));
fromPercent(85, Qt::Vertical));
timeLine->setOrientation(Qt::Horizontal); timeLine->setOrientation(Qt::Horizontal);
timeLine->setTickSize(fromPercent(1, Qt::Vertical)); timeLine->setTickSize(fromPercent(1, Qt::Vertical));
timeLine->setTextColor(getColor(TIME_TEXT)); timeLine->setTextColor(getColor(TIME_TEXT));
@ -87,11 +86,10 @@ DivePlannerGraphics::DivePlannerGraphics(QWidget *parent) : QGraphicsView(parent
depthLine->setMinimum(0); depthLine->setMinimum(0);
depthLine->setMaximum(M_OR_FT(40, 120)); depthLine->setMaximum(M_OR_FT(40, 120));
depthLine->setTickInterval(M_OR_FT(10, 30)); depthLine->setTickInterval(M_OR_FT(10, 30));
depthLine->setLine( depthLine->setLine(fromPercent(10, Qt::Horizontal),
fromPercent(10, Qt::Horizontal), fromPercent(10, Qt::Vertical),
fromPercent(10, Qt::Vertical), fromPercent(10, Qt::Horizontal),
fromPercent(10, Qt::Horizontal), fromPercent(85, Qt::Vertical));
fromPercent(85, Qt::Vertical));
depthLine->setOrientation(Qt::Vertical); depthLine->setOrientation(Qt::Vertical);
depthLine->setTickSize(fromPercent(1, Qt::Horizontal)); depthLine->setTickSize(fromPercent(1, Qt::Horizontal));
depthLine->setColor(getColor(DEPTH_GRID)); depthLine->setColor(getColor(DEPTH_GRID));
@ -182,7 +180,7 @@ void DivePlannerGraphics::pointInserted(const QModelIndex &parent, int start, in
gasChooseBtn->setZValue(10); gasChooseBtn->setZValue(10);
gasChooseBtn->setFlag(QGraphicsItem::ItemIgnoresTransformations); gasChooseBtn->setFlag(QGraphicsItem::ItemIgnoresTransformations);
gases << gasChooseBtn; gases << gasChooseBtn;
if(plannerModel->recalcQ()) if (plannerModel->recalcQ())
drawProfile(); drawProfile();
} }
@ -457,7 +455,7 @@ QStringList &DivePlannerPointsModel::getGasList()
void DivePlannerGraphics::drawProfile() void DivePlannerGraphics::drawProfile()
{ {
if(!plannerModel->recalcQ()) if (!plannerModel->recalcQ())
return; return;
qDeleteAll(lines); qDeleteAll(lines);
lines.clear(); lines.clear();
@ -1074,7 +1072,7 @@ QVariant DivePlannerPointsModel::data(const QModelIndex &index, int role) const
return p.time / 60; return p.time / 60;
case DURATION: case DURATION:
if (index.row()) if (index.row())
return (p.time - divepoints.at(index.row() -1).time) / 60; return (p.time - divepoints.at(index.row() - 1).time) / 60;
else else
return p.time / 60; return p.time / 60;
case GAS: case GAS:
@ -1159,7 +1157,7 @@ QVariant DivePlannerPointsModel::headerData(int section, Qt::Orientation orienta
Qt::ItemFlags DivePlannerPointsModel::flags(const QModelIndex &index) const Qt::ItemFlags DivePlannerPointsModel::flags(const QModelIndex &index) const
{ {
if(index.column() != DURATION) if (index.column() != DURATION)
return QAbstractItemModel::flags(index) | Qt::ItemIsEditable; return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
else else
return QAbstractItemModel::flags(index); return QAbstractItemModel::flags(index);
@ -1240,7 +1238,7 @@ bool DivePlannerPointsModel::addGas(int o2, int he)
fill_default_cylinder(cyl); fill_default_cylinder(cyl);
cyl->gasmix.o2.permille = o2; cyl->gasmix.o2.permille = o2;
cyl->gasmix.he.permille = he; cyl->gasmix.he.permille = he;
if(!o2) if (!o2)
cyl->depth.mm = 1600 * 1000 / O2_IN_AIR * 10 - 10000; cyl->depth.mm = 1600 * 1000 / O2_IN_AIR * 10 - 10000;
else else
cyl->depth.mm = 1600 * 1000 / o2 * 10 - 10000; cyl->depth.mm = 1600 * 1000 / o2 * 10 - 10000;
@ -1256,7 +1254,7 @@ bool DivePlannerPointsModel::addGas(int o2, int he)
int DivePlannerPointsModel::lastEnteredPoint() int DivePlannerPointsModel::lastEnteredPoint()
{ {
for (int i = divepoints.count()-1; i >= 0; i--) for (int i = divepoints.count() - 1; i >= 0; i--)
if (divepoints.at(i).entered) if (divepoints.at(i).entered)
return i; return i;
return -1; return -1;
@ -1322,7 +1320,7 @@ int DivePlannerPointsModel::addStop(int milimeters, int seconds, int o2, int he,
} }
} }
bool oldRecalc = setRecalc(false); bool oldRecalc = setRecalc(false);
if (oldRecalc){ if (oldRecalc) {
QVector<int> computedPoints; QVector<int> computedPoints;
for (int i = 0; i < plannerModel->rowCount(); i++) for (int i = 0; i < plannerModel->rowCount(); i++)
if (!plannerModel->at(i).entered) if (!plannerModel->at(i).entered)
@ -1572,7 +1570,7 @@ void DivePlannerPointsModel::createPlan()
// FIXME: The epic assumption that all the cylinders after the first is deco // FIXME: The epic assumption that all the cylinders after the first is deco
int sac = i ? diveplan.decosac : diveplan.bottomsac; int sac = i ? diveplan.decosac : diveplan.bottomsac;
cyl->start.mbar = cyl->type.workingpressure.mbar; cyl->start.mbar = cyl->type.workingpressure.mbar;
if(cyl->type.size.mliter) { if (cyl->type.size.mliter) {
int consumption = ((depth_to_mbar(mean[i], tempDive) * duration[i] / 60) * sac) / (cyl->type.size.mliter / 1000); int consumption = ((depth_to_mbar(mean[i], tempDive) * duration[i] / 60) * sac) / (cyl->type.size.mliter / 1000);
cyl->end.mbar = cyl->start.mbar - consumption; cyl->end.mbar = cyl->start.mbar - consumption;
} else { } else {