mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-09-20 05:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show diff direction and allow reversal.

Browse Source
This commit is contained in:
Bartosz Taudul 2022-12-30 20:33:17 +01:00
parent 166c553af3
commit b8029f7448
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/TracyView.hpp
View File

@ -742,6 +742,7 @@ private:
int minBinVal = 1; int minBinVal = 1;
int compareMode = 0; int compareMode = 0;
bool diffDone = false; bool diffDone = false;
bool diffDirection;
std::vector<const char*> thisUnique; std::vector<const char*> thisUnique;
std::vector<const char*> secondUnique; std::vector<const char*> secondUnique;
std::vector<std::pair<const char*, std::string>> diffs; std::vector<std::pair<const char*, std::string>> diffs;

23
server/TracyView_Compare.cpp
View File

@ -214,6 +214,7 @@ void View::DrawCompare()
{ {
m_compare.second = std::make_unique<Worker>( *f, EventType::SourceCache ); m_compare.second = std::make_unique<Worker>( *f, EventType::SourceCache );
m_compare.userData = std::make_unique<UserData>( m_compare.second->GetCaptureProgram().c_str(), m_compare.second->GetCaptureTime() ); m_compare.userData = std::make_unique<UserData>( m_compare.second->GetCaptureProgram().c_str(), m_compare.second->GetCaptureTime() );
m_compare.diffDirection = m_worker.GetCaptureTime() < m_compare.second->GetCaptureTime();
} }
catch( const tracy::UnsupportedVersion& e ) catch( const tracy::UnsupportedVersion& e )
{ {
@ -309,8 +310,25 @@ void View::DrawCompare()
ImGui::Separator(); ImGui::Separator();
ImGui::BeginChild( "##compare" ); ImGui::BeginChild( "##compare" );
const auto& tfc = m_worker.GetSourceFileCache(); TextDisabledUnformatted( "Diff direction: " );
const auto& ofc = m_compare.second->GetSourceFileCache(); ImGui::SameLine();
TextColoredUnformatted( ImVec4( 0xDD/255.f, 0xDD/255.f, 0x22/255.f, 1.f ), ICON_FA_LEMON );
ImGui::SameLine();
ImGui::Text( " %s ", m_compare.diffDirection ? ICON_FA_ARROW_RIGHT : ICON_FA_ARROW_LEFT );
ImGui::SameLine();
TextColoredUnformatted( ImVec4( 0xDD/255.f, 0x22/255.f, 0x22/255.f, 1.f ), ICON_FA_GEM );
ImGui::SameLine();
if( ImGui::SmallButton( "Switch" ) )
{
m_compare.diffDirection = !m_compare.diffDirection;
m_compare.Reset();
}
ImGui::Separator();
ImGui::BeginChild( "##diff" );
const auto& tfc = m_compare.diffDirection ? m_worker.GetSourceFileCache() : m_compare.second->GetSourceFileCache();
const auto& ofc = m_compare.diffDirection ? m_compare.second->GetSourceFileCache() : m_worker.GetSourceFileCache();
if( !m_compare.diffDone ) if( !m_compare.diffDone )
{ {
@ -430,6 +448,7 @@ void View::DrawCompare()
} }
} }
} }
ImGui::EndChild();
} }
else else
{ {