Ability to completely hide threads.

This commit is contained in:
Bartosz Taudul 2017-10-22 13:13:26 +02:00
parent 10e3307512
commit 133db4c68e
2 changed files with 21 additions and 7 deletions

View File

@ -249,7 +249,8 @@ View::View( FileRead& f )
f.Read( &ptr, sizeof( ptr ) ); f.Read( &ptr, sizeof( ptr ) );
td->messages.push_back( msgMap[ptr] ); td->messages.push_back( msgMap[ptr] );
} }
td->enabled = true; td->showFull = true;
td->visible = true;
m_threads.push_back( td ); m_threads.push_back( td );
} }
@ -896,7 +897,8 @@ View::ThreadData* View::NoticeThread( uint64_t thread )
m_threadMap.emplace( thread, (uint32_t)m_threads.size() ); m_threadMap.emplace( thread, (uint32_t)m_threads.size() );
auto td = m_slab.AllocInit<ThreadData>(); auto td = m_slab.AllocInit<ThreadData>();
td->id = thread; td->id = thread;
td->enabled = true; td->showFull = true;
td->visible = true;
m_threads.push_back( td ); m_threads.push_back( td );
return m_threads.back(); return m_threads.back();
} }
@ -1821,9 +1823,11 @@ void View::DrawZones()
const auto th = ( ty - to ) * sqrt( 3 ) * 0.5; const auto th = ( ty - to ) * sqrt( 3 ) * 0.5;
for( auto& v : m_threads ) for( auto& v : m_threads )
{ {
if( !v->visible ) continue;
draw->AddLine( wpos + ImVec2( 0, offset + ostep - 1 ), wpos + ImVec2( w, offset + ostep - 1 ), 0x33FFFFFF ); draw->AddLine( wpos + ImVec2( 0, offset + ostep - 1 ), wpos + ImVec2( w, offset + ostep - 1 ), 0x33FFFFFF );
if( v->enabled ) if( v->showFull )
{ {
draw->AddTriangleFilled( wpos + ImVec2( to/2, offset + to/2 ), wpos + ImVec2( ty - to/2, offset + to/2 ), wpos + ImVec2( ty * 0.5, offset + to/2 + th ), 0xFFFFFFFF ); draw->AddTriangleFilled( wpos + ImVec2( to/2, offset + to/2 ), wpos + ImVec2( ty - to/2, offset + to/2 ), wpos + ImVec2( ty * 0.5, offset + to/2 + th ), 0xFFFFFFFF );
@ -1850,16 +1854,16 @@ void View::DrawZones()
draw->AddTriangle( wpos + ImVec2( to/2, offset + to/2 ), wpos + ImVec2( to/2, offset + ty - to/2 ), wpos + ImVec2( to/2 + th, offset + ty * 0.5 ), 0xFF888888 ); draw->AddTriangle( wpos + ImVec2( to/2, offset + to/2 ), wpos + ImVec2( to/2, offset + ty - to/2 ), wpos + ImVec2( to/2 + th, offset + ty * 0.5 ), 0xFF888888 );
} }
const auto txt = GetThreadString( v->id ); const auto txt = GetThreadString( v->id );
draw->AddText( wpos + ImVec2( ty, offset ), v->enabled ? 0xFFFFFFFF : 0xFF888888, txt ); draw->AddText( wpos + ImVec2( ty, offset ), v->showFull ? 0xFFFFFFFF : 0xFF888888, txt );
if( hover && ImGui::IsMouseClicked( 0 ) && ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( ty + ImGui::CalcTextSize( txt ).x, offset + ty ) ) ) if( hover && ImGui::IsMouseClicked( 0 ) && ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( ty + ImGui::CalcTextSize( txt ).x, offset + ty ) ) )
{ {
v->enabled = !v->enabled; v->showFull = !v->showFull;
} }
offset += ostep; offset += ostep;
if( v->enabled ) if( v->showFull )
{ {
m_lastCpu = -1; m_lastCpu = -1;
if( m_drawZones ) if( m_drawZones )
@ -2732,10 +2736,19 @@ void View::DrawZoneInfoWindow()
void View::DrawOptions() void View::DrawOptions()
{ {
const auto tw = ImGui::GetFontSize();
ImGui::Begin( "Options", &m_showOptions, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_ShowBorders ); ImGui::Begin( "Options", &m_showOptions, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_ShowBorders );
ImGui::Checkbox( "Draw zones", &m_drawZones ); ImGui::Checkbox( "Draw zones", &m_drawZones );
ImGui::Checkbox( "Draw locks", &m_drawLocks ); ImGui::Checkbox( "Draw locks", &m_drawLocks );
ImGui::Checkbox( "Draw plots", &m_drawPlots ); ImGui::Checkbox( "Draw plots", &m_drawPlots );
ImGui::Separator();
ImGui::Text( "Visible threads:" );
ImGui::Indent( tw );
for( auto& t : m_threads )
{
ImGui::Checkbox( GetThreadString( t->id ), &t->visible );
}
ImGui::Unindent( tw );
ImGui::End(); ImGui::End();
} }

View File

@ -65,7 +65,8 @@ private:
struct ThreadData struct ThreadData
{ {
uint64_t id; uint64_t id;
bool enabled; bool showFull;
bool visible;
Vector<Event*> timeline; Vector<Event*> timeline;
Vector<MessageData*> messages; Vector<MessageData*> messages;
}; };