mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-12-02 09:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in dedmenmiller/tracy-1/dedmenmiller/fixed-offset-in-histogram-with-nonlog-ti-1548339368610 (pull request #30)

Browse Source 
Fixed offset in histogram with non-log time
This commit is contained in:
Dedmen Miller (Dedmenmiller) 2019-01-24 15:03:22 +00:00 committed by Bartosz Taudul
commit f474669ab5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/TracyView.cpp
View File

@ -5043,7 +5043,7 @@ void View::DrawFindZone()
while( zit != sorted.end() && *zit == 0 ) zit++; while( zit != sorted.end() && *zit == 0 ) zit++;
for( int64_t i=0; i<numBins; i++ ) for( int64_t i=0; i<numBins; i++ )
{ {
const auto nextBinVal = ( i+1 ) * zmax / numBins; const auto nextBinVal = tmin + ( i+1 ) * zmax / numBins;
auto nit = std::lower_bound( zit, sorted.end(), nextBinVal ); auto nit = std::lower_bound( zit, sorted.end(), nextBinVal );
const auto distance = std::distance( zit, nit ); const auto distance = std::distance( zit, nit );
const auto timeSum = std::accumulate( zit, nit, int64_t( 0 ) ); const auto timeSum = std::accumulate( zit, nit, int64_t( 0 ) );
@ -5067,7 +5067,7 @@ void View::DrawFindZone()
while( zit != m_findZone.selSort.end() && *zit == 0 ) zit++; while( zit != m_findZone.selSort.end() && *zit == 0 ) zit++;
for( int64_t i=0; i<numBins; i++ ) for( int64_t i=0; i<numBins; i++ )
{ {
const auto nextBinVal = ( i+1 ) * zmax / numBins; const auto nextBinVal = tmin + ( i+1 ) * zmax / numBins;
auto nit = std::lower_bound( zit, m_findZone.selSort.end(), nextBinVal ); auto nit = std::lower_bound( zit, m_findZone.selSort.end(), nextBinVal );
if( cumulateTime ) if( cumulateTime )
{ {
@ -6028,7 +6028,7 @@ void View::DrawCompare()
const auto zmax = tmax - tmin; const auto zmax = tmax - tmin;
for( int64_t i=0; i<numBins; i++ ) for( int64_t i=0; i<numBins; i++ )
{ {
const auto nextBinVal = ( i+1 ) * zmax / numBins; const auto nextBinVal = tmin + ( i+1 ) * zmax / numBins;
auto nit0 = std::lower_bound( zit0, sorted[0].end(), nextBinVal ); auto nit0 = std::lower_bound( zit0, sorted[0].end(), nextBinVal );
auto nit1 = std::lower_bound( zit1, sorted[1].end(), nextBinVal ); auto nit1 = std::lower_bound( zit1, sorted[1].end(), nextBinVal );
bins[i].v0 += adj0 * std::distance( zit0, nit0 ); bins[i].v0 += adj0 * std::distance( zit0, nit0 );
@ -6895,7 +6895,7 @@ void View::DrawInfo()
while( fit != frames.end() && *fit == 0 ) fit++; while( fit != frames.end() && *fit == 0 ) fit++;
for( int64_t i=0; i<numBins; i++ ) for( int64_t i=0; i<numBins; i++ )
{ {
const auto nextBinVal = ( i+1 ) * zmax / numBins; const auto nextBinVal = tmin + ( i+1 ) * zmax / numBins;
auto nit = std::lower_bound( fit, frames.end(), nextBinVal ); auto nit = std::lower_bound( fit, frames.end(), nextBinVal );
bins[i] = std::distance( fit, nit ); bins[i] = std::distance( fit, nit );
fit = nit; fit = nit;