From f32114cb3514ba62c38c869135ecb2eb5ff75839 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Fri, 13 Oct 2017 15:09:01 +0200 Subject: [PATCH] Draw plot points in a separate function. --- server/TracyView.cpp | 10 ++++++++-- server/TracyView.hpp | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 87c8f9b0..4e880b36 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -2121,7 +2121,7 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos ) { const auto x = ( it->time - m_zvStart ) * pxns; const auto y = PlotHeight - ( it->val - min ) * revrange * PlotHeight; - draw->AddRect( wpos + ImVec2( x - 1.5f, offset + y - 1.5f ), wpos + ImVec2( x + 2.5f, offset + y + 2.5f ), 0xFF44DDDD ); + DrawPlotPoint( wpos, x, y, offset, 0xFF44DDDD ); } auto prev = it; @@ -2134,7 +2134,7 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos ) const auto y1 = PlotHeight - ( it->val - min ) * revrange * PlotHeight; draw->AddLine( wpos + ImVec2( x0, offset + y0 ), wpos + ImVec2( x1, offset + y1 ), 0xFF44DDDD ); - draw->AddRect( wpos + ImVec2( x1 - 1.5f, offset + y1 - 1.5f ), wpos + ImVec2( x1 + 2.5f, offset + y1 + 2.5f ), 0xFF44DDDD ); + DrawPlotPoint( wpos, x1, y1, offset, 0xFF44DDDD ); prev = it; ++it; @@ -2153,6 +2153,12 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos ) return offset; } +void View::DrawPlotPoint( const ImVec2& wpos, float x, float y, int offset, uint32_t color ) +{ + auto draw = ImGui::GetWindowDrawList(); + draw->AddRect( wpos + ImVec2( x - 1.5f, offset + y - 1.5f ), wpos + ImVec2( x + 2.5f, offset + y + 2.5f ), color ); +} + void View::DrawZoneInfoWindow() { if( !m_zoneInfoWindow ) return; diff --git a/server/TracyView.hpp b/server/TracyView.hpp index ba1fb89a..ca0c8d79 100644 --- a/server/TracyView.hpp +++ b/server/TracyView.hpp @@ -134,6 +134,7 @@ private: int DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos, int offset, LockHighlight& highlight ); void DrawZoneInfoWindow(); int DrawPlots( int offset, double pxns, const ImVec2& wpos ); + void DrawPlotPoint( const ImVec2& wpos, float x, float y, int offset, uint32_t color ); void DrawOptions(); void HandleZoneViewMouse( int64_t timespan, const ImVec2& wpos, float w, double& pxns );