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

Added continuous scrolling.

Browse Source
This commit is contained in:
jmanc3 2020-07-01 17:03:01 -05:00
parent 4881f7aa54
commit 10813ddcf4
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
server/TracyView.cpp
View File

@ -146,6 +146,8 @@ View::View( const char* addr, int port, ImFont* fixedWidth, ImFont* smallFont, I
s_instance = this;
InitTextEditor( fixedWidth );
m_continuousScrollingFirstFrame = true;
}
View::View( FileRead& f, ImFont* fixedWidth, ImFont* smallFont, ImFont* bigFont, SetTitleCallback stcb, GetWindowCallback gwcb )
@ -176,6 +178,8 @@ View::View( FileRead& f, ImFont* fixedWidth, ImFont* smallFont, ImFont* bigFont,
if( m_worker.GetCallstackFrameCount() == 0 ) m_showUnknownFrames = false;
if( m_worker.GetCallstackSampleCount() == 0 ) m_showAllSymbols = true;
m_continuousScrollingFirstFrame = true;
}
View::~View()
@ -582,6 +586,8 @@ bool View::DrawImpl()
ImGui::SameLine();
ToggleButton( ICON_FA_FINGERPRINT " Info", m_showInfo );
ImGui::SameLine();
ToggleButton( ICON_FA_ARROW_RIGHT " Continuous Scroll", m_continuousScrolling );
ImGui::SameLine();
if( ImGui::Button( ICON_FA_TOOLS ) ) ImGui::OpenPopup( "ToolsPopup" );
if( ImGui::BeginPopup( "ToolsPopup" ) )
{
@ -750,6 +756,7 @@ bool View::DrawImpl()
if( m_showOptions ) DrawOptions();
if( m_showMessages ) DrawMessages();
if( m_continuousScrolling && m_worker.IsConnected() ) ContinuousScrolling();
if( m_findZone.show ) DrawFindZone();
if( m_showStatistics ) DrawStatistics();
if( m_memInfo.show ) DrawMemory();
@ -1693,6 +1700,7 @@ void View::HandleZoneViewMouse( int64_t timespan, const ImVec2& wpos, float w, d
{
m_highlight.active = true;
m_highlight.start = m_highlight.end = m_vd.zvStart + ( io.MousePos.x - wpos.x ) * nspx;
m_continuousScrolling = false;
}
else if( ImGui::IsMouseDragging( 0, 0 ) )
{
@ -1719,6 +1727,7 @@ void View::HandleZoneViewMouse( int64_t timespan, const ImVec2& wpos, float w, d
{
m_highlightZoom.active = true;
m_highlightZoom.start = m_highlightZoom.end = m_vd.zvStart + ( io.MousePos.x - wpos.x ) * nspx;
m_continuousScrolling = false;
}
else if( ImGui::IsMouseDragging( 2, 0 ) )
{
@ -1794,6 +1803,7 @@ void View::HandleZoneViewMouse( int64_t timespan, const ImVec2& wpos, float w, d
ImGui::SetScrollY( y - delta.y );
io.MouseClickedPos[1].y = io.MousePos.y;
}
m_continuousScrolling = false;
}
const auto wheel = io.MouseWheel;
@ -1826,9 +1836,20 @@ void View::HandleZoneViewMouse( int64_t timespan, const ImVec2& wpos, float w, d
t0 -= std::max( int64_t( 1 ), int64_t( p1 * 0.25 ) );
t1 += std::max( int64_t( 1 ), int64_t( p2 * 0.25 ) );
}
if (m_continuousScrolling && m_worker.IsConnected()) {
// We want to able to increase/decrease the view span even if we are continuously scrolling
// and using ZoomToRange would be overwritten by or ContinuousScrolling function so we
// set the values directly here
m_vd.zvStart = t0;
if (t0 == t1)
t1 += 1;
m_vd.zvEnd = t1;
} else {
ZoomToRange( t0, t1 );
}
}
}
uint64_t View::GetFrameNumber( const FrameData& fd, int i, uint64_t offset ) const
{
@ -8677,6 +8698,21 @@ void View::DrawMessages()
ImGui::End();
}
void View::ContinuousScrolling()
{
if (m_continuousScrollingFirstFrame) {
// On the first frame, expand the view span to cover a 5 second range
m_continuousScrollingFirstFrame = false;
m_vd.zvStart = m_worker.GetLastTime();
m_vd.zvEnd = m_vd.zvStart + 5000000000;
}
// Center the end and then move over 25 percent to display more history
const auto t = m_worker.GetLastTime();
const auto hr = std::max<uint64_t>( 1, ( m_vd.zvEnd - m_vd.zvStart ) / 2 );
ZoomToRange( (t - hr) - (hr / 2), (t + hr) - (hr / 2));
}
uint64_t View::GetSelectionTarget( const Worker::ZoneThreadData& ev, FindZone::GroupBy groupBy ) const
{
switch( groupBy )

3
server/TracyView.hpp
View File

@ -155,6 +155,7 @@ private:
int DrawCpuData( int offset, double pxns, const ImVec2& wpos, bool hover, float yMin, float yMax );
void DrawOptions();
void DrawMessages();
void ContinuousScrolling();
void DrawFindZone();
void DrawStatistics();
void DrawMemory();
@ -347,6 +348,8 @@ private:
bool m_showMessages = false;
bool m_showStatistics = false;
bool m_showInfo = false;
bool m_continuousScrolling = true;
bool m_continuousScrollingFirstFrame = true;
bool m_showPlayback = false;
bool m_showCpuDataWindow = false;
bool m_showAnnotationList = false;