rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

OP-834 fixed bad Q_ASSERT around effective code

Browse Source
This commit is contained in:
Philippe Renon 2013-02-09 17:48:42 +01:00 committed by Alessio Morale
parent 7c85fa5885
commit 43786badfa
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
View File

@ -38,9 +38,9 @@
namespace Utils {
HomeLocationUtil::HomeLocationUtil()
{
}
HomeLocationUtil::HomeLocationUtil()
{
}
/**
* @brief Get local magnetic field
@ -68,8 +68,9 @@ HomeLocationUtil::HomeLocationUtil()
QDateTime dt = QDateTime::currentDateTime().toUTC();
//Fetch world magnetic model
Q_ASSERT(WorldMagModel().GetMagVector(LLA, dt.date().month(), dt.date().day(), dt.date().year(), Be) >= 0);
// Fetch world magnetic model
int result = WorldMagModel().GetMagVector(LLA, dt.date().month(), dt.date().day(), dt.date().year(), Be);
Q_ASSERT(result >= 0);
return 0; // OK
}

3
ground/openpilotgcs/src/plugins/magicwaypoint/positionfield.cpp
View File

@ -49,7 +49,8 @@ PositionField::PositionField(QWidget *parent) :
setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
m_renderer = new QSvgRenderer();
Q_ASSERT( m_renderer->load(QString(":/magicwaypoint/images/positionfield.svg")) != 0 );
bool success = m_renderer->load(QString(":/magicwaypoint/images/positionfield.svg"));
Q_ASSERT(success);
m_background = new QGraphicsSvgItem();
m_background->setSharedRenderer(m_renderer);

3
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
View File

@ -312,7 +312,8 @@ int UAVObjectUtilManager::setHomeLocation(double LLA[3], bool save_to_sdcard)
{
double Be[3];
Q_ASSERT (Utils::HomeLocationUtil().getDetails(LLA, Be) >= 0);
int result = Utils::HomeLocationUtil().getDetails(LLA, Be);
Q_ASSERT(result >= 0);
// ******************
// save the new settings