Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-10 10:05:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

corrected issue in display of download/upload progress

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-02-04 21:08:53 +00:00
parent 163ed040be
commit c2fdbe177d
5 changed files with 30 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

42
retroshare-gui/src/gui/xprogressbar.cpp
View file

@ -28,14 +28,13 @@
#include <rsiface/rstypes.h>
#include "xprogressbar.h"
xProgressBar::xProgressBar(const CompressedChunkMap& cmap,QRect rect, QPainter *painter, int schemaIndex)
: _cmap(cmap)
xProgressBar::xProgressBar(const FileProgressInfo& pinfo,QRect rect, QPainter *painter, int schemaIndex)
: _pinfo(pinfo)
{
// assign internal data
this->schemaIndex = schemaIndex;
this->rect = rect;
this->painter = painter;
this->progressValue = 0.00;
// set the progress bar colors
setColor();
// configure span
@ -194,28 +193,28 @@ void xProgressBar::paint()
painter->setBrush(linearGrad);
uint32_t ss = _cmap._map.size()*32 ;
uint32_t ss = _pinfo.nb_chunks ;
if(ss > 1) // for small files we use a more progressive display
for(int i=0;i<ss;++i)
{
int j=0 ;
while(i+j<ss && _cmap[i+j])
++j ;
if(j>0)
for(int i=0;i<ss;++i)
{
float o = std::min(1.0f,j/(float)ss*width) ;
painter->setOpacity(o) ;
painter->drawRect(rect.x() + hSpan+(int)rint(i*width/(float)ss), rect.y() + vSpan, (int)ceil(j*width/(float)ss), rect.height() - 1 - vSpan * 2);
}
int j=0 ;
while(i+j<ss && _pinfo.cmap[i+j])
++j ;
i += j ;
}
if(j>0)
{
float o = std::min(1.0f,j/(float)ss*width) ;
painter->setOpacity(o) ;
painter->drawRect(rect.x() + hSpan+(int)rint(i*width/(float)ss), rect.y() + vSpan, (int)ceil(j*width/(float)ss), rect.height() - 1 - vSpan * 2);
}
i += j ;
}
else
{
// calculate progress value
int preWidth = static_cast<int>((rect.width() - 1 - hSpan)*(progressValue/100));
int preWidth = static_cast<int>((rect.width() - 1 - hSpan)*(_pinfo.progress/100));
int progressWidth = rect.width() - preWidth;
if (progressWidth == rect.width() - hSpan) return;
@ -231,7 +230,7 @@ void xProgressBar::paint()
{
QLocale locale;
painter->setPen(textColor);
painter->drawText(rect, Qt::AlignCenter, locale.toString(progressValue, 'f', 2) + "%");
painter->drawText(rect, Qt::AlignCenter, locale.toString(_pinfo.progress, 'f', 2) + "%");
}
}
@ -242,11 +241,6 @@ void xProgressBar::setColorSchema(const int value)
setColor();
}
void xProgressBar::setValue(const float value)
{
progressValue = value < 0 ? 0 : value > 100 ? 100 : value;
}
void xProgressBar::setDisplayText(const bool display)
{
displayText = display;