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

Tooltip cosmetics.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-11-18 00:51:04 +01:00
parent 18252feeeb
commit 82edca301f
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server/TracyView.cpp
View File

@ -1679,6 +1679,7 @@ void View::DrawFrames()
} }
ImGui::Text( "Frames: %i - %i (%i)", sel, sel + g - 1, g ); ImGui::Text( "Frames: %i - %i (%i)", sel, sel + g - 1, g );
ImGui::Separator();
ImGui::Text( "Max frame time: %s", TimeToString( f ) ); ImGui::Text( "Max frame time: %s", TimeToString( f ) );
} }
else else
@ -1686,11 +1687,13 @@ void View::DrawFrames()
if( sel == 0 ) if( sel == 0 )
{ {
ImGui::Text( "Tracy initialization" ); ImGui::Text( "Tracy initialization" );
ImGui::Separator();
ImGui::Text( "Time: %s", TimeToString( GetFrameTime( sel ) ) ); ImGui::Text( "Time: %s", TimeToString( GetFrameTime( sel ) ) );
} }
else else
{ {
ImGui::Text( "Frame: %i", sel ); ImGui::Text( "Frame: %i", sel );
ImGui::Separator();
ImGui::Text( "Frame time: %s", TimeToString( GetFrameTime( sel ) ) ); ImGui::Text( "Frame time: %s", TimeToString( GetFrameTime( sel ) ) );
} }
} }
@ -1884,6 +1887,7 @@ bool View::DrawZoneFrames()
{ {
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "%s", GetFrameText( i, ftime ) ); ImGui::Text( "%s", GetFrameText( i, ftime ) );
ImGui::Separator();
ImGui::Text( "Time from start of program: %s", TimeToString( m_frames[i] - m_frames[0] ) ); ImGui::Text( "Time from start of program: %s", TimeToString( m_frames[i] - m_frames[0] ) );
ImGui::EndTooltip(); ImGui::EndTooltip();
@ -2074,7 +2078,9 @@ void View::DrawZones()
else else
{ {
ImGui::Text( "%s", TimeToString( (*it)->time - m_frames[0] ) ); ImGui::Text( "%s", TimeToString( (*it)->time - m_frames[0] ) );
ImGui::Text( "%s", GetString( (*it)->ref ) ); ImGui::Separator();
ImGui::Text( "Message text:" );
ImGui::TextColored( ImVec4( 0xCC / 255.f, 0xCC / 255.f, 0x22 / 255.f, 1.f ), "%s", GetString( (*it)->ref ) );
} }
ImGui::EndTooltip(); ImGui::EndTooltip();
m_msgHighlight = *it; m_msgHighlight = *it;
@ -2229,6 +2235,7 @@ int View::DrawZoneLevel( const Vector<ZoneEvent*>& vec, bool hover, double pxns,
{ {
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "Zones too small to display: %i", num ); ImGui::Text( "Zones too small to display: %i", num );
ImGui::Separator();
ImGui::Text( "Execution time: %s", TimeToString( rend - ev.start ) ); ImGui::Text( "Execution time: %s", TimeToString( rend - ev.start ) );
ImGui::EndTooltip(); ImGui::EndTooltip();
@ -2420,6 +2427,7 @@ int View::DrawGpuZoneLevel( const Vector<GpuEvent*>& vec, bool hover, double pxn
{ {
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "Zones too small to display: %i", num ); ImGui::Text( "Zones too small to display: %i", num );
ImGui::Separator();
ImGui::Text( "Execution time: %s", TimeToString( rend - ev.gpuStart ) ); ImGui::Text( "Execution time: %s", TimeToString( rend - ev.gpuStart ) );
ImGui::EndTooltip(); ImGui::EndTooltip();
@ -2815,8 +2823,8 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
} }
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "Lock #%" PRIu32, v.first ); ImGui::Text( "Lock #%" PRIu32 ": %s", v.first, GetString( srcloc.function ) );
ImGui::Text( "%s", GetString( srcloc.function ) ); ImGui::Separator();
ImGui::Text( "%s:%i", GetString( srcloc.file ), srcloc.line ); ImGui::Text( "%s:%i", GetString( srcloc.file ), srcloc.line );
ImGui::Text( "Time: %s", TimeToString( t1 - t0 ) ); ImGui::Text( "Time: %s", TimeToString( t1 - t0 ) );
ImGui::Separator(); ImGui::Separator();
@ -2874,6 +2882,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
} }
auto waitList = (*vbegin)->waitList; auto waitList = (*vbegin)->waitList;
int t = 0; int t = 0;
ImGui::Indent( ty );
while( waitList != 0 ) while( waitList != 0 )
{ {
if( waitList & 0x1 ) if( waitList & 0x1 )
@ -2883,12 +2892,15 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
waitList >>= 1; waitList >>= 1;
t++; t++;
} }
ImGui::Unindent( ty );
break; break;
} }
case LockState::WaitLock: case LockState::WaitLock:
{ {
ImGui::Text( "Thread \"%s\" is blocked by other thread:", GetThreadString( tid ) ); ImGui::Text( "Thread \"%s\" is blocked by other thread:", GetThreadString( tid ) );
ImGui::Indent( ty );
ImGui::Text( "\"%s\"", GetThreadString( lockmap.threadList[(*vbegin)->lockingThread] ) ); ImGui::Text( "\"%s\"", GetThreadString( lockmap.threadList[(*vbegin)->lockingThread] ) );
ImGui::Unindent( ty );
break; break;
} }
default: default:
@ -2941,6 +2953,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
{ {
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "Thread list:" ); ImGui::Text( "Thread list:" );
ImGui::Separator();
ImGui::Indent( ty ); ImGui::Indent( ty );
for( auto& t : v.second.threadList ) for( auto& t : v.second.threadList )
{ {
@ -2995,6 +3008,7 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos, bool hover )
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "Plot \"%s\"", txt ); ImGui::Text( "Plot \"%s\"", txt );
ImGui::Separator();
ImGui::Text( "Data points: %s", RealToString( v->data.size(), true ) ); ImGui::Text( "Data points: %s", RealToString( v->data.size(), true ) );
ImGui::Text( "Data range: %s", RealToString( v->max - v->min, true ) ); ImGui::Text( "Data range: %s", RealToString( v->max - v->min, true ) );
ImGui::Text( "Min value: %s", RealToString( v->min, true ) ); ImGui::Text( "Min value: %s", RealToString( v->min, true ) );
@ -3572,7 +3586,17 @@ void View::ZoneTooltip( const ZoneEvent& ev )
const auto end = GetZoneEnd( ev ); const auto end = GetZoneEnd( ev );
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "%s", func ); if( srcloc.name.active )
{
ImGui::Text( "%s", zoneName );
ImGui::Separator();
ImGui::Text( "%s", func );
}
else
{
ImGui::Text( "%s", func );
ImGui::Separator();
}
ImGui::Text( "%s:%i", filename, line ); ImGui::Text( "%s:%i", filename, line );
ImGui::Text( "Execution time: %s", TimeToString( end - ev.start ) ); ImGui::Text( "Execution time: %s", TimeToString( end - ev.start ) );
ImGui::Text( "Without profiling: %s", TimeToString( end - ev.start - m_delay * dmul ) ); ImGui::Text( "Without profiling: %s", TimeToString( end - ev.start - m_delay * dmul ) );
@ -3607,6 +3631,7 @@ void View::ZoneTooltip( const GpuEvent& ev )
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "%s", func ); ImGui::Text( "%s", func );
ImGui::Separator();
ImGui::Text( "%s:%i", filename, line ); ImGui::Text( "%s:%i", filename, line );
ImGui::Text( "GPU execution time: %s", TimeToString( end - ev.gpuStart ) ); ImGui::Text( "GPU execution time: %s", TimeToString( end - ev.gpuStart ) );
ImGui::Text( "CPU command setup time: %s", TimeToString( ev.cpuEnd - ev.cpuStart ) ); ImGui::Text( "CPU command setup time: %s", TimeToString( ev.cpuEnd - ev.cpuStart ) );