Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 09:44:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Provide a means of tracking resource download progress. Until we have a

Browse source 
user-friendly progress meter/throbber, put the download progress in the
extended stats.
This commit is contained in:
Andrzej Kapolka 2014-03-26 15:53:19 -07:00
parent d90ebfd29a
commit 52c8a865f1
4 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/interface_en.ts
View file

@ -14,12 +14,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3597"/>
<location filename="src/Application.cpp" line="3608"/>
<source>Open Script</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3598"/>
<location filename="src/Application.cpp" line="3609"/>
<source>JavaScript Files (*.js)</source>
<translation type="unfinished"></translation>
</message>

15
interface/src/Application.cpp
View file

@ -2676,7 +2676,7 @@ void Application::displayStats() {
glm::vec3 avatarPos = _myAvatar->getPosition();
lines = _statsExpanded ? 4 : 3;
lines = _statsExpanded ? 5 : 3;
displayStatsBackground(backgroundColor, horizontalOffset, 0, _glWidget->width() - (mirrorEnabled ? 301 : 411) - horizontalOffset, lines * STATS_PELS_PER_LINE + 10);
horizontalOffset += 5;
@ -2713,12 +2713,23 @@ void Application::displayStats() {
verticalOffset += STATS_PELS_PER_LINE;
drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, avatarMixerStats, WHITE_TEXT);
stringstream downloadStats;
downloadStats << "Downloads: ";
foreach (Resource* resource, ResourceCache::getLoadingRequests()) {
const float MAXIMUM_PERCENTAGE = 100.0f;
downloadStats << roundf(resource->getProgress() * MAXIMUM_PERCENTAGE) << "% ";
}
downloadStats << "(" << ResourceCache::getPendingRequestCount() << " pending)";
verticalOffset += STATS_PELS_PER_LINE;
drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, downloadStats.str().c_str(), WHITE_TEXT);
}
verticalOffset = 0;
horizontalOffset = _glWidget->width() - (mirrorEnabled ? 300 : 410);
lines = _statsExpanded ? 11 : 3;
lines = _statsExpanded ? 12 : 3;
displayStatsBackground(backgroundColor, horizontalOffset, 0, _glWidget->width() - horizontalOffset, lines * STATS_PELS_PER_LINE + 10);
horizontalOffset += 5;

11
libraries/shared/src/ResourceCache.cpp
View file

@ -63,10 +63,12 @@ void ResourceCache::attemptRequest(Resource* resource) {
return;
}
_requestLimit--;
_loadingRequests.append(resource);
resource->makeRequest();
}
void ResourceCache::requestCompleted() {
void ResourceCache::requestCompleted(Resource* resource) {
_loadingRequests.removeOne(resource);
_requestLimit++;
// look for the highest priority pending request
@ -96,6 +98,7 @@ const int DEFAULT_REQUEST_LIMIT = 10;
int ResourceCache::_requestLimit = DEFAULT_REQUEST_LIMIT;
QList<QPointer<Resource> > ResourceCache::_pendingRequests;
QList<Resource*> ResourceCache::_loadingRequests;
Resource::Resource(const QUrl& url, bool delayLoad) :
_url(url),
@ -121,7 +124,7 @@ Resource::Resource(const QUrl& url, bool delayLoad) :
Resource::~Resource() {
if (_reply) {
ResourceCache::requestCompleted();
ResourceCache::requestCompleted(this);
delete _reply;
}
}
@ -215,7 +218,7 @@ void Resource::handleDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) {
_replyTimer->disconnect(this);
_replyTimer->deleteLater();
_replyTimer = NULL;
ResourceCache::requestCompleted();
ResourceCache::requestCompleted(this);
downloadFinished(reply);
}
@ -250,7 +253,7 @@ void Resource::handleReplyError(QNetworkReply::NetworkError error, QDebug debug)
_replyTimer->disconnect(this);
_replyTimer->deleteLater();
_replyTimer = NULL;
ResourceCache::requestCompleted();
ResourceCache::requestCompleted(this);
// retry for certain types of failures
switch (error) {

17
libraries/shared/src/ResourceCache.h
View file

@ -37,6 +37,10 @@ public:
static void setRequestLimit(int limit) { _requestLimit = limit; }
static int getRequestLimit() { return _requestLimit; }
static const QList<Resource*>& getLoadingRequests() { return _loadingRequests; }
static int getPendingRequestCount() { return _pendingRequests.size(); }
ResourceCache(QObject* parent = NULL);
virtual ~ResourceCache();
@ -58,7 +62,7 @@ protected:
void addUnusedResource(const QSharedPointer<Resource>& resource);
static void attemptRequest(Resource* resource);
static void requestCompleted();
static void requestCompleted(Resource* resource);
private:
@ -70,6 +74,7 @@ private:
static QNetworkAccessManager* _networkAccessManager;
static int _requestLimit;
static QList<QPointer<Resource> > _pendingRequests;
static QList<Resource*> _loadingRequests;
};
/// Base class for resources.
@ -102,6 +107,15 @@ public:
/// Checks whether the resource has loaded.
bool isLoaded() const { return _loaded; }
/// For loading resources, returns the number of bytes received.
qint64 getBytesReceived() const { return _bytesReceived; }
/// For loading resources, returns the number of total bytes (or zero if unknown).
qint64 getBytesTotal() const { return _bytesTotal; }
/// For loading resources, returns the load progress.
float getProgress() const { return (_bytesTotal == 0) ? 0.0f : (float)_bytesReceived / _bytesTotal; }
void setSelf(const QWeakPointer<Resource>& self) { _self = self; }
void setCache(ResourceCache* cache) { _cache = cache; }
@ -152,6 +166,7 @@ private:
int _lruKey;
QNetworkReply* _reply;
QTimer* _replyTimer;
int _index;
qint64 _bytesReceived;
qint64 _bytesTotal;
int _attempts;