Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Implement linked selection in compare menu.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-06-02 15:40:19 +02:00
parent 794d155fde
commit 79215ea73e
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
server/TracyView.cpp
View File

@ -7241,6 +7241,9 @@ void View::DrawCompare()
if( ImGui::TreeNodeEx( "Matched source locations", ImGuiTreeNodeFlags_DefaultOpen ) ) if( ImGui::TreeNodeEx( "Matched source locations", ImGuiTreeNodeFlags_DefaultOpen ) )
{ {
ImGui::SameLine();
SmallCheckbox( "Link selection", &m_compare.link );
ImGui::Separator(); ImGui::Separator();
ImGui::Columns( 2 ); ImGui::Columns( 2 );
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
@ -7294,6 +7297,49 @@ void View::DrawCompare()
if( prev0 != m_compare.selMatch[0] || prev1 != m_compare.selMatch[1] ) if( prev0 != m_compare.selMatch[0] || prev1 != m_compare.selMatch[1] )
{ {
m_compare.ResetSelection(); m_compare.ResetSelection();
if( m_compare.link )
{
auto& srcloc0 = m_worker.GetSourceLocation( m_compare.match[0][m_compare.selMatch[0]] );
auto& srcloc1 = m_compare.second->GetSourceLocation( m_compare.match[1][m_compare.selMatch[1]] );
auto string0 = m_worker.GetString( srcloc0.name.active ? srcloc0.name : srcloc0.function );
auto string1 = m_compare.second->GetString( srcloc1.name.active ? srcloc1.name : srcloc1.function );
if( strcmp( string0, string1 ) != 0 )
{
idx = 0;
if( prev0 != m_compare.selMatch[0] )
{
for( auto& v : m_compare.match[1] )
{
auto& srcloc = m_compare.second->GetSourceLocation( v );
auto string = m_compare.second->GetString( srcloc.name.active ? srcloc.name : srcloc.function );
if( strcmp( string0, string ) == 0 )
{
m_compare.selMatch[1] = idx;
break;
}
idx++;
}
}
else
{
assert( prev1 != m_compare.selMatch[1] );
for( auto& v : m_compare.match[0] )
{
auto& srcloc = m_worker.GetSourceLocation( v );
auto string = m_worker.GetString( srcloc.name.active ? srcloc.name : srcloc.function );
if( strcmp( string1, string ) == 0 )
{
m_compare.selMatch[0] = idx;
break;
}
idx++;
}
}
}
}
} }
} }

1
server/TracyView.hpp
View File

@ -424,6 +424,7 @@ private:
struct { struct {
bool show = false; bool show = false;
bool ignoreCase = false; bool ignoreCase = false;
bool link = true;
std::unique_ptr<Worker> second; std::unique_ptr<Worker> second;
std::thread loadThread; std::thread loadThread;
int badVer = 0; int badVer = 0;