mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename getDiveById to get_dive_by_id to keep current c code organized.

Browse source 
This commit renames getDiveById to get_dive_by_id, and it also removes the
Q_ASSERTS and if(!dive) return that the callers of this function were
calling. If it has a Q_ASSERT this means that the dive must exist,
so checking for nullness was bogus too. I've changed the assert (done
in a silly C-Way.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-05-12 14:22:46 -03:00 committed by Dirk Hohndel
parent e1971e9425
commit e0c0ac5d5c
5 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dive.h
View file

@ -436,7 +436,7 @@ static inline struct dive *get_dive_by_uemis_diveid(uint32_t diveid, uint32_t de
return NULL; return NULL;
} }
static inline struct dive *getDiveById(int id) static inline struct dive *get_dive_by_diveid(int id)
{ {
int i; int i;
struct dive *dive = NULL; struct dive *dive = NULL;
@ -445,6 +445,12 @@ static inline struct dive *getDiveById(int id)
if (dive->id == id) if (dive->id == id)
break; break;
} }
#ifdef DEBUG
if(dive == NULL){
fprintf(stderr, "Invalid id %x passed to get_dive_by_diveid, try to fix the code\n", id);
exit(1);
}
#endif
return dive; return dive;
} }

26
qt-ui/models.cpp
View file

