mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 20:33:52 +00:00
Code Issues Releases Wiki Activity

Draw nested zones.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-09-24 00:12:26 +02:00
parent c9a982360f
commit 060cd90c81
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/TracyView.cpp
View File

@ -918,17 +918,20 @@ void View::DrawZones()
draw->AddText( wpos + ImVec2( 0, offset ), 0xFFFFFFFF, GetThreadString( v.id ) ); draw->AddText( wpos + ImVec2( 0, offset ), 0xFFFFFFFF, GetThreadString( v.id ) );
offset += ostep; offset += ostep;
DrawZoneLevel( v.timeline, hover, pxns, wpos, offset ); const auto depth = DrawZoneLevel( v.timeline, hover, pxns, wpos, offset, 0 );
offset += ostep * 1.2f; offset += ostep * ( depth + 1.2f );
} }
} }
void View::DrawZoneLevel( const Vector<Event*>& vec, bool hover, double pxns, const ImVec2& wpos, int offset ) int View::DrawZoneLevel( const Vector<Event*>& vec, bool hover, double pxns, const ImVec2& wpos, int _offset, int depth )
{ {
int maxdepth = depth;
auto it = std::lower_bound( vec.begin(), vec.end(), m_zvStart, [] ( const auto& l, const auto& r ) { return l->end < r; } ); auto it = std::lower_bound( vec.begin(), vec.end(), m_zvStart, [] ( const auto& l, const auto& r ) { return l->end < r; } );
if( it != vec.end() ) if( it != vec.end() )
{ {
const auto ostep = ImGui::GetFontSize();
const auto offset = _offset + ostep * depth;
auto draw = ImGui::GetWindowDrawList(); auto draw = ImGui::GetWindowDrawList();
const auto zitend = std::lower_bound( vec.begin(), vec.end(), m_zvEnd, [] ( const auto& l, const auto& r ) { return l->start < r; } ); const auto zitend = std::lower_bound( vec.begin(), vec.end(), m_zvEnd, [] ( const auto& l, const auto& r ) { return l->start < r; } );
@ -962,9 +965,16 @@ void View::DrawZoneLevel( const Vector<Event*>& vec, bool hover, double pxns, co
ImGui::EndTooltip(); ImGui::EndTooltip();
} }
if( !ev.child.empty() )
{
const auto d = DrawZoneLevel( ev.child, hover, pxns, wpos, _offset, depth+1 );
if( d > maxdepth ) maxdepth = d;
}
it++; it++;
} }
} }
return maxdepth;
} }
} }

2
server/TracyView.hpp
View File

@ -73,7 +73,7 @@ private:
void DrawImpl(); void DrawImpl();
void DrawFrames(); void DrawFrames();
void DrawZones(); void DrawZones();
void DrawZoneLevel( const Vector<Event*>& vec, bool hover, double pxns, const ImVec2& wpos, int offset ); int DrawZoneLevel( const Vector<Event*>& vec, bool hover, double pxns, const ImVec2& wpos, int offset, int depth );
std::string m_addr; std::string m_addr;