From 99319d9fa7f0af3347a7dcf434f704f88e7fdecf Mon Sep 17 00:00:00 2001 From: ozlb Date: Tue, 12 May 2020 15:05:14 +0200 Subject: [PATCH 1/7] PlotDigital FitThisFrame issue FitThisFrame is triggering wrong fit for analog signals. It' not necessary due to actual nature of digital plot. --- implot.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/implot.cpp b/implot.cpp index 98cb7e8..de8e2ad 100644 --- a/implot.cpp +++ b/implot.cpp @@ -2563,14 +2563,6 @@ inline void PlotDigitalEx(const char* label_id, Getter getter, int count, int of if (gp.Style.Colors[ImPlotCol_Line].w != -1) item->Color = gp.Style.Colors[ImPlotCol_Line]; - // find data extents - if (gp.FitThisFrame) { - for (int i = 0; i < count; ++i) { - ImVec2 p = getter(i); - FitPoint(p); - } - } - ImGui::PushClipRect(gp.BB_Grid.Min, gp.BB_Grid.Max, true); bool cull = HasFlag(gp.CurrentPlot->Flags, ImPlotFlags_CullData); From e6003e3029fee821eb3a576ee5e3cc5406dae42a Mon Sep 17 00:00:00 2001 From: SergeyN Date: Wed, 13 May 2020 07:32:10 +0200 Subject: [PATCH 2/7] obvious optimization: call getter, transformer and cull test once per point instead of twice --- implot.cpp | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/implot.cpp b/implot.cpp index 98cb7e8..5a6cd8b 100644 --- a/implot.cpp +++ b/implot.cpp @@ -2081,34 +2081,43 @@ inline void RenderLineAA(ImDrawList& DrawList, const ImVec2& p1, const ImVec2& p } template -inline void RenderLines(Transformer transformer, ImDrawList& DrawList, Getter getter, int count, int offset, float line_weight, ImU32 col_line, bool cull) { +inline void RenderLineStrip(Transformer transformer, ImDrawList& DrawList, Getter getter, int count, int offset, float line_weight, ImU32 col_line, bool cull) { // render line segments + offset %= count; + if (offset < 0) offset += count; // shift negative offset to positive range + int i_start = offset + 1; + if (i_start >= count ) i_start -= count; + int i_end = offset + count; + if (i_end >= count) i_end -= count; + const int segments = count - 1; - int i1 = offset; - ImVec2 p1, p2; + ImVec2 p1 = transformer(getter(offset)); + bool test1 = !cull || gp.BB_Grid.Contains(p1); if (HasFlag(gp.CurrentPlot->Flags, ImPlotFlags_AntiAliased)) { - for (int s = 0; s < segments; ++s) { - const int i2 = (i1 + 1) % count; - p1 = transformer(getter(i1)); - p2 = transformer(getter(i2)); - i1 = i2; - if (!cull || gp.BB_Grid.Contains(p1) || gp.BB_Grid.Contains(p2)) + for (int i1 = i_start; i1 != i_end; i1 = i1 + 1 < count ? i1 + 1 : i1 + 1 - count) + { + ImVec2 p2 = transformer(getter(i1)); + bool test2 = !cull || gp.BB_Grid.Contains(p2); + if (test1 | test2) RenderLineAA(DrawList, p1, p2, line_weight, col_line); + p1 = p2; + test1 = test2; } } else { const ImVec2 uv = DrawList._Data->TexUvWhitePixel; DrawList.PrimReserve(segments * 6, segments * 4); int segments_culled = 0; - for (int s = 0; s < segments; ++s) { - const int i2 = (i1 + 1) % count; - p1 = transformer(getter(i1)); - p2 = transformer(getter(i2)); - i1 = i2; - if (!cull || gp.BB_Grid.Contains(p1) || gp.BB_Grid.Contains(p2)) - RenderLine(DrawList, p1, p2, line_weight, col_line, uv); - else - segments_culled++; + for (int i1 = i_start; i1 != i_end; i1 = i1 + 1 < count ? i1 + 1 : i1 + 1 - count) + { + ImVec2 p2 = transformer(getter(i1)); + bool test2 = !cull || gp.BB_Grid.Contains(p2); + if (test1 | test2) + RenderLine(DrawList, p1, p2, line_weight, col_line, uv); + else + segments_culled++; + p1 = p2; + test1 = test2; } if (segments_culled > 0) DrawList.PrimUnreserve(segments_culled * 6, segments_culled * 4); @@ -2204,13 +2213,13 @@ inline void PlotEx(const char* label_id, Getter getter, int count, int offset) PushPlotClipRect(); if (count > 1 && rend_line) { if (HasFlag(plot->XAxis.Flags, ImAxisFlags_LogScale) && HasFlag(plot->YAxis[y_axis].Flags, ImAxisFlags_LogScale)) - RenderLines(Plt2PixLogLog(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); + RenderLineStrip(Plt2PixLogLog(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); else if (HasFlag(plot->XAxis.Flags, ImAxisFlags_LogScale)) - RenderLines(Plt2PixLogLin(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); + RenderLineStrip(Plt2PixLogLin(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); else if (HasFlag(plot->YAxis[y_axis].Flags, ImAxisFlags_LogScale)) - RenderLines(Plt2PixLinLog(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); + RenderLineStrip(Plt2PixLinLog(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); else - RenderLines(Plt2PixLinLin(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); + RenderLineStrip(Plt2PixLinLin(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); } // render markers if (gp.Style.Marker != ImMarker_None) { From 2a7430dae84972fa877682ef04c0aa66eceea6eb Mon Sep 17 00:00:00 2001 From: ozlb Date: Wed, 13 May 2020 11:10:14 +0200 Subject: [PATCH 3/7] FitPoint on x --- implot.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/implot.cpp b/implot.cpp index de8e2ad..8a192c9 100644 --- a/implot.cpp +++ b/implot.cpp @@ -2562,7 +2562,15 @@ inline void PlotDigitalEx(const char* label_id, Getter getter, int count, int of if (gp.Style.Colors[ImPlotCol_Line].w != -1) item->Color = gp.Style.Colors[ImPlotCol_Line]; - + + // find data extents + if (gp.FitThisFrame) { + for (int i = 0; i < count; ++i) { + ImVec2 p = getter(i); + FitPoint(ImVec2(p.x, 0)); + } + } + ImGui::PushClipRect(gp.BB_Grid.Min, gp.BB_Grid.Max, true); bool cull = HasFlag(gp.CurrentPlot->Flags, ImPlotFlags_CullData); From b11fb62f55ee8a815d88f90ed583be155352bead Mon Sep 17 00:00:00 2001 From: Evan Pezent Date: Wed, 13 May 2020 08:43:33 -0500 Subject: [PATCH 4/7] test negative offset, add to demo --- implot_demo.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/implot_demo.cpp b/implot_demo.cpp index 62d3504..45bd878 100644 --- a/implot_demo.cpp +++ b/implot_demo.cpp @@ -706,6 +706,20 @@ void ShowDemoWindow(bool* p_open) { } } //------------------------------------------------------------------------- + if (ImGui::CollapsingHeader("Offset Data")) { + float xs[50], ys[50]; + for (int i = 0; i < 50; ++i) { + xs[i] = 0.5 + 0.4 * cos(i/50.f * 6.28); + ys[i] = 0.5 + 0.4 * sin(i/50.f * 6.28); + } + static int offset = 0; + ImGui::SliderInt("Offset", &offset, -100, 100); + if (ImPlot::BeginPlot("##offset")) { + ImPlot::Plot("circle", xs, ys, 50, offset); + ImPlot::EndPlot(); + } + } + //------------------------------------------------------------------------- if (ImGui::CollapsingHeader("Custom Styles")) { static ImVec4 my_palette[3] = { {0.000f, 0.980f, 0.604f, 1.0f}, From 8e25aec9f56ee1544e8b3bfac330a84e8509a67f Mon Sep 17 00:00:00 2001 From: Evan Pezent Date: Wed, 13 May 2020 09:08:12 -0500 Subject: [PATCH 5/7] prefix all public facing structs and enums with ImPlot --- implot.cpp | 153 ++++++++++++++++++++++++------------------------ implot.h | 62 ++++++++++---------- implot_demo.cpp | 62 ++++++++++---------- 3 files changed, 139 insertions(+), 138 deletions(-) diff --git a/implot.cpp b/implot.cpp index 5a6cd8b..f13de78 100644 --- a/implot.cpp +++ b/implot.cpp @@ -31,6 +31,7 @@ Below is a change-log of API breaking changes only. If you are using one of the When you are not sure about a old symbol or function name, try using the Search/Find function of your IDE to look for comments or references in all implot files. You can read releases logs https://github.com/epezent/implot/releases for more details. +- 2020/05/13 (0.2) - ImMarker was change to ImPlotMarker and ImAxisFlags was changed to ImPlotAxisFlags - 2020/05/11 (0.2) - ImPlotFlags_Selection was changed to ImPlotFlags_BoxSelect - 2020/05/11 (0.2) - The namespace ImGui:: was replaced with ImPlot::. As a result, the following additional changes were made: - Functions that were prefixed or decorated with the word "Plot" have been truncated. E.g., `ImGui::PlotBar` is now just `ImPlot::Bar`. @@ -80,7 +81,7 @@ You can read releases logs https://github.com/epezent/implot/releases for more d ImPlotStyle::ImPlotStyle() { LineWeight = 1; - Marker = ImMarker_None; + Marker = ImPlotMarker_None; MarkerSize = 5; MarkerWeight = 1; ErrorBarSize = 5; @@ -276,13 +277,13 @@ struct ImPlotAxis { Range.Max = 1; Divisions = 3; Subdivisions = 10; - Flags = PreviousFlags = ImAxisFlags_Default; + Flags = PreviousFlags = ImPlotAxisFlags_Default; } bool Dragging; ImPlotRange Range; int Divisions; int Subdivisions; - ImAxisFlags Flags, PreviousFlags; + ImPlotAxisFlags Flags, PreviousFlags; }; /// Holds Plot state information that must persist between frames @@ -426,10 +427,10 @@ inline void UpdateTransformCache() { // get pixels for transforms for (int i = 0; i < MAX_Y_AXES; i++) { - gp.PixelRange[i] = ImRect(HasFlag(gp.CurrentPlot->XAxis.Flags, ImAxisFlags_Invert) ? gp.BB_Grid.Max.x : gp.BB_Grid.Min.x, - HasFlag(gp.CurrentPlot->YAxis[i].Flags, ImAxisFlags_Invert) ? gp.BB_Grid.Min.y : gp.BB_Grid.Max.y, - HasFlag(gp.CurrentPlot->XAxis.Flags, ImAxisFlags_Invert) ? gp.BB_Grid.Min.x : gp.BB_Grid.Max.x, - HasFlag(gp.CurrentPlot->YAxis[i].Flags, ImAxisFlags_Invert) ? gp.BB_Grid.Max.y : gp.BB_Grid.Min.y); + gp.PixelRange[i] = ImRect(HasFlag(gp.CurrentPlot->XAxis.Flags, ImPlotAxisFlags_Invert) ? gp.BB_Grid.Max.x : gp.BB_Grid.Min.x, + HasFlag(gp.CurrentPlot->YAxis[i].Flags, ImPlotAxisFlags_Invert) ? gp.BB_Grid.Min.y : gp.BB_Grid.Max.y, + HasFlag(gp.CurrentPlot->XAxis.Flags, ImPlotAxisFlags_Invert) ? gp.BB_Grid.Min.x : gp.BB_Grid.Max.x, + HasFlag(gp.CurrentPlot->YAxis[i].Flags, ImPlotAxisFlags_Invert) ? gp.BB_Grid.Max.y : gp.BB_Grid.Min.y); gp.My[i] = (gp.PixelRange[i].Max.y - gp.PixelRange[i].Min.y) / gp.CurrentPlot->YAxis[i].Range.Size(); } @@ -446,11 +447,11 @@ inline ImVec2 PixelsToPlot(float x, float y, int y_axis_in = -1) { ImVec2 plt; plt.x = (x - gp.PixelRange[y_axis].Min.x) / gp.Mx + gp.CurrentPlot->XAxis.Range.Min; plt.y = (y - gp.PixelRange[y_axis].Min.y) / gp.My[y_axis] + gp.CurrentPlot->YAxis[y_axis].Range.Min; - if (HasFlag(gp.CurrentPlot->XAxis.Flags, ImAxisFlags_LogScale)) { + if (HasFlag(gp.CurrentPlot->XAxis.Flags, ImPlotAxisFlags_LogScale)) { float t = (plt.x - gp.CurrentPlot->XAxis.Range.Min) / gp.CurrentPlot->XAxis.Range.Size(); plt.x = pow(10.0f, t * gp.LogDenX) * gp.CurrentPlot->XAxis.Range.Min; } - if (HasFlag(gp.CurrentPlot->YAxis[y_axis].Flags, ImAxisFlags_LogScale)) { + if (HasFlag(gp.CurrentPlot->YAxis[y_axis].Flags, ImPlotAxisFlags_LogScale)) { float t = (plt.y - gp.CurrentPlot->YAxis[y_axis].Range.Min) / gp.CurrentPlot->YAxis[y_axis].Range.Size(); plt.y = pow(10.0f, t * gp.LogDenY[y_axis]) * gp.CurrentPlot->YAxis[y_axis].Range.Min; } @@ -461,11 +462,11 @@ inline ImVec2 PlotToPixels(float x, float y, int y_axis_in = -1) { IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "PlotToPixels() Needs to be called between BeginPlot() and EndPlot()!"); const int y_axis = y_axis_in >= 0 ? y_axis_in : gp.CurrentPlot->CurrentYAxis; ImVec2 pix; - if (HasFlag(gp.CurrentPlot->XAxis.Flags, ImAxisFlags_LogScale)) { + if (HasFlag(gp.CurrentPlot->XAxis.Flags, ImPlotAxisFlags_LogScale)) { float t = log10(x / gp.CurrentPlot->XAxis.Range.Min) / gp.LogDenX; x = ImLerp(gp.CurrentPlot->XAxis.Range.Min, gp.CurrentPlot->XAxis.Range.Max, t); } - if (HasFlag(gp.CurrentPlot->YAxis[y_axis].Flags, ImAxisFlags_LogScale)) { + if (HasFlag(gp.CurrentPlot->YAxis[y_axis].Flags, ImPlotAxisFlags_LogScale)) { float t = log10(y / gp.CurrentPlot->YAxis[y_axis].Range.Min) / gp.LogDenY[y_axis]; y = ImLerp(gp.CurrentPlot->YAxis[y_axis].Range.Min, gp.CurrentPlot->YAxis[y_axis].Range.Max, t); } @@ -645,9 +646,9 @@ struct AxisState { range_cond(range_cond_in), present(present_in), present_so_far(previous_present + (present ? 1 : 0)), - flip(HasFlag(axis->Flags, ImAxisFlags_Invert)), - lock_min(HasFlag(axis->Flags, ImAxisFlags_LockMin)), - lock_max(HasFlag(axis->Flags, ImAxisFlags_LockMax)), + flip(HasFlag(axis->Flags, ImPlotAxisFlags_Invert)), + lock_min(HasFlag(axis->Flags, ImPlotAxisFlags_LockMin)), + lock_max(HasFlag(axis->Flags, ImPlotAxisFlags_LockMax)), lock(present && ((lock_min && lock_max) || (has_range && range_cond == ImGuiCond_Always))) {} AxisState() @@ -689,7 +690,7 @@ class YPadCalculator { if (AxisStates[y_axis].present_so_far >= 3) { pad_result += 6.0f; } - if (!HasFlag(plot.YAxis[y_axis].Flags, ImAxisFlags_TickLabels)) { + if (!HasFlag(plot.YAxis[y_axis].Flags, ImPlotAxisFlags_TickLabels)) { return pad_result; } pad_result += MaxLabelWidths[y_axis] + TxtOff; @@ -707,7 +708,7 @@ class YPadCalculator { // BeginPlot() //----------------------------------------------------------------------------- -bool BeginPlot(const char* title, const char* x_label, const char* y_label, const ImVec2& size, ImPlotFlags flags, ImAxisFlags x_flags, ImAxisFlags y_flags, ImAxisFlags y2_flags, ImAxisFlags y3_flags) { +bool BeginPlot(const char* title, const char* x_label, const char* y_label, const ImVec2& size, ImPlotFlags flags, ImPlotAxisFlags x_flags, ImPlotAxisFlags y_flags, ImPlotAxisFlags y2_flags, ImPlotAxisFlags y3_flags) { IM_ASSERT_USER_ERROR(gp.CurrentPlot == NULL, "Mismatched BeginPlot()/EndPlot()!"); @@ -803,14 +804,14 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons plot.YAxis[i].Range.Max = ConstrainNan(ConstrainInf(plot.YAxis[i].Range.Max)); } - if (HasFlag(plot.XAxis.Flags, ImAxisFlags_LogScale)) + if (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_LogScale)) plot.XAxis.Range.Min = ConstrainLog(plot.XAxis.Range.Min); - if (HasFlag(plot.XAxis.Flags, ImAxisFlags_LogScale)) + if (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_LogScale)) plot.XAxis.Range.Max = ConstrainLog(plot.XAxis.Range.Max); for (int i = 0; i < MAX_Y_AXES; i++) { - if (HasFlag(plot.YAxis[i].Flags, ImAxisFlags_LogScale)) + if (HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_LogScale)) plot.YAxis[i].Range.Min = ConstrainLog(plot.YAxis[i].Range.Min); - if (HasFlag(plot.YAxis[i].Flags, ImAxisFlags_LogScale)) + if (HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_LogScale)) plot.YAxis[i].Range.Max = ConstrainLog(plot.YAxis[i].Range.Max); } @@ -822,13 +823,13 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons } // adaptive divisions - if (HasFlag(plot.XAxis.Flags, ImAxisFlags_Adaptive)) { + if (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_Adaptive)) { plot.XAxis.Divisions = (int)IM_ROUND(0.003 * gp.BB_Canvas.GetWidth()); if (plot.XAxis.Divisions < 2) plot.XAxis.Divisions = 2; } for (int i = 0; i < MAX_Y_AXES; i++) { - if (HasFlag(plot.YAxis[i].Flags, ImAxisFlags_Adaptive)) { + if (HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_Adaptive)) { plot.YAxis[i].Divisions = (int)IM_ROUND(0.003 * gp.BB_Canvas.GetHeight()); if (plot.YAxis[i].Divisions < 2) plot.YAxis[i].Divisions = 2; @@ -872,34 +873,34 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons // canvas bb gp.BB_Canvas = ImRect(gp.BB_Frame.Min + Style.WindowPadding, gp.BB_Frame.Max - Style.WindowPadding); - gp.RenderX = (HasFlag(plot.XAxis.Flags, ImAxisFlags_GridLines) || - HasFlag(plot.XAxis.Flags, ImAxisFlags_TickMarks) || - HasFlag(plot.XAxis.Flags, ImAxisFlags_TickLabels)) && plot.XAxis.Divisions > 1; + gp.RenderX = (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_GridLines) || + HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_TickMarks) || + HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_TickLabels)) && plot.XAxis.Divisions > 1; for (int i = 0; i < MAX_Y_AXES; i++) { gp.RenderY[i] = y[i].present && - (HasFlag(plot.YAxis[i].Flags, ImAxisFlags_GridLines) || - HasFlag(plot.YAxis[i].Flags, ImAxisFlags_TickMarks) || - HasFlag(plot.YAxis[i].Flags, ImAxisFlags_TickLabels)) && plot.YAxis[i].Divisions > 1; + (HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_GridLines) || + HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_TickMarks) || + HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_TickLabels)) && plot.YAxis[i].Divisions > 1; } // get ticks if (gp.RenderX) - GetTicks(plot.XAxis.Range, plot.XAxis.Divisions, plot.XAxis.Subdivisions, HasFlag(plot.XAxis.Flags, ImAxisFlags_LogScale), gp.XTicks); + GetTicks(plot.XAxis.Range, plot.XAxis.Divisions, plot.XAxis.Subdivisions, HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_LogScale), gp.XTicks); for (int i = 0; i < MAX_Y_AXES; i++) { if (gp.RenderY[i]) { - GetTicks(plot.YAxis[i].Range, plot.YAxis[i].Divisions, plot.YAxis[i].Subdivisions, HasFlag(plot.YAxis[i].Flags, ImAxisFlags_LogScale), gp.YTicks[i]); + GetTicks(plot.YAxis[i].Range, plot.YAxis[i].Divisions, plot.YAxis[i].Subdivisions, HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_LogScale), gp.YTicks[i]); } } // label ticks - if (HasFlag(plot.XAxis.Flags, ImAxisFlags_TickLabels)) - LabelTicks(gp.XTicks, HasFlag(plot.XAxis.Flags, ImAxisFlags_Scientific), gp.XTickLabels); + if (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_TickLabels)) + LabelTicks(gp.XTicks, HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_Scientific), gp.XTickLabels); float max_label_width[MAX_Y_AXES] = {}; for (int i = 0; i < MAX_Y_AXES; i++) { - if (y[i].present && HasFlag(plot.YAxis[i].Flags, ImAxisFlags_TickLabels)) { - LabelTicks(gp.YTicks[i], HasFlag(plot.YAxis[i].Flags, ImAxisFlags_Scientific), gp.YTickLabels[i]); + if (y[i].present && HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_TickLabels)) { + LabelTicks(gp.YTicks[i], HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_Scientific), gp.YTickLabels[i]); for (ImTick &yt : gp.YTicks[i]) { max_label_width[i] = yt.Size.x > max_label_width[i] ? yt.Size.x : max_label_width[i]; } @@ -911,7 +912,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons const float txt_off = 5; const float txt_height = ImGui::GetTextLineHeight(); const float pad_top = title_size.x > 0.0f ? txt_height + txt_off : 0; - const float pad_bot = (HasFlag(plot.XAxis.Flags, ImAxisFlags_TickLabels) ? txt_height + txt_off : 0) + (x_label ? txt_height + txt_off : 0); + const float pad_bot = (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_TickLabels) ? txt_height + txt_off : 0) + (x_label ? txt_height + txt_off : 0); YPadCalculator y_axis_pad(y, max_label_width, txt_off); const float pad_left = y_axis_pad(0) + (y_label ? txt_height + txt_off : 0); const float pad_right = y_axis_pad(1) + y_axis_pad(2); @@ -1219,13 +1220,13 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons } // render grid - if (HasFlag(plot.XAxis.Flags, ImAxisFlags_GridLines)) { + if (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_GridLines)) { for (ImTick &xt : gp.XTicks) DrawList.AddLine({xt.PixelPos, gp.BB_Grid.Min.y}, {xt.PixelPos, gp.BB_Grid.Max.y}, xt.Major ? gp.Col_X.Major : gp.Col_X.Minor, 1); } for (int i = 0; i < MAX_Y_AXES; i++) { - if (y[i].present && HasFlag(plot.YAxis[i].Flags, ImAxisFlags_GridLines)) { + if (y[i].present && HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_GridLines)) { for (ImTick &yt : gp.YTicks[i]) DrawList.AddLine({gp.BB_Grid.Min.x, yt.PixelPos}, {gp.BB_Grid.Max.x, yt.PixelPos}, yt.Major ? gp.Col_Y[i].Major : gp.Col_Y[i].Minor, 1); } @@ -1239,7 +1240,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons } // render labels - if (HasFlag(plot.XAxis.Flags, ImAxisFlags_TickLabels)) { + if (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_TickLabels)) { ImGui::PushClipRect(gp.BB_Frame.Min, gp.BB_Frame.Max, true); for (ImTick &xt : gp.XTicks) { if (xt.RenderLabel && xt.PixelPos >= gp.BB_Grid.Min.x - 1 && xt.PixelPos <= gp.BB_Grid.Max.x + 1) @@ -1255,7 +1256,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons } ImGui::PushClipRect(gp.BB_Frame.Min, gp.BB_Frame.Max, true); for (int i = 0; i < MAX_Y_AXES; i++) { - if (y[i].present && HasFlag(plot.YAxis[i].Flags, ImAxisFlags_TickLabels)) { + if (y[i].present && HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_TickLabels)) { const float x_start = gp.AxisLabelReference[i] + ((i == 0) ? @@ -1303,15 +1304,15 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons inline void AxisMenu(ImPlotAxis& Axis) { ImGui::PushItemWidth(75); - bool lock_min = HasFlag(Axis.Flags, ImAxisFlags_LockMin); - bool lock_max = HasFlag(Axis.Flags, ImAxisFlags_LockMax); - bool invert = HasFlag(Axis.Flags, ImAxisFlags_Invert); - bool logscale = HasFlag(Axis.Flags, ImAxisFlags_LogScale); - bool grid = HasFlag(Axis.Flags, ImAxisFlags_GridLines); - bool ticks = HasFlag(Axis.Flags, ImAxisFlags_TickMarks); - bool labels = HasFlag(Axis.Flags, ImAxisFlags_TickLabels); + bool lock_min = HasFlag(Axis.Flags, ImPlotAxisFlags_LockMin); + bool lock_max = HasFlag(Axis.Flags, ImPlotAxisFlags_LockMax); + bool invert = HasFlag(Axis.Flags, ImPlotAxisFlags_Invert); + bool logscale = HasFlag(Axis.Flags, ImPlotAxisFlags_LogScale); + bool grid = HasFlag(Axis.Flags, ImPlotAxisFlags_GridLines); + bool ticks = HasFlag(Axis.Flags, ImPlotAxisFlags_TickMarks); + bool labels = HasFlag(Axis.Flags, ImPlotAxisFlags_TickLabels); if (ImGui::Checkbox("##LockMin", &lock_min)) - FlipFlag(Axis.Flags, ImAxisFlags_LockMin); + FlipFlag(Axis.Flags, ImPlotAxisFlags_LockMin); ImGui::SameLine(); if (lock_min) { ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true); @@ -1323,7 +1324,7 @@ inline void AxisMenu(ImPlotAxis& Axis) { ImGui::PopStyleVar(); } if (ImGui::Checkbox("##LockMax", &lock_max)) - FlipFlag(Axis.Flags, ImAxisFlags_LockMax); + FlipFlag(Axis.Flags, ImPlotAxisFlags_LockMax); ImGui::SameLine(); if (lock_max) { ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true); @@ -1335,16 +1336,16 @@ inline void AxisMenu(ImPlotAxis& Axis) { } ImGui::Separator(); if (ImGui::Checkbox("Invert", &invert)) - FlipFlag(Axis.Flags, ImAxisFlags_Invert); + FlipFlag(Axis.Flags, ImPlotAxisFlags_Invert); if (ImGui::Checkbox("Log Scale", &logscale)) - FlipFlag(Axis.Flags, ImAxisFlags_LogScale); + FlipFlag(Axis.Flags, ImPlotAxisFlags_LogScale); ImGui::Separator(); if (ImGui::Checkbox("Grid Lines", &grid)) - FlipFlag(Axis.Flags, ImAxisFlags_GridLines); + FlipFlag(Axis.Flags, ImPlotAxisFlags_GridLines); if (ImGui::Checkbox("Tick Marks", &ticks)) - FlipFlag(Axis.Flags, ImAxisFlags_TickMarks); + FlipFlag(Axis.Flags, ImPlotAxisFlags_TickMarks); if (ImGui::Checkbox("Labels", &labels)) - FlipFlag(Axis.Flags, ImAxisFlags_TickLabels); + FlipFlag(Axis.Flags, ImPlotAxisFlags_TickLabels); } void PlotContextMenu(ImPlotState& plot) { @@ -1469,7 +1470,7 @@ void EndPlot() { // render ticks PushPlotClipRect(); - if (HasFlag(plot.XAxis.Flags, ImAxisFlags_TickMarks)) { + if (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_TickMarks)) { for (ImTick &xt : gp.XTicks) DrawList.AddLine({xt.PixelPos, gp.BB_Grid.Max.y},{xt.PixelPos, gp.BB_Grid.Max.y - (xt.Major ? 10.0f : 5.0f)}, gp.Col_Border, 1); } @@ -1481,7 +1482,7 @@ void EndPlot() { if (!y[i].present) { continue; } axis_count++; - if (!HasFlag(plot.YAxis[i].Flags, ImAxisFlags_TickMarks)) { continue; } + if (!HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_TickMarks)) { continue; } float x_start = gp.AxisLabelReference[i]; float direction = (i == 0) ? 1.0f : -1.0f; @@ -1649,17 +1650,17 @@ void EndPlot() { // FIT DATA -------------------------------------------------------------- if (gp.FitThisFrame && (gp.VisibleItemCount > 0 || plot.Queried)) { - if (gp.FitX && !HasFlag(plot.XAxis.Flags, ImAxisFlags_LockMin) && !NanOrInf(gp.ExtentsX.Min)) { + if (gp.FitX && !HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_LockMin) && !NanOrInf(gp.ExtentsX.Min)) { plot.XAxis.Range.Min = gp.ExtentsX.Min; } - if (gp.FitX && !HasFlag(plot.XAxis.Flags, ImAxisFlags_LockMax) && !NanOrInf(gp.ExtentsX.Max)) { + if (gp.FitX && !HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_LockMax) && !NanOrInf(gp.ExtentsX.Max)) { plot.XAxis.Range.Max = gp.ExtentsX.Max; } for (int i = 0; i < MAX_Y_AXES; i++) { - if (gp.FitY[i] && !HasFlag(plot.YAxis[i].Flags, ImAxisFlags_LockMin) && !NanOrInf(gp.ExtentsY[i].Min)) { + if (gp.FitY[i] && !HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_LockMin) && !NanOrInf(gp.ExtentsY[i].Min)) { plot.YAxis[i].Range.Min = gp.ExtentsY[i].Min; } - if (gp.FitY[i] && !HasFlag(plot.YAxis[i].Flags, ImAxisFlags_LockMax) && !NanOrInf(gp.ExtentsY[i].Max)) { + if (gp.FitY[i] && !HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_LockMax) && !NanOrInf(gp.ExtentsY[i].Max)) { plot.YAxis[i].Range.Max = gp.ExtentsY[i].Max; } } @@ -2018,25 +2019,25 @@ int idx = offset; idx = (idx + 1) % count; if (!cull || gp.BB_Grid.Contains(c)) { // TODO: Optimize the loop and if statements, this is atrocious - if (HasFlag(gp.Style.Marker, ImMarker_Circle)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Circle)) MarkerCircle(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImMarker_Square)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Square)) MarkerSquare(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImMarker_Diamond)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Diamond)) MarkerDiamond(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImMarker_Up)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Up)) MarkerUp(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImMarker_Down)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Down)) MarkerDown(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImMarker_Left)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Left)) MarkerLeft(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImMarker_Right)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Right)) MarkerRight(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImMarker_Cross)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Cross)) MarkerCross(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImMarker_Plus)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Plus)) MarkerPlus(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImMarker_Asterisk)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Asterisk)) MarkerAsterisk(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); } } @@ -2212,22 +2213,22 @@ inline void PlotEx(const char* label_id, Getter getter, int count, int offset) } PushPlotClipRect(); if (count > 1 && rend_line) { - if (HasFlag(plot->XAxis.Flags, ImAxisFlags_LogScale) && HasFlag(plot->YAxis[y_axis].Flags, ImAxisFlags_LogScale)) + if (HasFlag(plot->XAxis.Flags, ImPlotAxisFlags_LogScale) && HasFlag(plot->YAxis[y_axis].Flags, ImPlotAxisFlags_LogScale)) RenderLineStrip(Plt2PixLogLog(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); - else if (HasFlag(plot->XAxis.Flags, ImAxisFlags_LogScale)) + else if (HasFlag(plot->XAxis.Flags, ImPlotAxisFlags_LogScale)) RenderLineStrip(Plt2PixLogLin(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); - else if (HasFlag(plot->YAxis[y_axis].Flags, ImAxisFlags_LogScale)) + else if (HasFlag(plot->YAxis[y_axis].Flags, ImPlotAxisFlags_LogScale)) RenderLineStrip(Plt2PixLinLog(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); else RenderLineStrip(Plt2PixLinLin(y_axis), DrawList, getter, count, offset, line_weight, col_line, cull); } // render markers - if (gp.Style.Marker != ImMarker_None) { - if (HasFlag(plot->XAxis.Flags, ImAxisFlags_LogScale) && HasFlag(plot->YAxis[y_axis].Flags, ImAxisFlags_LogScale)) + if (gp.Style.Marker != ImPlotMarker_None) { + if (HasFlag(plot->XAxis.Flags, ImPlotAxisFlags_LogScale) && HasFlag(plot->YAxis[y_axis].Flags, ImPlotAxisFlags_LogScale)) RenderMarkers(Plt2PixLogLog(y_axis), DrawList, getter, count, offset, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, cull); - else if (HasFlag(plot->XAxis.Flags, ImAxisFlags_LogScale)) + else if (HasFlag(plot->XAxis.Flags, ImPlotAxisFlags_LogScale)) RenderMarkers(Plt2PixLogLin(y_axis), DrawList, getter, count, offset, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, cull); - else if (HasFlag(plot->YAxis[y_axis].Flags, ImAxisFlags_LogScale)) + else if (HasFlag(plot->YAxis[y_axis].Flags, ImPlotAxisFlags_LogScale)) RenderMarkers(Plt2PixLinLog(y_axis), DrawList, getter, count, offset, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, cull); else RenderMarkers(Plt2PixLinLin(y_axis), DrawList, getter, count, offset, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, cull); diff --git a/implot.h b/implot.h index d6c1121..6ad31f7 100644 --- a/implot.h +++ b/implot.h @@ -30,10 +30,10 @@ //----------------------------------------------------------------------------- typedef int ImPlotFlags; -typedef int ImAxisFlags; +typedef int ImPlotAxisFlags; typedef int ImPlotCol; typedef int ImPlotStyleVar; -typedef int ImMarker; +typedef int ImPlotMarker; // Options for plots enum ImPlotFlags_ { @@ -53,18 +53,18 @@ enum ImPlotFlags_ { }; // Options for plot axes (X and Y) -enum ImAxisFlags_ { - ImAxisFlags_GridLines = 1 << 0, // grid lines will be displayed - ImAxisFlags_TickMarks = 1 << 1, // tick marks will be displayed for each grid line - ImAxisFlags_TickLabels = 1 << 2, // text labels will be displayed for each grid line - ImAxisFlags_Invert = 1 << 3, // the axis will be inverted - ImAxisFlags_LockMin = 1 << 4, // the axis minimum value will be locked when panning/zooming - ImAxisFlags_LockMax = 1 << 5, // the axis maximum value will be locked when panning/zooming - ImAxisFlags_Adaptive = 1 << 6, // grid divisions will adapt to the current pixel size the axis - ImAxisFlags_LogScale = 1 << 7, // a logartithmic (base 10) axis scale will be used - ImAxisFlags_Scientific = 1 << 8, // scientific notation will be used for tick labels if displayed (WIP, not very good yet) - ImAxisFlags_Default = ImAxisFlags_GridLines | ImAxisFlags_TickMarks | ImAxisFlags_TickLabels | ImAxisFlags_Adaptive, - ImAxisFlags_Auxiliary = ImAxisFlags_Default & ~ImAxisFlags_GridLines, +enum ImPlotAxisFlags_ { + ImPlotAxisFlags_GridLines = 1 << 0, // grid lines will be displayed + ImPlotAxisFlags_TickMarks = 1 << 1, // tick marks will be displayed for each grid line + ImPlotAxisFlags_TickLabels = 1 << 2, // text labels will be displayed for each grid line + ImPlotAxisFlags_Invert = 1 << 3, // the axis will be inverted + ImPlotAxisFlags_LockMin = 1 << 4, // the axis minimum value will be locked when panning/zooming + ImPlotAxisFlags_LockMax = 1 << 5, // the axis maximum value will be locked when panning/zooming + ImPlotAxisFlags_Adaptive = 1 << 6, // grid divisions will adapt to the current pixel size the axis + ImPlotAxisFlags_LogScale = 1 << 7, // a logartithmic (base 10) axis scale will be used + ImPlotAxisFlags_Scientific = 1 << 8, // scientific notation will be used for tick labels if displayed (WIP, not very good yet) + ImPlotAxisFlags_Default = ImPlotAxisFlags_GridLines | ImPlotAxisFlags_TickMarks | ImPlotAxisFlags_TickLabels | ImPlotAxisFlags_Adaptive, + ImPlotAxisFlags_Auxiliary = ImPlotAxisFlags_Default & ~ImPlotAxisFlags_GridLines, }; // Plot styling colors @@ -100,18 +100,18 @@ enum ImPlotStyleVar_ { }; // Marker specification -enum ImMarker_ { - ImMarker_None = 1 << 0, // no marker - ImMarker_Circle = 1 << 1, // a circle marker will be rendered at each point - ImMarker_Square = 1 << 2, // a square maker will be rendered at each point - ImMarker_Diamond = 1 << 3, // a diamond marker will be rendered at each point - ImMarker_Up = 1 << 4, // an upward-pointing triangle marker will up rendered at each point - ImMarker_Down = 1 << 5, // an downward-pointing triangle marker will up rendered at each point - ImMarker_Left = 1 << 6, // an leftward-pointing triangle marker will up rendered at each point - ImMarker_Right = 1 << 7, // an rightward-pointing triangle marker will up rendered at each point - ImMarker_Cross = 1 << 8, // a cross marker will be rendered at each point (not filled) - ImMarker_Plus = 1 << 9, // a plus marker will be rendered at each point (not filled) - ImMarker_Asterisk = 1 << 10, // a asterisk marker will be rendered at each point (not filled) +enum ImPlotMarker_ { + ImPlotMarker_None = 1 << 0, // no marker + ImPlotMarker_Circle = 1 << 1, // a circle marker will be rendered at each point + ImPlotMarker_Square = 1 << 2, // a square maker will be rendered at each point + ImPlotMarker_Diamond = 1 << 3, // a diamond marker will be rendered at each point + ImPlotMarker_Up = 1 << 4, // an upward-pointing triangle marker will up rendered at each point + ImPlotMarker_Down = 1 << 5, // an downward-pointing triangle marker will up rendered at each point + ImPlotMarker_Left = 1 << 6, // an leftward-pointing triangle marker will up rendered at each point + ImPlotMarker_Right = 1 << 7, // an rightward-pointing triangle marker will up rendered at each point + ImPlotMarker_Cross = 1 << 8, // a cross marker will be rendered at each point (not filled) + ImPlotMarker_Plus = 1 << 9, // a plus marker will be rendered at each point (not filled) + ImPlotMarker_Asterisk = 1 << 10, // a asterisk marker will be rendered at each point (not filled) }; // A range defined by a min/max value. Used for plot axes ranges. @@ -133,7 +133,7 @@ struct ImPlotLimits { // Plot style structure struct ImPlotStyle { float LineWeight; // = 1, line weight in pixels - ImMarker Marker; // = ImMarker_None, marker specification + ImPlotMarker Marker; // = ImPlotMarker_None, marker specification float MarkerSize; // = 5, marker size in pixels (roughly the marker's "radius") float MarkerWeight; // = 1, outline weight of markers in pixels float ErrorBarSize; // = 5, error bar whisker width in pixels @@ -160,10 +160,10 @@ bool BeginPlot(const char* title_id, const char* y_label = NULL, const ImVec2& size = ImVec2(-1,-1), ImPlotFlags flags = ImPlotFlags_Default, - ImAxisFlags x_flags = ImAxisFlags_Default, - ImAxisFlags y_flags = ImAxisFlags_Default, - ImAxisFlags y2_flags = ImAxisFlags_Auxiliary, - ImAxisFlags y3_flags = ImAxisFlags_Auxiliary); + ImPlotAxisFlags x_flags = ImPlotAxisFlags_Default, + ImPlotAxisFlags y_flags = ImPlotAxisFlags_Default, + ImPlotAxisFlags y2_flags = ImPlotAxisFlags_Auxiliary, + ImPlotAxisFlags y3_flags = ImPlotAxisFlags_Auxiliary); // Only call EndPlot() if BeginPlot() returns true! Typically called at the end // of an if statement conditioned on BeginPlot(). void EndPlot(); diff --git a/implot_demo.cpp b/implot_demo.cpp index 45bd878..e172ebf 100644 --- a/implot_demo.cpp +++ b/implot_demo.cpp @@ -149,7 +149,7 @@ void ShowDemoWindow(bool* p_open) { } if (ImPlot::BeginPlot("Line Plot", "x", "f(x)", {-1,300})) { ImPlot::Plot("sin(50*x)", xs1, ys1, 1001); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Circle); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle); ImPlot::Plot("x^2", xs2, ys2, 11); ImPlot::PopStyleVar(); ImPlot::EndPlot(); @@ -170,11 +170,11 @@ void ShowDemoWindow(bool* p_open) { } if (ImPlot::BeginPlot("Scatter Plot", NULL, NULL, {-1,300})) { ImPlot::PushStyleVar(ImPlotStyleVar_LineWeight, 0); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Cross); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Cross); ImPlot::PushStyleVar(ImPlotStyleVar_MarkerSize, 3); ImPlot::Plot("Data 1", xs1, ys1, 100); ImPlot::PopStyleVar(2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Circle); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle); ImPlot::PushStyleColor(ImPlotCol_MarkerFill, ImVec4{1,0,0,0.25f}); ImPlot::Plot("Data 2", xs2, ys2, 50); ImPlot::PopStyleColor(); @@ -220,7 +220,7 @@ void ShowDemoWindow(bool* p_open) { ImPlot::Bar("Bar", xs, bar, 5, 0.5f); ImPlot::ErrorBars("Bar", xs, bar, err1, 5); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Circle); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle); ImPlot::PushStyleVar(ImPlotStyleVar_MarkerSize, 3); ImPlot::PushStyleColor(ImPlotCol_ErrorBar, ImVec4(1,0,0,1)); ImPlot::ErrorBars("Line", xs, lin, err1, err2, 5); @@ -279,7 +279,7 @@ void ShowDemoWindow(bool* p_open) { rdata2.AddPoint(t, mouse.y * 0.0005f); } ImPlot::SetNextPlotLimitsX(t - 10, t, paused ? ImGuiCond_Once : ImGuiCond_Always); - static int rt_axis = ImAxisFlags_Default & ~ImAxisFlags_TickLabels; + static int rt_axis = ImPlotAxisFlags_Default & ~ImPlotAxisFlags_TickLabels; if (ImPlot::BeginPlot("##Scrolling", NULL, NULL, {-1,150}, ImPlotFlags_Default, rt_axis, rt_axis)) { ImPlot::Plot("Data 1", &sdata1.Data[0].x, &sdata1.Data[0].y, sdata1.Data.size(), sdata1.Offset, 2 * sizeof(float)); ImPlot::Plot("Data 2", &sdata2.Data[0].x, &sdata2.Data[0].y, sdata2.Data.size(), sdata2.Offset, 2 * sizeof(float)); @@ -299,50 +299,50 @@ void ShowDemoWindow(bool* p_open) { float xs[2] = {1,4}; float ys[2] = {10,11}; // filled - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Circle); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle); ImPlot::Plot("Circle##Fill", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Square); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Square); ys[0]--; ys[1]--; ImPlot::Plot("Square##Fill", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Diamond); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Diamond); ys[0]--; ys[1]--; ImPlot::Plot("Diamond##Fill", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Up); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Up); ys[0]--; ys[1]--; ImPlot::Plot("Up##Fill", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Down); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Down); ys[0]--; ys[1]--; ImPlot::Plot("Down##Fill", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Left); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Left); ys[0]--; ys[1]--; ImPlot::Plot("Left##Fill", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Right); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Right); ys[0]--; ys[1]--; ImPlot::Plot("Right##Fill", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Cross); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Cross); ys[0]--; ys[1]--; ImPlot::Plot("Cross##Fill", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Plus); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Plus); ys[0]--; ys[1]--; ImPlot::Plot("Plus##Fill", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Asterisk); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Asterisk); ys[0]--; ys[1]--; ImPlot::Plot("Asterisk##Fill", xs, ys, 2); ImPlot::PopStyleVar(10); xs[0] = 6; xs[1] = 9; ys[0] = 10; ys[1] = 11; ImPlot::PushStyleColor(ImPlotCol_MarkerFill, ImVec4(0,0,0,0)); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Circle); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle); ImPlot::Plot("Circle", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Square); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Square); ys[0]--; ys[1]--; ImPlot::Plot("Square", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Diamond); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Diamond); ys[0]--; ys[1]--; ImPlot::Plot("Diamond", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Up); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Up); ys[0]--; ys[1]--; ImPlot::Plot("Up", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Down); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Down); ys[0]--; ys[1]--; ImPlot::Plot("Down", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Left); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Left); ys[0]--; ys[1]--; ImPlot::Plot("Left", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Right); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Right); ys[0]--; ys[1]--; ImPlot::Plot("Right", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Cross); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Cross); ys[0]--; ys[1]--; ImPlot::Plot("Cross", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Plus); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Plus); ys[0]--; ys[1]--; ImPlot::Plot("Plus", xs, ys, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Asterisk); ys[0]--; ys[1]--; + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Asterisk); ys[0]--; ys[1]--; ImPlot::Plot("Asterisk", xs, ys, 2); ImPlot::PopStyleColor(); ImPlot::PopStyleVar(10); @@ -353,7 +353,7 @@ void ShowDemoWindow(bool* p_open) { ImPlot::PushStyleVar(ImPlotStyleVar_LineWeight, 2); ImPlot::PushStyleVar(ImPlotStyleVar_MarkerSize, 8); ImPlot::PushStyleVar(ImPlotStyleVar_MarkerWeight, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Circle | ImMarker_Cross); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle | ImPlotMarker_Cross); ImPlot::PushStyleColor(ImPlotCol_MarkerOutline, ImVec4(0,0,0,1)); ImPlot::PushStyleColor(ImPlotCol_MarkerFill, ImVec4(1,1,1,1)); ImPlot::PushStyleColor(ImPlotCol_Line, ImVec4(0,0,0,1)); @@ -379,7 +379,7 @@ void ShowDemoWindow(bool* p_open) { ys3[i] = pow(10.0f, xs[i]); } ImPlot::SetNextPlotLimits(0.1f, 100, 0, 10); - if (ImPlot::BeginPlot("Log Plot", NULL, NULL, ImVec2(-1,300), ImPlotFlags_Default, ImAxisFlags_Default | ImAxisFlags_LogScale )) { + if (ImPlot::BeginPlot("Log Plot", NULL, NULL, ImVec2(-1,300), ImPlotFlags_Default, ImPlotAxisFlags_Default | ImPlotAxisFlags_LogScale )) { ImPlot::Plot("f(x) = x", xs, xs, 1001); ImPlot::Plot("f(x) = sin(x)+1", xs, ys1, 1001); ImPlot::Plot("f(x) = log(x)", xs, ys2, 1001); @@ -453,11 +453,11 @@ void ShowDemoWindow(bool* p_open) { ImGui::Unindent(); static ImVector data; ImPlotLimits range, query; - if (ImPlot::BeginPlot("##Drawing", NULL, NULL, ImVec2(-1,300), ImPlotFlags_Default | ImPlotFlags_Query, ImAxisFlags_GridLines, ImAxisFlags_GridLines)) { + if (ImPlot::BeginPlot("##Drawing", NULL, NULL, ImVec2(-1,300), ImPlotFlags_Default | ImPlotFlags_Query, ImPlotAxisFlags_GridLines, ImPlotAxisFlags_GridLines)) { if (ImPlot::IsPlotHovered() && ImGui::IsMouseClicked(0) && ImGui::GetIO().KeyCtrl) data.push_back(ImPlot::GetPlotMousePos()); ImPlot::PushStyleVar(ImPlotStyleVar_LineWeight, 0); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Diamond); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Diamond); if (data.size() > 0) ImPlot::Plot("Points", &data[0].x, &data[0].y, data.size(), 0, 2 * sizeof(float)); if (ImPlot::IsPlotQueried() && data.size() > 0) { @@ -504,7 +504,7 @@ void ShowDemoWindow(bool* p_open) { } ImGui::BulletText("Query the first plot to render a subview in the second plot (see above for controls)."); ImPlot::SetNextPlotLimits(0,0.01f,-1,1); - ImAxisFlags flgs = ImAxisFlags_Default & ~ImAxisFlags_TickLabels; + ImPlotAxisFlags flgs = ImPlotAxisFlags_Default & ~ImPlotAxisFlags_TickLabels; ImPlotLimits query; if (ImPlot::BeginPlot("##View1",NULL,NULL,ImVec2(-1,150), ImPlotFlags_Default | ImPlotFlags_Query, flgs, flgs)) { ImPlot::Plot("Signal 1", x_data, y_data1, 512); @@ -741,7 +741,7 @@ void ShowDemoWindow(bool* p_open) { ImPlot::Bar("Bar", bar, 10, 0.5f); ImPlot::Plot("Line", lin, 10); ImPlot::PushStyleVar(ImPlotStyleVar_LineWeight, 0); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImMarker_Square); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Square); ImPlot::Plot("Dot", dot, 10); ImPlot::PopStyleVar(2); ImPlot::EndPlot(); From a0c9dc120ca62d962fa8b97c24ed16258d67db41 Mon Sep 17 00:00:00 2001 From: Evan Pezent Date: Wed, 13 May 2020 09:11:25 -0500 Subject: [PATCH 6/7] trim trailing whitespace --- implot.cpp | 176 ++++++++++++++++++++++++------------------------ implot.h | 20 +++--- implot_demo.cpp | 74 ++++++++++---------- 3 files changed, 135 insertions(+), 135 deletions(-) diff --git a/implot.cpp b/implot.cpp index f13de78..eaea588 100644 --- a/implot.cpp +++ b/implot.cpp @@ -34,14 +34,14 @@ You can read releases logs https://github.com/epezent/implot/releases for more d - 2020/05/13 (0.2) - ImMarker was change to ImPlotMarker and ImAxisFlags was changed to ImPlotAxisFlags - 2020/05/11 (0.2) - ImPlotFlags_Selection was changed to ImPlotFlags_BoxSelect - 2020/05/11 (0.2) - The namespace ImGui:: was replaced with ImPlot::. As a result, the following additional changes were made: - - Functions that were prefixed or decorated with the word "Plot" have been truncated. E.g., `ImGui::PlotBar` is now just `ImPlot::Bar`. + - Functions that were prefixed or decorated with the word "Plot" have been truncated. E.g., `ImGui::PlotBar` is now just `ImPlot::Bar`. It should be fairly obvious what was what. - - Some functions have been given names that would have otherwise collided with the ImGui namespace. This has been done to maintain a consistent - style with ImGui. E.g., 'ImGui::PushPlotStyleVar` is now 'ImPlot::PushStyleVar'. + - Some functions have been given names that would have otherwise collided with the ImGui namespace. This has been done to maintain a consistent + style with ImGui. E.g., 'ImGui::PushPlotStyleVar` is now 'ImPlot::PushStyleVar'. - 2020/05/10 (0.2) - The following function/struct names were changes: - ImPlotRange -> ImPlotLimits - GetPlotRange() -> GetPlotLimits() - - SetNextPlotRange -> SetNextPlotLimits + - SetNextPlotRange -> SetNextPlotLimits - SetNextPlotRangeX -> SetNextPlotLimitsX - SetNextPlotRangeY -> SetNextPlotLimitsY - 2020/05/10 (0.2) - Plot queries are pixel based by default. Query rects that maintain relative plot position have been removed. This was done to support multi-y-axis. @@ -139,7 +139,7 @@ inline bool HasFlag(TSet set, TFlag flag) { } /// Flips a flag in a flagset -template +template inline void FlipFlag(TSet& set, TFlag flag) { HasFlag(set, flag) ? set &= ~flag : set |= flag; } @@ -240,7 +240,7 @@ ImVec4 NextColor(); /// Tick mark info struct ImTick { - ImTick(double value, bool major, bool render_label = true) { + ImTick(double value, bool major, bool render_label = true) { PlotPos = value; Major = major; RenderLabel = render_label; @@ -255,11 +255,11 @@ struct ImTick { struct ImPlotItem { ImPlotItem() { - Show = true; + Show = true; Highlight = false; - Color = NextColor(); - NameOffset = -1; - ID = 0; + Color = NextColor(); + NameOffset = -1; + ID = 0; } ~ImPlotItem() { ID = 0; } bool Show; @@ -271,13 +271,13 @@ struct ImPlotItem { /// Plot axis structure. You shouldn't need to construct this! struct ImPlotAxis { - ImPlotAxis() { + ImPlotAxis() { Dragging = false; Range.Min = 0; Range.Max = 1; - Divisions = 3; - Subdivisions = 10; - Flags = PreviousFlags = ImPlotAxisFlags_Default; + Divisions = 3; + Subdivisions = 10; + Flags = PreviousFlags = ImPlotAxisFlags_Default; } bool Dragging; ImPlotRange Range; @@ -332,14 +332,14 @@ struct ImPlotContext { RestorePalette(); } - /// ALl Plots + /// ALl Plots ImPool Plots; /// Current Plot ImPlotState* CurrentPlot; // Legend - ImVector LegendIndices; + ImVector LegendIndices; ImGuiTextBuffer LegendLabels; - // Bounding regions + // Bounding regions ImRect BB_Frame; ImRect BB_Canvas; ImRect BB_Grid; @@ -347,8 +347,8 @@ struct ImPlotContext { bool Hov_Frame; bool Hov_Grid; // Cached Colors - ImU32 Col_Frame, Col_Bg, Col_Border, - Col_Txt, Col_TxtDis, + ImU32 Col_Frame, Col_Bg, Col_Border, + Col_Txt, Col_TxtDis, Col_SlctBg, Col_SlctBd, Col_QryBg, Col_QryBd; struct AxisColor { @@ -386,7 +386,7 @@ struct ImPlotContext { ImPlotStyle Style; ImVector ColorModifiers; // Stack for PushStyleColor()/PopStyleColor() ImVector StyleModifiers; // Stack for PushStyleVar()/PopStyleVar() - ImNextPlotData NextPlotData; + ImNextPlotData NextPlotData; // Digital plot item count int DigitalPlotItemCnt; int DigitalPlotOffset; @@ -465,7 +465,7 @@ inline ImVec2 PlotToPixels(float x, float y, int y_axis_in = -1) { if (HasFlag(gp.CurrentPlot->XAxis.Flags, ImPlotAxisFlags_LogScale)) { float t = log10(x / gp.CurrentPlot->XAxis.Range.Min) / gp.LogDenX; x = ImLerp(gp.CurrentPlot->XAxis.Range.Min, gp.CurrentPlot->XAxis.Range.Max, t); - } + } if (HasFlag(gp.CurrentPlot->YAxis[y_axis].Flags, ImPlotAxisFlags_LogScale)) { float t = log10(y / gp.CurrentPlot->YAxis[y_axis].Range.Min) / gp.LogDenY[y_axis]; y = ImLerp(gp.CurrentPlot->YAxis[y_axis].Range.Min, gp.CurrentPlot->YAxis[y_axis].Range.Max, t); @@ -723,9 +723,9 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons const ImGuiID ID = Window->GetID(title); const ImGuiStyle &Style = G.Style; - const ImGuiIO & IO = ImGui::GetIO(); + const ImGuiIO & IO = ImGui::GetIO(); - bool just_created = gp.Plots.GetByKey(ID) == NULL; + bool just_created = gp.Plots.GetByKey(ID) == NULL; gp.CurrentPlot = gp.Plots.GetOrAddByKey(ID); ImPlotState &plot = *gp.CurrentPlot; @@ -739,10 +739,10 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons plot.YAxis[2].Flags = y3_flags; } else { - // TODO: Check which individual flags changed, and only reset those! + // TODO: Check which individual flags changed, and only reset those! // There's probably an easy bit mask trick I'm not aware of. - if (flags != plot.PreviousFlags) - plot.Flags = flags; + if (flags != plot.PreviousFlags) + plot.Flags = flags; if (y_flags != plot.YAxis[0].PreviousFlags) plot.YAxis[0].PreviousFlags = y_flags; if (y2_flags != plot.YAxis[1].PreviousFlags) @@ -826,7 +826,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons if (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_Adaptive)) { plot.XAxis.Divisions = (int)IM_ROUND(0.003 * gp.BB_Canvas.GetWidth()); if (plot.XAxis.Divisions < 2) - plot.XAxis.Divisions = 2; + plot.XAxis.Divisions = 2; } for (int i = 0; i < MAX_Y_AXES; i++) { if (HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_Adaptive)) { @@ -871,7 +871,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons ImGui::RenderFrame(gp.BB_Frame.Min, gp.BB_Frame.Max, gp.Col_Frame, true, Style.FrameRounding); // canvas bb - gp.BB_Canvas = ImRect(gp.BB_Frame.Min + Style.WindowPadding, gp.BB_Frame.Max - Style.WindowPadding); + gp.BB_Canvas = ImRect(gp.BB_Frame.Min + Style.WindowPadding, gp.BB_Frame.Max - Style.WindowPadding); gp.RenderX = (HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_GridLines) || HasFlag(plot.XAxis.Flags, ImPlotAxisFlags_TickMarks) || @@ -879,8 +879,8 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons for (int i = 0; i < MAX_Y_AXES; i++) { gp.RenderY[i] = y[i].present && - (HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_GridLines) || - HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_TickMarks) || + (HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_GridLines) || + HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_TickMarks) || HasFlag(plot.YAxis[i].Flags, ImPlotAxisFlags_TickLabels)) && plot.YAxis[i].Divisions > 1; } @@ -945,7 +945,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons ImRect centralRegion({gp.BB_Grid.Min.x + 6, gp.BB_Grid.Min.y}, {gp.BB_Grid.Max.x - 6, gp.BB_Grid.Max.y}); - + const bool hov_y_axis_region[MAX_Y_AXES] = { y[0].present && (yAxisRegion_bb[0].Contains(IO.MousePos) || centralRegion.Contains(IO.MousePos)), y[1].present && (yAxisRegion_bb[1].Contains(IO.MousePos) || centralRegion.Contains(IO.MousePos)), @@ -954,7 +954,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons const bool any_hov_y_axis_region = hov_y_axis_region[0] || hov_y_axis_region[1] || hov_y_axis_region[2]; // legend hovered from last frame - const bool hov_legend = HasFlag(plot.Flags, ImPlotFlags_Legend) ? gp.Hov_Frame && plot.BB_Legend.Contains(IO.MousePos) : false; + const bool hov_legend = HasFlag(plot.Flags, ImPlotFlags_Legend) ? gp.Hov_Frame && plot.BB_Legend.Contains(IO.MousePos) : false; bool hov_query = false; if (gp.Hov_Frame && gp.Hov_Grid && plot.Queried && !plot.Querying) { @@ -970,7 +970,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons if (plot.DraggingQuery && (IO.MouseReleased[0] || !IO.MouseDown[0])) { plot.DraggingQuery = false; } - if (plot.DraggingQuery) { + if (plot.DraggingQuery) { ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeAll); plot.QueryRect.Min += IO.MouseDelta; plot.QueryRect.Max += IO.MouseDelta; @@ -980,8 +980,8 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons const bool any_y_dragging = plot.YAxis[0].Dragging || plot.YAxis[1].Dragging || plot.YAxis[2].Dragging; if (IO.MouseDown[0] && !plot.XAxis.Dragging && !any_y_dragging) { plot.DraggingQuery = true; - } - } + } + } // DRAG INPUT ------------------------------------------------------------- @@ -989,7 +989,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons // end drags if (plot.XAxis.Dragging && (IO.MouseReleased[0] || !IO.MouseDown[0])) { plot.XAxis.Dragging = false; - G.IO.MouseDragMaxDistanceSqr[0] = 0; + G.IO.MouseDragMaxDistanceSqr[0] = 0; } for (int i = 0; i < MAX_Y_AXES; i++) { if (plot.YAxis[i].Dragging && (IO.MouseReleased[0] || !IO.MouseDown[0])) { @@ -1061,8 +1061,8 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons if (gp.Hov_Frame && (hov_x_axis_region || any_hov_y_axis_region) && IO.MouseWheel != 0) { UpdateTransformCache(); float zoom_rate = 0.1f; - if (IO.MouseWheel > 0) - zoom_rate = (-zoom_rate) / (1.0f + (2.0f * zoom_rate)); + if (IO.MouseWheel > 0) + zoom_rate = (-zoom_rate) / (1.0f + (2.0f * zoom_rate)); float tx = Remap(IO.MousePos.x, gp.BB_Grid.Min.x, gp.BB_Grid.Max.x, 0, 1); float ty = Remap(IO.MousePos.y, gp.BB_Grid.Min.y, gp.BB_Grid.Max.y, 0, 1); if (hov_x_axis_region && !x.lock) { @@ -1086,7 +1086,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons if (!y[i].lock_max) plot.YAxis[i].Range.Max = y[i].flip ? plot_br.y : plot_tl.y; } - } + } } // BOX-SELECTION AND QUERY ------------------------------------------------ @@ -1110,11 +1110,11 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons if (!y[i].lock_max && !IO.KeyShift) plot.YAxis[i].Range.Max = ImMax(p1.y, p2.y); } - } + } plot.Selecting = false; } // bad selection - if (plot.Selecting && (!HasFlag(plot.Flags, ImPlotFlags_BoxSelect) || lock_plot) && ImLengthSqr(plot.SelectStart - IO.MousePos) > 4) { + if (plot.Selecting && (!HasFlag(plot.Flags, ImPlotFlags_BoxSelect) || lock_plot) && ImLengthSqr(plot.SelectStart - IO.MousePos) > 4) { ImGui::SetMouseCursor(ImGuiMouseCursor_NotAllowed); } // cancel selection @@ -1168,7 +1168,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons plot.Queried = false; plot.QueryRect = ImRect(0,0,0,0); } - + // DOUBLE CLICK ----------------------------------------------------------- if ( IO.MouseDoubleClicked[0] && gp.Hov_Frame && (hov_x_axis_region || any_hov_y_axis_region) && !hov_legend && !hov_query) { @@ -1179,7 +1179,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons } } else { - gp.FitThisFrame = false; + gp.FitThisFrame = false; gp.FitX = false; for (int i = 0; i < MAX_Y_AXES; i++) { gp.FitY[i] = false; @@ -1190,7 +1190,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons // focus window if ((IO.MouseClicked[0] || IO.MouseClicked[1]) && gp.Hov_Frame) - ImGui::FocusWindow(ImGui::GetCurrentWindow()); + ImGui::FocusWindow(ImGui::GetCurrentWindow()); UpdateTransformCache(); @@ -1311,7 +1311,7 @@ inline void AxisMenu(ImPlotAxis& Axis) { bool grid = HasFlag(Axis.Flags, ImPlotAxisFlags_GridLines); bool ticks = HasFlag(Axis.Flags, ImPlotAxisFlags_TickMarks); bool labels = HasFlag(Axis.Flags, ImPlotAxisFlags_TickLabels); - if (ImGui::Checkbox("##LockMin", &lock_min)) + if (ImGui::Checkbox("##LockMin", &lock_min)) FlipFlag(Axis.Flags, ImPlotAxisFlags_LockMin); ImGui::SameLine(); if (lock_min) { @@ -1349,8 +1349,8 @@ inline void AxisMenu(ImPlotAxis& Axis) { } void PlotContextMenu(ImPlotState& plot) { - if (ImGui::BeginMenu("X-Axis")) { - ImGui::PushID("X"); + if (ImGui::BeginMenu("X-Axis")) { + ImGui::PushID("X"); AxisMenu(plot.XAxis); ImGui::PopID(); ImGui::EndMenu(); @@ -1369,13 +1369,13 @@ void PlotContextMenu(ImPlotState& plot) { snprintf(buf, sizeof(buf) - 1, "Y-Axis %d", i + 1); } if (ImGui::BeginMenu(buf)) { - ImGui::PushID(i); + ImGui::PushID(i); AxisMenu(plot.YAxis[i]); ImGui::PopID(); ImGui::EndMenu(); } } - + ImGui::Separator(); if ((ImGui::BeginMenu("Settings"))) { if (ImGui::MenuItem("Box Select",NULL,HasFlag(plot.Flags, ImPlotFlags_BoxSelect))) { @@ -1444,7 +1444,7 @@ class BufferWriter { void EndPlot() { - IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "Mismatched BeginPlot()/EndPlot()!"); + IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "Mismatched BeginPlot()/EndPlot()!"); ImPlotState &plot = *gp.CurrentPlot; ImGuiContext &G = *GImGui; @@ -1536,7 +1536,7 @@ void EndPlot() { if (plot.QueryRect.GetWidth() > 2 && plot.QueryRect.GetHeight() > 2) { DrawList.AddRectFilled(plot.QueryRect.Min + gp.BB_Grid.Min, plot.QueryRect.Max + gp.BB_Grid.Min, gp.Col_QryBg); DrawList.AddRect( plot.QueryRect.Min + gp.BB_Grid.Min, plot.QueryRect.Max + gp.BB_Grid.Min, gp.Col_QryBd); - } + } } else if (plot.Queried) { ImRect bb_query = plot.QueryRect; @@ -1601,7 +1601,7 @@ void EndPlot() { const char* label = GetLegendLabel(i); const char* text_display_end = ImGui::FindRenderedTextEnd(label, NULL); if (label != text_display_end) - DrawList.AddText(legend_content_bb.Min + legend_padding + ImVec2(legend_icon_size, i * txt_ht), + DrawList.AddText(legend_content_bb.Min + legend_padding + ImVec2(legend_icon_size, i * txt_ht), item->Show ? (item->Highlight ? col_hl_txt : gp.Col_Txt) : gp.Col_TxtDis, label, text_display_end); } } @@ -1683,7 +1683,7 @@ void EndPlot() { // Reset next plot data gp.NextPlotData = ImNextPlotData(); // Pop ImGui::PushID at the end of BeginPlot - ImGui::PopID(); + ImGui::PopID(); // End child window if (!HasFlag(plot.Flags, ImPlotFlags_NoChild)) ImGui::EndChild(); @@ -1740,15 +1740,15 @@ void PopPlotClipRect() { ImGui::PopClipRect(); } -bool IsPlotHovered() { +bool IsPlotHovered() { IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "IsPlotHovered() Needs to be called between BeginPlot() and EndPlot()!"); - return gp.Hov_Grid; + return gp.Hov_Grid; } ImVec2 GetPlotMousePos(int y_axis_in) { IM_ASSERT_USER_ERROR(y_axis_in >= -1 && y_axis_in < MAX_Y_AXES, "y_axis needs to between -1 and MAX_Y_AXES"); IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "GetPlotMousePos() Needs to be called between BeginPlot() and EndPlot()!"); const int y_axis = y_axis_in >= 0 ? y_axis_in : gp.CurrentPlot->CurrentYAxis; - return gp.LastMousePos[y_axis]; + return gp.LastMousePos[y_axis]; } @@ -1798,7 +1798,7 @@ struct ImPlotStyleVarInfo { void* GetVarPtr(ImPlotStyle* style) const { return (void*)((unsigned char*)style + Offset); } }; -static const ImPlotStyleVarInfo GPlotStyleVarInfo[] = +static const ImPlotStyleVarInfo GPlotStyleVarInfo[] = { { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImPlotStyle, LineWeight) }, // ImPlotStyleVar_LineWeight { ImGuiDataType_S32, 1, (ImU32)IM_OFFSETOF(ImPlotStyle, Marker) }, // ImPlotStyleVar_Marker @@ -1909,8 +1909,8 @@ void PopStyleVar(int count) { ((float*)data)[0] = backup.BackupFloat[0]; } else if (info->Type == ImGuiDataType_Float && info->Count == 2) { - ((float*)data)[0] = backup.BackupFloat[0]; - ((float*)data)[1] = backup.BackupFloat[1]; + ((float*)data)[0] = backup.BackupFloat[0]; + ((float*)data)[1] = backup.BackupFloat[1]; } else if (info->Type == ImGuiDataType_S32 && info->Count == 1) { ((int*)data)[0] = backup.BackupInt[0]; @@ -2013,34 +2013,34 @@ inline void MarkerCross(ImDrawList& DrawList, const ImVec2& c, float s, bool out template inline void RenderMarkers(Transformer transformer, ImDrawList& DrawList, Getter getter, int count, int offset, bool rend_mk_line, ImU32 col_mk_line, bool rend_mk_fill, ImU32 col_mk_fill, bool cull) { int idx = offset; - for (int i = 0; i < count; ++i) { + for (int i = 0; i < count; ++i) { ImVec2 c; c = transformer(getter(idx)); idx = (idx + 1) % count; if (!cull || gp.BB_Grid.Contains(c)) { // TODO: Optimize the loop and if statements, this is atrocious - if (HasFlag(gp.Style.Marker, ImPlotMarker_Circle)) + if (HasFlag(gp.Style.Marker, ImPlotMarker_Circle)) MarkerCircle(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); if (HasFlag(gp.Style.Marker, ImPlotMarker_Square)) - MarkerSquare(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImPlotMarker_Diamond)) + MarkerSquare(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); + if (HasFlag(gp.Style.Marker, ImPlotMarker_Diamond)) MarkerDiamond(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); if (HasFlag(gp.Style.Marker, ImPlotMarker_Up)) - MarkerUp(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImPlotMarker_Down)) - MarkerDown(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); + MarkerUp(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); + if (HasFlag(gp.Style.Marker, ImPlotMarker_Down)) + MarkerDown(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); if (HasFlag(gp.Style.Marker, ImPlotMarker_Left)) - MarkerLeft(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); - if (HasFlag(gp.Style.Marker, ImPlotMarker_Right)) - MarkerRight(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); + MarkerLeft(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); + if (HasFlag(gp.Style.Marker, ImPlotMarker_Right)) + MarkerRight(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); if (HasFlag(gp.Style.Marker, ImPlotMarker_Cross)) - MarkerCross(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); + MarkerCross(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); if (HasFlag(gp.Style.Marker, ImPlotMarker_Plus)) - MarkerPlus(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); + MarkerPlus(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); if (HasFlag(gp.Style.Marker, ImPlotMarker_Asterisk)) - MarkerAsterisk(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); + MarkerAsterisk(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight); } - } + } } inline void RenderLine(ImDrawList& DrawList, const ImVec2& p1, const ImVec2& p2, float line_weight, ImU32 col_line, ImVec2 uv) { @@ -2049,7 +2049,7 @@ inline void RenderLine(ImDrawList& DrawList, const ImVec2& p1, const ImVec2& p2, float dy = p2.y - p1.y; IM_NORMALIZE2F_OVER_ZERO(dx, dy); dx *= (line_weight * 0.5f); - dy *= (line_weight * 0.5f); + dy *= (line_weight * 0.5f); DrawList._VtxWritePtr[0].pos.x = p1.x + dy; DrawList._VtxWritePtr[0].pos.y = p1.y - dx; DrawList._VtxWritePtr[0].uv = uv; @@ -2084,13 +2084,13 @@ inline void RenderLineAA(ImDrawList& DrawList, const ImVec2& p1, const ImVec2& p template inline void RenderLineStrip(Transformer transformer, ImDrawList& DrawList, Getter getter, int count, int offset, float line_weight, ImU32 col_line, bool cull) { // render line segments - offset %= count; + offset %= count; if (offset < 0) offset += count; // shift negative offset to positive range int i_start = offset + 1; if (i_start >= count ) i_start -= count; int i_end = offset + count; if (i_end >= count) i_end -= count; - + const int segments = count - 1; ImVec2 p1 = transformer(getter(offset)); bool test1 = !cull || gp.BB_Grid.Contains(p1); @@ -2098,7 +2098,7 @@ inline void RenderLineStrip(Transformer transformer, ImDrawList& DrawList, Gette for (int i1 = i_start; i1 != i_end; i1 = i1 + 1 < count ? i1 + 1 : i1 + 1 - count) { ImVec2 p2 = transformer(getter(i1)); - bool test2 = !cull || gp.BB_Grid.Contains(p2); + bool test2 = !cull || gp.BB_Grid.Contains(p2); if (test1 | test2) RenderLineAA(DrawList, p1, p2, line_weight, col_line); p1 = p2; @@ -2115,14 +2115,14 @@ inline void RenderLineStrip(Transformer transformer, ImDrawList& DrawList, Gette bool test2 = !cull || gp.BB_Grid.Contains(p2); if (test1 | test2) RenderLine(DrawList, p1, p2, line_weight, col_line, uv); - else + else segments_culled++; p1 = p2; test1 = test2; } - if (segments_culled > 0) - DrawList.PrimUnreserve(segments_culled * 6, segments_culled * 4); - } + if (segments_culled > 0) + DrawList.PrimUnreserve(segments_culled * 6, segments_culled * 4); + } } //----------------------------------------------------------------------------- @@ -2310,7 +2310,7 @@ void PlotBarEx(const char* label_id, Getter getter, int count, float width, int } int idx = offset; - for (int i = 0; i < count; ++i) { + for (int i = 0; i < count; ++i) { ImVec2 p; p = getter(idx); idx = (idx + 1) % count; @@ -2380,7 +2380,7 @@ void PlotBarHEx(const char* label_id, Getter getter, int count, float height, i } int idx = offset; - for (int i = 0; i < count; ++i) { + for (int i = 0; i < count; ++i) { ImVec2 p; p = getter(idx); idx = (idx + 1) % count; @@ -2421,7 +2421,7 @@ struct GetterError { Xs = xs; Ys = ys; Neg = neg; Pos = pos; Stride = stride; } ImVec4 operator()(int idx) { - return ImVec4(StrideIndex(Xs, idx, Stride), + return ImVec4(StrideIndex(Xs, idx, Stride), StrideIndex(Ys, idx, Stride), StrideIndex(Neg, idx, Stride), StrideIndex(Pos, idx, Stride)); @@ -2511,7 +2511,7 @@ void PieChart(const char** label_ids, float* values, int count, const ImVec2& ce float sum = 0; for (int i = 0; i < count; ++i) sum += values[i]; - + const bool normalize = sum > 1.0f; PushPlotClipRect(); @@ -2541,7 +2541,7 @@ void PieChart(const char** label_ids, float* values, int count, const ImVec2& ce } } a0 = a1; - } + } PopPlotClipRect(); } @@ -2617,7 +2617,7 @@ inline void PlotDigitalEx(const char* label_id, Getter getter, int count, int of pMax.x = gp.PixelRange[ax].Min.x + mx * (itemData2.x - gp.CurrentPlot->XAxis.Range.Min); i1 = i2; s++; - } + } //do not extend plot outside plot range if (pMin.x < gp.PixelRange[ax].Min.x) pMin.x = gp.PixelRange[ax].Min.x; if (pMax.x < gp.PixelRange[ax].Min.x) pMax.x = gp.PixelRange[ax].Min.x; @@ -2632,7 +2632,7 @@ inline void PlotDigitalEx(const char* label_id, Getter getter, int count, int of } gp.DigitalPlotItemCnt++; gp.DigitalPlotOffset += pixYMax; - } + } ImGui::PopClipRect(); } diff --git a/implot.h b/implot.h index 6ad31f7..41bc707 100644 --- a/implot.h +++ b/implot.h @@ -67,7 +67,7 @@ enum ImPlotAxisFlags_ { ImPlotAxisFlags_Auxiliary = ImPlotAxisFlags_Default & ~ImPlotAxisFlags_GridLines, }; -// Plot styling colors +// Plot styling colors enum ImPlotCol_ { ImPlotCol_Line, // plot line/outline color (defaults to a rotating color set) ImPlotCol_Fill, // plot fill color for bars (defaults to the current line color) @@ -102,7 +102,7 @@ enum ImPlotStyleVar_ { // Marker specification enum ImPlotMarker_ { ImPlotMarker_None = 1 << 0, // no marker - ImPlotMarker_Circle = 1 << 1, // a circle marker will be rendered at each point + ImPlotMarker_Circle = 1 << 1, // a circle marker will be rendered at each point ImPlotMarker_Square = 1 << 2, // a square maker will be rendered at each point ImPlotMarker_Diamond = 1 << 3, // a diamond marker will be rendered at each point ImPlotMarker_Up = 1 << 4, // an upward-pointing triangle marker will up rendered at each point @@ -154,13 +154,13 @@ namespace ImPlot { // be called, e.g. "if (BeginPlot(...)) { ... EndPlot(); }"". #title_id must // be unique. If you need to avoid ID collisions or don't want to display a // title in the plot, use double hashes (e.g. "MyPlot##Hidden"). If #x_label -// and/or #y_label are provided, axes labels will be displayed. -bool BeginPlot(const char* title_id, - const char* x_label = NULL, - const char* y_label = NULL, - const ImVec2& size = ImVec2(-1,-1), - ImPlotFlags flags = ImPlotFlags_Default, - ImPlotAxisFlags x_flags = ImPlotAxisFlags_Default, +// and/or #y_label are provided, axes labels will be displayed. +bool BeginPlot(const char* title_id, + const char* x_label = NULL, + const char* y_label = NULL, + const ImVec2& size = ImVec2(-1,-1), + ImPlotFlags flags = ImPlotFlags_Default, + ImPlotAxisFlags x_flags = ImPlotAxisFlags_Default, ImPlotAxisFlags y_flags = ImPlotAxisFlags_Default, ImPlotAxisFlags y2_flags = ImPlotAxisFlags_Auxiliary, ImPlotAxisFlags y3_flags = ImPlotAxisFlags_Auxiliary); @@ -228,7 +228,7 @@ void RestorePalette(); void PushStyleColor(ImPlotCol idx, ImU32 col); // Temporarily modify a plot color. void PushStyleColor(ImPlotCol idx, const ImVec4& col); -// Undo temporary color modification. +// Undo temporary color modification. void PopStyleColor(int count = 1); // Temporarily modify a style variable of float type. diff --git a/implot_demo.cpp b/implot_demo.cpp index e172ebf..c79f8df 100644 --- a/implot_demo.cpp +++ b/implot_demo.cpp @@ -38,7 +38,7 @@ namespace { float RandomRange( float min, float max ) { - float scale = rand() / (float) RAND_MAX; + float scale = rand() / (float) RAND_MAX; return min + scale * ( max - min ); } @@ -60,7 +60,7 @@ struct ScrollingData { Data.shrink(0); Offset = 0; } - } + } }; struct RollingData { @@ -92,8 +92,8 @@ struct BenchmarkItem { } // private namespace -namespace ImPlot { - +namespace ImPlot { + void ShowDemoWindow(bool* p_open) { static bool show_app_metrics = false; static bool show_app_style_editor = false; @@ -170,7 +170,7 @@ void ShowDemoWindow(bool* p_open) { } if (ImPlot::BeginPlot("Scatter Plot", NULL, NULL, {-1,300})) { ImPlot::PushStyleVar(ImPlotStyleVar_LineWeight, 0); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Cross); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Cross); ImPlot::PushStyleVar(ImPlotStyleVar_MarkerSize, 3); ImPlot::Plot("Data 1", xs1, ys1, 100); ImPlot::PopStyleVar(2); @@ -300,50 +300,50 @@ void ShowDemoWindow(bool* p_open) { float ys[2] = {10,11}; // filled ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle); - ImPlot::Plot("Circle##Fill", xs, ys, 2); + ImPlot::Plot("Circle##Fill", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Square); ys[0]--; ys[1]--; - ImPlot::Plot("Square##Fill", xs, ys, 2); + ImPlot::Plot("Square##Fill", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Diamond); ys[0]--; ys[1]--; - ImPlot::Plot("Diamond##Fill", xs, ys, 2); + ImPlot::Plot("Diamond##Fill", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Up); ys[0]--; ys[1]--; - ImPlot::Plot("Up##Fill", xs, ys, 2); + ImPlot::Plot("Up##Fill", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Down); ys[0]--; ys[1]--; - ImPlot::Plot("Down##Fill", xs, ys, 2); + ImPlot::Plot("Down##Fill", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Left); ys[0]--; ys[1]--; - ImPlot::Plot("Left##Fill", xs, ys, 2); + ImPlot::Plot("Left##Fill", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Right); ys[0]--; ys[1]--; - ImPlot::Plot("Right##Fill", xs, ys, 2); + ImPlot::Plot("Right##Fill", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Cross); ys[0]--; ys[1]--; - ImPlot::Plot("Cross##Fill", xs, ys, 2); + ImPlot::Plot("Cross##Fill", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Plus); ys[0]--; ys[1]--; - ImPlot::Plot("Plus##Fill", xs, ys, 2); + ImPlot::Plot("Plus##Fill", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Asterisk); ys[0]--; ys[1]--; - ImPlot::Plot("Asterisk##Fill", xs, ys, 2); + ImPlot::Plot("Asterisk##Fill", xs, ys, 2); ImPlot::PopStyleVar(10); xs[0] = 6; xs[1] = 9; ys[0] = 10; ys[1] = 11; ImPlot::PushStyleColor(ImPlotCol_MarkerFill, ImVec4(0,0,0,0)); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle); - ImPlot::Plot("Circle", xs, ys, 2); + ImPlot::Plot("Circle", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Square); ys[0]--; ys[1]--; - ImPlot::Plot("Square", xs, ys, 2); + ImPlot::Plot("Square", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Diamond); ys[0]--; ys[1]--; - ImPlot::Plot("Diamond", xs, ys, 2); + ImPlot::Plot("Diamond", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Up); ys[0]--; ys[1]--; - ImPlot::Plot("Up", xs, ys, 2); + ImPlot::Plot("Up", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Down); ys[0]--; ys[1]--; - ImPlot::Plot("Down", xs, ys, 2); + ImPlot::Plot("Down", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Left); ys[0]--; ys[1]--; - ImPlot::Plot("Left", xs, ys, 2); + ImPlot::Plot("Left", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Right); ys[0]--; ys[1]--; - ImPlot::Plot("Right", xs, ys, 2); + ImPlot::Plot("Right", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Cross); ys[0]--; ys[1]--; - ImPlot::Plot("Cross", xs, ys, 2); + ImPlot::Plot("Cross", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Plus); ys[0]--; ys[1]--; - ImPlot::Plot("Plus", xs, ys, 2); + ImPlot::Plot("Plus", xs, ys, 2); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Asterisk); ys[0]--; ys[1]--; - ImPlot::Plot("Asterisk", xs, ys, 2); + ImPlot::Plot("Asterisk", xs, ys, 2); ImPlot::PopStyleColor(); ImPlot::PopStyleVar(10); @@ -353,12 +353,12 @@ void ShowDemoWindow(bool* p_open) { ImPlot::PushStyleVar(ImPlotStyleVar_LineWeight, 2); ImPlot::PushStyleVar(ImPlotStyleVar_MarkerSize, 8); ImPlot::PushStyleVar(ImPlotStyleVar_MarkerWeight, 2); - ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle | ImPlotMarker_Cross); + ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Circle | ImPlotMarker_Cross); ImPlot::PushStyleColor(ImPlotCol_MarkerOutline, ImVec4(0,0,0,1)); ImPlot::PushStyleColor(ImPlotCol_MarkerFill, ImVec4(1,1,1,1)); ImPlot::PushStyleColor(ImPlotCol_Line, ImVec4(0,0,0,1)); - ImPlot::Plot("Circle|Cross", xs, ys, 2); - ImPlot::PopStyleVar(4); + ImPlot::Plot("Circle|Cross", xs, ys, 2); + ImPlot::PopStyleVar(4); ImPlot::PopStyleColor(3); ImPlot::Text("Filled Markers", 1.5, 11.75); @@ -454,7 +454,7 @@ void ShowDemoWindow(bool* p_open) { static ImVector data; ImPlotLimits range, query; if (ImPlot::BeginPlot("##Drawing", NULL, NULL, ImVec2(-1,300), ImPlotFlags_Default | ImPlotFlags_Query, ImPlotAxisFlags_GridLines, ImPlotAxisFlags_GridLines)) { - if (ImPlot::IsPlotHovered() && ImGui::IsMouseClicked(0) && ImGui::GetIO().KeyCtrl) + if (ImPlot::IsPlotHovered() && ImGui::IsMouseClicked(0) && ImGui::GetIO().KeyCtrl) data.push_back(ImPlot::GetPlotMousePos()); ImPlot::PushStyleVar(ImPlotStyleVar_LineWeight, 0); ImPlot::PushStyleVar(ImPlotStyleVar_Marker, ImPlotMarker_Diamond); @@ -469,7 +469,7 @@ void ShowDemoWindow(bool* p_open) { avg.x += data[i].x; avg.y += data[i].y; cnt++; - } + } } if (cnt > 0) { avg.x = avg.x / cnt; @@ -563,8 +563,8 @@ void ShowDemoWindow(bool* p_open) { t += ImGui::GetIO().DeltaTime; for (int i = 0; i < 10; ++i) { if (show[i]) - data[i].AddPoint(t, data[i].Data.empty() ? - 0.25f + 0.5f * (float)rand() / float(RAND_MAX) : + data[i].AddPoint(t, data[i].Data.empty() ? + 0.25f + 0.5f * (float)rand() / float(RAND_MAX) : data[i].Data.back().y + (0.005f + 0.0002f * (float)rand() / float(RAND_MAX)) * (-1 + 2 * (float)rand() / float(RAND_MAX))); } } @@ -736,8 +736,8 @@ void ShowDemoWindow(bool* p_open) { ImPlot::SetNextPlotLimits(-0.5f, 9.5f, -0.5f, 9.5f); if (ImPlot::BeginPlot("##Custom", NULL, NULL, {-1,300}, ImPlotFlags_Default & ~ImPlotFlags_Legend, 0)) { float lin[10] = {8,8,9,7,8,8,8,9,7,8}; - float bar[10] = {1,2,5,3,4,1,2,5,3,4}; - float dot[10] = {7,6,6,7,8,5,6,5,8,7}; + float bar[10] = {1,2,5,3,4,1,2,5,3,4}; + float dot[10] = {7,6,6,7,8,5,6,5,8,7}; ImPlot::Bar("Bar", bar, 10, 0.5f); ImPlot::Plot("Line", lin, 10); ImPlot::PushStyleVar(ImPlotStyleVar_LineWeight, 0); @@ -771,18 +771,18 @@ void ShowDemoWindow(bool* p_open) { ImGui::BulletText("%d lines with %d points each @ %.3f FPS.",n_items,1000,ImGui::GetIO().Framerate); SetNextPlotLimits(0,1,0,1, ImGuiCond_Always); if (ImPlot::BeginPlot("##Bench",NULL,NULL,{-1,300},ImPlotFlags_Default | ImPlotFlags_NoChild)) { - char buff[16]; + char buff[16]; for (int i = 0; i < 100; ++i) { sprintf(buff, "item_%d",i); ImPlot::PushStyleColor(ImPlotCol_Line, items[i].Col); ImPlot::Plot(buff, items[i].Data, 1000); ImPlot::PopStyleColor(); - } + } ImPlot::EndPlot(); } } //------------------------------------------------------------------------- - ImGui::End(); + ImGui::End(); } } // namespace ImPlot From d853971668705d499c309f82b1774ad51a597ff2 Mon Sep 17 00:00:00 2001 From: Evan Pezent Date: Wed, 13 May 2020 09:13:05 -0500 Subject: [PATCH 7/7] remove gitignore file, it's not needed for now --- .gitignore | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 259148f..0000000 --- a/.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -# Prerequisites -*.d - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app