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

Merge adding annotations and setting range limits.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-08-04 16:40:35 +02:00
parent 79fc917483
commit 321fa06a3d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/TracyView.cpp
View File

@ -785,6 +785,18 @@ bool View::DrawImpl()
m_statRange.min = m_setRangePopup.min; m_statRange.min = m_setRangePopup.min;
m_statRange.max = m_setRangePopup.max; m_statRange.max = m_setRangePopup.max;
} }
if( ImGui::Selectable( ICON_FA_STICKY_NOTE " Add annotation" ) )
{
auto ann = std::make_unique<Annotation>();
const auto s = std::min( m_setRangePopup.min, m_setRangePopup.max );
const auto e = std::max( m_setRangePopup.min, m_setRangePopup.max );
ann->start = s;
ann->end = e;
ann->color = 0x888888;
m_selectedAnnotation = ann.get();
m_annotations.emplace_back( std::move( ann ) );
pdqsort_branchless( m_annotations.begin(), m_annotations.end(), []( const auto& lhs, const auto& rhs ) { return lhs->start < rhs->start; } );
}
ImGui::EndPopup(); ImGui::EndPopup();
} }
@ -1830,15 +1842,7 @@ void View::HandleZoneViewMouse( int64_t timespan, const ImVec2& wpos, float w, d
{ {
if( ImGui::GetIO().KeyCtrl && m_highlight.start != m_highlight.end ) if( ImGui::GetIO().KeyCtrl && m_highlight.start != m_highlight.end )
{ {
auto ann = std::make_unique<Annotation>(); m_setRangePopup = RangeSlim { m_highlight.start, m_highlight.end, true };
const auto s = std::min( m_highlight.start, m_highlight.end );
const auto e = std::max( m_highlight.start, m_highlight.end );
ann->start = s;
ann->end = e;
ann->color = 0x888888;
m_selectedAnnotation = ann.get();
m_annotations.emplace_back( std::move( ann ) );
pdqsort_branchless( m_annotations.begin(), m_annotations.end(), []( const auto& lhs, const auto& rhs ) { return lhs->start < rhs->start; } );
} }
m_highlight.active = false; m_highlight.active = false;
} }