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

OP37/GCS MapLib - Change to try lowering processor usage.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1969 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
zedamota 2010-10-16 21:10:29 +00:00 committed by zedamota
parent c067552f74
commit 41388d97bd
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,9 +100,15 @@ namespace core {
}
if(accessmode!=AccessMode::CacheOnly)
{
QEventLoop q;
QNetworkReply *reply;
QNetworkRequest qheader;
QNetworkAccessManager network;
QTimer tT;
tT.setSingleShot(true);
connect(&network, SIGNAL(finished(QNetworkReply*)),
&q, SLOT(quit()));
connect(&tT, SIGNAL(timeout()), &q, SLOT(quit()));
network.setProxy(Proxy);
#ifdef DEBUG_GMAPS
qDebug()<<"Try Tile from the Internet";
@ -189,28 +195,13 @@ namespace core {
break;
}
reply=network.get(qheader);
#ifdef DEBUG_GMAPS
qDebug()<<"Starting get response ";//<<pos.X()+","+pos.Y();
#endif //DEBUG_GMAPS
QTime time;
time.restart();
while( !(reply->isFinished() || (time.elapsed()>(Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);}
#ifdef DEBUG_TIMINGS
qDebug()<<"Network time:"<<time.elapsed();
#endif
#ifdef DEBUG_GMAPS
qDebug()<<"Finished?"<<reply->error()<<" abort?"<<(time.elapsed()>Timeout);
#endif //DEBUG_GMAPS
if( (reply->error()!=QNetworkReply::NoError) || (time.elapsed()>Timeout))
{
#ifdef DEBUG_GMAPS
qDebug()<<"Request timed out ";//<<pos.x+","+pos.y;
#endif //DEBUG_GMAPS
tT.start(Timeout);
q.exec();
if(!tT.isActive()){
return ret;
}
#ifdef DEBUG_GMAPS
qDebug()<<"Response OK ";//<<pos.x+","+pos.y;
#endif //DEBUG_GMAPS
}
tT.stop();
ret=reply->readAll();
reply->deleteLater();//TODO can't this be global??
if(ret.isEmpty())