From 0043525bd161119ee9ef863e9c006cdfbb2439ed Mon Sep 17 00:00:00 2001 From: ozlb Date: Thu, 30 Apr 2020 15:46:18 +0200 Subject: [PATCH] resolved conflicts with latest version --- implot.h | 77 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/implot.h b/implot.h index 58cf48d..444c198 100644 --- a/implot.h +++ b/implot.h @@ -81,13 +81,13 @@ enum ImPlotCol_ { }; enum ImPlotStyleVar_ { - ImPlotStyleVar_LineWeight, // float, line weight in pixels - ImPlotStyleVar_Marker, // int, marker specification - ImPlotStyleVar_MarkerSize, // float, marker size in pixels (roughly the marker's "radius") - ImPlotStyleVar_MarkerWeight, // float, outline weight of markers in pixels - ImPlotStyleVar_ErrorBarSize, // float, error bar whisker width in pixels - ImPlotStyleVar_ErrorBarWeight, // float, error bar whisker weight in pixels - ImPlotStyleVar_DigitalBitHeight, // int, digital channels bit height (at 1) + ImPlotStyleVar_LineWeight, // float, line weight in pixels + ImPlotStyleVar_Marker, // int, marker specification + ImPlotStyleVar_MarkerSize, // float, marker size in pixels (roughly the marker's "radius") + ImPlotStyleVar_MarkerWeight, // float, outline weight of markers in pixels + ImPlotStyleVar_ErrorBarSize, // float, error bar whisker width in pixels + ImPlotStyleVar_ErrorBarWeight, // float, error bar whisker weight in pixels + ImPlotStyleVar_DigitalBitHeight, // int, digital channels bit height (at 1) ImPlotStyleVar_COUNT }; @@ -149,28 +149,6 @@ bool BeginPlot(const char* title_id, // of an if statement conditioned on BeginPlot(). void EndPlot(); -/// Set the axes ranges of the next plot. Call right before BeginPlot(). If ImGuiCond_Always is used, the axes will be locked. -void SetNextPlotRange(float x_min, float x_max, float y_min, float y_max, ImGuiCond cond = ImGuiCond_Once); -/// Set the X axis range of the next plot. Call right before BeginPlot(). If ImGuiCond_Always is used, the axis will be locked. -void SetNextPlotRangeX(float x_min, float x_max, ImGuiCond cond = ImGuiCond_Once); -/// Set the X axis range of the next plot. Call right before BeginPlot(). If ImGuiCond_Always is used, the axis will be locked. -void SetNextPlotRangeY(float y_min, float y_max, ImGuiCond cond = ImGuiCond_Once); - -//----------------------------------------------------------------------------- -// Plot Queries -//----------------------------------------------------------------------------- - -/// Returns true if the plot area in the current or most recent plot is hovered. -bool IsPlotHovered(); -/// Returns the mouse position in x,y coordinates of the current or most recent plot. -ImVec2 GetPlotMousePos(); -/// Returns the current or most recent plot axis range. -ImPlotRange GetPlotRange(); -/// Returns true if the current or most recent plot is being queried. -bool IsPlotQueried(); -/// Returns the current or most recent plot querey range. -ImPlotRange GetPlotQuery(); - //----------------------------------------------------------------------------- // Plot Items //----------------------------------------------------------------------------- @@ -197,6 +175,21 @@ void PlotErrorBars(const char* label_id, ImVec4 (*getter)(void* data, int idx), // Plots a text label at point x,y. void PlotLabel(const char* text, float x, float y, bool vertical = false, const ImVec2& pixel_offset = ImVec2(0,0)); +//----------------------------------------------------------------------------- +// Plot Queries +//----------------------------------------------------------------------------- + +/// Returns true if the plot area in the current or most recent plot is hovered. +bool IsPlotHovered(); +/// Returns the mouse position in x,y coordinates of the current or most recent plot. +ImVec2 GetPlotMousePos(); +/// Returns the current or most recent plot axis range. +ImPlotRange GetPlotRange(); +/// Returns true if the current or most recent plot is being queried. +bool IsPlotQueried(); +/// Returns the current or most recent plot querey range. +ImPlotRange GetPlotQuery(); + //----------------------------------------------------------------------------- // Plot Styling //----------------------------------------------------------------------------- @@ -223,6 +216,32 @@ void PushPlotStyleVar(ImPlotStyleVar idx, int val); // Undo temporary style modification. void PopPlotStyleVar(int count = 1); +//----------------------------------------------------------------------------- +// Plot Utils +//----------------------------------------------------------------------------- + +/// Set the axes ranges of the next plot. Call right before BeginPlot(). If ImGuiCond_Always is used, the axes will be locked. +void SetNextPlotRange(float x_min, float x_max, float y_min, float y_max, ImGuiCond cond = ImGuiCond_Once); +/// Set the X axis range of the next plot. Call right before BeginPlot(). If ImGuiCond_Always is used, the axis will be locked. +void SetNextPlotRangeX(float x_min, float x_max, ImGuiCond cond = ImGuiCond_Once); +/// Set the X axis range of the next plot. Call right before BeginPlot(). If ImGuiCond_Always is used, the axis will be locked. +void SetNextPlotRangeY(float y_min, float y_max, ImGuiCond cond = ImGuiCond_Once); + +// Get the current Plot position (top-left) in pixels. +ImVec2 GetPlotPos(); +// Get the curent Plot size in pixels. +ImVec2 GetPlotSize(); + +// Convert pixels to a position in the current plot's coordinate system. +ImVec2 PixelsToPlot(const ImVec2& pix); +// Convert a position in the current plot's coordinate system to pixels. +ImVec2 PlotToPixels(const ImVec2& plt); + +// Push clip rect for rendering to current plot area +void PushPlotClipRect(); +// Pop plot clip rect +void PopPlotClipRect(); + //----------------------------------------------------------------------------- // Demo //-----------------------------------------------------------------------------