Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug with LLStat median calculation. Clean up llstatbar a bit.

Browse Source
This commit is contained in:
Shyotl
2019-07-25 23:43:04 -05:00
parent 6dc9210a7e
commit 2dbbec88f7
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llcommon/llstat.cpp
View File

@@ -152,7 +152,7 @@ F32 LLStat::getMax() const
F32 LLStat::getMean() const
{
F32 current_mean = getCurrent();
F32 current_mean = 0.f; // Don't double-count current.
S32 samples = 0;
for (S32 i = 0; i < (S32)mNumValues; i++)
{
@@ -170,10 +170,6 @@ F32 LLStat::getMean() const
{
current_mean /= samples;
}
else
{
current_mean = 0.f;
}
return current_mean;
}

14
indra/llui/llstatbar.cpp
View File

@@ -254,14 +254,12 @@ void LLStatBar::draw()
if (mParameters.mPerSec)
{
left = (S32)((mStatp->getPrevPerSec(i) - (mParameters.mMinBar + mMinShift)) * value_scale);
right = (S32)((mStatp->getPrevPerSec(i) - (mParameters.mMinBar + mMinShift)) * value_scale) + 1;
gl_rect_2d(left, bottom+i+1, right, bottom+i, LLColor4(1.f, 0.f, 0.f, 1.f));
gl_rect_2d(left, bottom+i+1, left+1, bottom+i, LLColor4(1.f, 0.f, 0.f, 1.f));
}
else
{
left = (S32)((mStatp->getPrev(i) - (mParameters.mMinBar + mMinShift)) * value_scale);
right = (S32)((mStatp->getPrev(i) - (mParameters.mMinBar + mMinShift)) * value_scale) + 1;
gl_rect_2d(left, bottom+i+1, right, bottom+i, LLColor4(1.f, 0.f, 0.f, 1.f));
gl_rect_2d(left, bottom+i+1, left + 1, bottom+i, LLColor4(1.f, 0.f, 0.f, 1.f));
}
}
}
@@ -269,16 +267,14 @@ void LLStatBar::draw()
{
// draw current
left = (S32) ((current - (mParameters.mMinBar + mMinShift)) * value_scale) - 1;
right = (S32) ((current - (mParameters.mMinBar + mMinShift)) * value_scale) + 1;
gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 0.f, 0.f, 1.f));
gl_rect_2d(left, top, left + 2, bottom, LLColor4(1.f, 0.f, 0.f, 1.f));
}
// draw mean bar
top = bar_top + 2;
bottom = bar_top - bar_height - 2;
left = (S32) ((mean - (mParameters.mMinBar + mMinShift)) * value_scale) - 1;
right = (S32) ((mean - (mParameters.mMinBar + mMinShift)) * value_scale) + 1;
gl_rect_2d(left, top, right, bottom, LLColor4(0.f, 1.f, 0.f, 1.f));
left = (S32)((mean - (mParameters.mMinBar + mMinShift)) * value_scale) - 1;
gl_rect_2d(left, top, left + 2, bottom, LLColor4(0.f, 1.f, 0.f, 1.f));
}
LLView::draw();