@ -1056,7 +1056,7 @@ static int nitrox_sort_value(struct dive *dive)
QVariant DiveItem::data(int column, int role) const QVariant DiveItem::data(int column, int role) const
{ {
QVariant retVal; QVariant retVal;
struct dive *dive = getDiveById(diveId); struct dive *dive = get_dive_by_diveid(diveId);
switch (role) { switch (role) {
case Qt::TextAlignmentRole: case Qt::TextAlignmentRole:
@ -1203,8 +1203,7 @@ bool DiveItem::setData(const QModelIndex &index, const QVariant &value, int role
if (d->number == v) if (d->number == v)
return false; return false;
} }
d = getDiveById(diveId); d = get_dive_by_diveid(diveId);
Q_ASSERT(d != NULL);
d->number = value.toInt(); d->number = value.toInt();
mark_divelist_changed(true); mark_divelist_changed(true);
return true; return true;
@ -1212,8 +1211,7 @@ bool DiveItem::setData(const QModelIndex &index, const QVariant &value, int role
QString DiveItem::displayDate() const QString DiveItem::displayDate() const
{ {
struct dive *dive = getDiveById(diveId); struct dive *dive = get_dive_by_diveid(diveId);
Q_ASSERT(dive != NULL);
return get_dive_date_string(dive->when); return get_dive_date_string(dive->when);
} }
@ -1221,8 +1219,7 @@ QString DiveItem::displayDepth() const
{ {
QString fract, str; QString fract, str;
const int scale = 1000; const int scale = 1000;
struct dive *dive = getDiveById(diveId); struct dive *dive = get_dive_by_diveid(diveId);
Q_ASSERT(dive != NULL);
if (get_units()->length == units::METERS) { if (get_units()->length == units::METERS) {
fract = QString::number((unsigned)(dive->maxdepth.mm % scale) / 100); fract = QString::number((unsigned)(dive->maxdepth.mm % scale) / 100);
str = QString("%1.%2").arg((unsigned)(dive->maxdepth.mm / scale)).arg(fract, 1, QChar('0')); str = QString("%1.%2").arg((unsigned)(dive->maxdepth.mm / scale)).arg(fract, 1, QChar('0'));
@ -1236,8 +1233,7 @@ QString DiveItem::displayDepth() const
QString DiveItem::displayDuration() const QString DiveItem::displayDuration() const
{ {
int hrs, mins, secs; int hrs, mins, secs;
struct dive *dive = getDiveById(diveId); struct dive *dive = get_dive_by_diveid(diveId);
Q_ASSERT(dive != NULL);
secs = dive->duration.seconds % 60; secs = dive->duration.seconds % 60;
mins = dive->duration.seconds / 60; mins = dive->duration.seconds / 60;
hrs = mins / 60; hrs = mins / 60;
@ -1255,8 +1251,7 @@ QString DiveItem::displayDuration() const
QString DiveItem::displayTemperature() const QString DiveItem::displayTemperature() const
{ {
QString str; QString str;
struct dive *dive = getDiveById(diveId); struct dive *dive = get_dive_by_diveid(diveId);
Q_ASSERT(dive != NULL);
if (!dive->watertemp.mkelvin) if (!dive->watertemp.mkelvin)
return str; return str;
if (get_units()->temperature == units::CELSIUS) if (get_units()->temperature == units::CELSIUS)
@ -1269,8 +1264,7 @@ QString DiveItem::displayTemperature() const
QString DiveItem::displaySac() const QString DiveItem::displaySac() const
{ {
QString str; QString str;
struct dive *dive = getDiveById(diveId); struct dive *dive = get_dive_by_diveid(diveId);
Q_ASSERT(dive != NULL);
if (get_units()->volume == units::LITER) if (get_units()->volume == units::LITER)
str = QString::number(dive->sac / 1000.0, 'f', 1).append(tr(" l/min")); str = QString::number(dive->sac / 1000.0, 'f', 1).append(tr(" l/min"));
else else
@ -1286,8 +1280,7 @@ QString DiveItem::displayWeight() const
int DiveItem::weight() const int DiveItem::weight() const
{ {
struct dive *dive = getDiveById(diveId); struct dive *dive = get_dive_by_diveid(diveId);
Q_ASSERT(dive != 0);
weight_t tw = { total_weight(dive) }; weight_t tw = { total_weight(dive) };
return tw.grams; return tw.grams;
} }
@ -1907,8 +1900,7 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const
switch (role) { switch (role) {
case Qt::DisplayRole: { case Qt::DisplayRole: {
struct dive *dive = getDiveById(diveId); struct dive *dive = get_dive_by_diveid(diveId);
Q_ASSERT(dive != NULL);
struct DiveItem di; struct DiveItem di;
di.diveId = diveId; di.diveId = diveId;

4
qt-ui/profile/diveplotdatamodel.cpp
View file

@ -178,9 +178,7 @@ void DivePlotDataModel::emitDataChanged()
void DivePlotDataModel::calculateDecompression() void DivePlotDataModel::calculateDecompression()
{ {
struct dive *d = getDiveById(id()); struct dive *d = get_dive_by_diveid(id());
if (!d)
return;
struct divecomputer *dc = select_dc(d); struct divecomputer *dc = select_dc(d);
init_decompression(d); init_decompression(d);
calculate_deco_information(d, dc, &pInfo, false); calculate_deco_information(d, dc, &pInfo, false);

7
qt-ui/profile/diveprofileitem.cpp
View file

@ -427,8 +427,7 @@ void DiveGasPressureItem::modelDataChanged(const QModelIndex &topLeft, const QMo
int last_pressure[MAX_CYLINDERS] = { 0, }; int last_pressure[MAX_CYLINDERS] = { 0, };
int last_time[MAX_CYLINDERS] = { 0, }; int last_time[MAX_CYLINDERS] = { 0, };
struct plot_data *entry; struct plot_data *entry;
struct dive *dive = getDiveById(dataModel->id()); struct dive *dive = get_dive_by_diveid(dataModel->id());
Q_ASSERT(dive != NULL);
cyl = -1; cyl = -1;
for (int i = 0, count = dataModel->rowCount(); i < count; i++) { for (int i = 0, count = dataModel->rowCount(); i < count; i++) {
@ -490,9 +489,7 @@ void DiveGasPressureItem::paint(QPainter *painter, const QStyleOptionGraphicsIte
QPen pen; QPen pen;
pen.setCosmetic(true); pen.setCosmetic(true);
pen.setWidth(2); pen.setWidth(2);
struct dive *d = getDiveById(dataModel->id()); struct dive *d = get_dive_by_diveid(dataModel->id());
if (!d)
return;
struct plot_data *entry = dataModel->data().entry; struct plot_data *entry = dataModel->data().entry;
Q_FOREACH(const QPolygonF & poly, polygons) { Q_FOREACH(const QPolygonF & poly, polygons) {
for (int i = 1, count = poly.count(); i < count; i++, entry++) { for (int i = 1, count = poly.count(); i < count; i++, entry++) {

4
qt-ui/profile/profilewidget2.cpp
View file

@ -227,7 +227,7 @@ void ProfileWidget2::replot()
{ {
int diveId = dataModel->id(); int diveId = dataModel->id();
dataModel->clear(); dataModel->clear();
plotDives(QList<dive *>() << getDiveById(diveId)); plotDives(QList<dive *>() << get_dive_by_diveid(diveId));
} }
void ProfileWidget2::setupItemSizes() void ProfileWidget2::setupItemSizes()
@ -808,7 +808,7 @@ void ProfileWidget2::changeGas()
int diveId = dataModel->id(); int diveId = dataModel->id();
int o2, he; int o2, he;
int seconds = timeAxis->valueAt(scenePos); int seconds = timeAxis->valueAt(scenePos);
struct dive *d = getDiveById(diveId); struct dive *d = get_dive_by_diveid(diveId);
validate_gas(gas.toUtf8().constData(), &o2, &he); validate_gas(gas.toUtf8().constData(), &o2, &he);
add_gas_switch_event(d, get_dive_dc(d, diveComputer), seconds, get_gasidx(d, o2, he)); add_gas_switch_event(d, get_dive_dc(d, diveComputer), seconds, get_gasidx(d, o2, he));