From 16627d731329868ce6b23f498f8c5f138daee048 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf@nereid.pl>
Date: Sun, 24 Jul 2022 12:37:30 +0200
Subject: [PATCH] Plots may now be drawn as staircases.

---
 server/TracyEvent.hpp      |  1 +
 server/TracyView_Plots.cpp | 13 +++++++++++--
 server/TracyWorker.cpp     |  8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/server/TracyEvent.hpp b/server/TracyEvent.hpp
index 83a5057a..3e7d737b 100644
--- a/server/TracyEvent.hpp
+++ b/server/TracyEvent.hpp
@@ -747,6 +747,7 @@ struct PlotData
     SortedVector<PlotItem, PlotItemSort> data;
     PlotType type;
     PlotValueFormatting format;
+    uint8_t showSteps;
 };
 
 struct MemData
diff --git a/server/TracyView_Plots.cpp b/server/TracyView_Plots.cpp
index 3d6d60be..3d90b5a1 100644
--- a/server/TracyView_Plots.cpp
+++ b/server/TracyView_Plots.cpp
@@ -259,8 +259,17 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos, bool hover, fl
                     const auto y0 = PlotHeight - ( prevy->val - min ) * revrange * PlotHeight;
                     const auto y1 = PlotHeight - ( it->val - min ) * revrange * PlotHeight;
 
-                    draw->AddQuadFilled( dpos + ImVec2( x0, offset + PlotHeight ), dpos + ImVec2( x0, offset + y0 ), dpos + ImVec2( x1, offset + y1 ), dpos + ImVec2( x1, offset + PlotHeight ), fill );
-                    DrawLine( draw, dpos + ImVec2( x0, offset + y0 ), dpos + ImVec2( x1, offset + y1 ), color );
+                    if( v->showSteps )
+                    {
+                        draw->AddRectFilled( dpos + ImVec2( x0, offset + PlotHeight ), dpos + ImVec2( x1, offset + y0 ), fill );
+                        const ImVec2 data[3] = { dpos + ImVec2( x0, offset + y0 ), dpos + ImVec2( x1, offset + y0 ), dpos + ImVec2( x1, offset + y1 ) };
+                        draw->AddPolyline( data, 3, color, 0, 1.0f );
+                    }
+                    else
+                    {
+                        draw->AddQuadFilled( dpos + ImVec2( x0, offset + PlotHeight ), dpos + ImVec2( x0, offset + y0 ), dpos + ImVec2( x1, offset + y1 ), dpos + ImVec2( x1, offset + PlotHeight ), fill );
+                        DrawLine( draw, dpos + ImVec2( x0, offset + y0 ), dpos + ImVec2( x1, offset + y1 ), color );
+                    }
 
                     const auto rx = skip == 0 ? 2.0 : ( skip == 1 ? 2.5 : 4.0 );
 
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index d263b3c6..21814511 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -454,6 +454,7 @@ Worker::Worker( const char* name, const char* program, const std::vector<ImportE
         plot->name = nptr;
         plot->type = PlotType::User;
         plot->format = v.format;
+        plot->showSteps = false;
 
         double sum = 0;
         double min = v.data.begin()->second;
@@ -1104,6 +1105,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
                 auto pd = m_slab.AllocInit<PlotData>();
                 uint64_t psz;
                 f.Read7( pd->type, pd->format, pd->name, pd->min, pd->max, pd->sum, psz );
+                pd->showSteps = false;
                 pd->data.reserve_exact( psz, m_slab );
                 auto ptr = pd->data.data();
                 int64_t refTime = 0;
@@ -1127,6 +1129,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
                 uint64_t psz;
                 f.Read6( pd->type, pd->format, pd->name, pd->min, pd->max, psz );
                 pd->sum = 0;
+                pd->showSteps = false;
                 pd->data.reserve_exact( psz, m_slab );
                 auto ptr = pd->data.data();
                 int64_t refTime = 0;
@@ -5620,6 +5623,7 @@ void Worker::ProcessPlotData( const QueuePlotData& ev )
         plot->name = name;
         plot->type = PlotType::User;
         plot->format = PlotValueFormatting::Number;
+        plot->showSteps = false;
         return plot;
     }, [this]( uint64_t name ) {
         Query( ServerQueryPlotName, name );
@@ -5650,6 +5654,7 @@ void Worker::ProcessPlotConfig( const QueuePlotConfig& ev )
         auto plot = m_slab.AllocInit<PlotData>();
         plot->name = name;
         plot->type = PlotType::User;
+        plot->showSteps = false;
         return plot;
     }, [this]( uint64_t name ) {
         Query( ServerQueryPlotName, name );
@@ -6777,6 +6782,7 @@ void Worker::ProcessSysTime( const QueueSysTime& ev )
         m_sysTimePlot->name = 0;
         m_sysTimePlot->type = PlotType::SysTime;
         m_sysTimePlot->format = PlotValueFormatting::Percentage;
+        m_sysTimePlot->showSteps = false;
         m_sysTimePlot->min = val;
         m_sysTimePlot->max = val;
         m_sysTimePlot->sum = val;
@@ -7093,6 +7099,7 @@ void Worker::CreateMemAllocPlot( MemData& memdata )
     memdata.plot->name = memdata.name;
     memdata.plot->type = PlotType::Memory;
     memdata.plot->format = PlotValueFormatting::Memory;
+    memdata.plot->showSteps = true;
     memdata.plot->data.push_back( { GetFrameBegin( *m_data.framesBase, 0 ), 0. } );
     m_data.plots.Data().push_back( memdata.plot );
 }
@@ -7116,6 +7123,7 @@ void Worker::ReconstructMemAllocPlot( MemData& mem )
     plot->name = mem.name;
     plot->type = PlotType::Memory;
     plot->format = PlotValueFormatting::Memory;
+    plot->showSteps = true;
     plot->data.reserve_exact( psz, m_slab );
 
     auto aptr = mem.data.begin();