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

OP37/GCS Fix to DB warning

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@957 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
zedamota 2010-06-30 22:30:02 +00:00 committed by zedamota
parent 758552b76c
commit 423b94d414
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/src/libs/opmapcontrol/src/core/opmaps.cpp
View File

@ -193,15 +193,15 @@ namespace core {
qDebug()<<"Starting get response ";//<<pos.X()+","+pos.Y(); qDebug()<<"Starting get response ";//<<pos.X()+","+pos.Y();
#endif //DEBUG_GMAPS #endif //DEBUG_GMAPS
QTime time; QTime time;
time.start(); time.restart();
while( !(reply->isFinished() || (time.elapsed()>(6*Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);} while( !(reply->isFinished() || (time.elapsed()>(Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);}
#ifdef DEBUG_TIMINGS #ifdef DEBUG_TIMINGS
qDebug()<<"Network time:"<<time.elapsed(); qDebug()<<"Network time:"<<time.elapsed();
#endif #endif
#ifdef DEBUG_GMAPS #ifdef DEBUG_GMAPS
qDebug()<<"Finished?"<<reply->error()<<" abort?"<<(time.elapsed()>Timeout*6); qDebug()<<"Finished?"<<reply->error()<<" abort?"<<(time.elapsed()>Timeout);
#endif //DEBUG_GMAPS #endif //DEBUG_GMAPS
if( (reply->error()!=QNetworkReply::NoError) || (time.elapsed()>Timeout*6)) if( (reply->error()!=QNetworkReply::NoError) || (time.elapsed()>Timeout))
{ {
#ifdef DEBUG_GMAPS #ifdef DEBUG_GMAPS
qDebug()<<"Request timed out ";//<<pos.x+","+pos.y; qDebug()<<"Request timed out ";//<<pos.x+","+pos.y;

6
ground/src/libs/opmapcontrol/src/core/pureimagecache.cpp
View File

@ -242,7 +242,11 @@ QByteArray PureImageCache::GetImageFromCache(MapType::Types type, Point pos, int
QSqlQuery query(cn); QSqlQuery query(cn);
query.exec(QString("SELECT Tile FROM TilesData WHERE id = (SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4)").arg(pos.X()).arg(pos.Y()).arg(zoom).arg((int) type)); query.exec(QString("SELECT Tile FROM TilesData WHERE id = (SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4)").arg(pos.X()).arg(pos.Y()).arg(zoom).arg((int) type));
query.next(); query.next();
ar=query.value(0).toByteArray(); if(query.isValid())
{
ar=query.value(0).toByteArray();
}
} }
cn.close(); cn.close();