Merge branch 'master' into master

Author: SamuMazzi

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
  cmake-build/example_implot
 
  MacOS:
- runs-on: macos-11
+ runs-on: macos-latest
 
  strategy:
  fail-fast: false
@@ -141,4 +141,4 @@ jobs:
 
  - name: Run (MingW)
  run: .\cmake-build\example_implot.exe
- 
+ 

README.md

@@ -155,7 +155,7 @@ A: Maybe. Check the demo, gallery, or Announcements ([2020](https://github.com/e
 
 **Q: Does ImPlot support 3D plots?**
 
-A: No, and likely never will since ImGui only deals in 2D rendering.
+A: An experimental extension to ImPlot, [ImPlot3D](https://github.com/brenocq/implot3d), provides a similar API for plotting and interacting with 3D data. 
 
 **Q: Does ImPlot provide analytic tools?**
 

TODO.md

@@ -15,7 +15,6 @@ The list below represents a combination of high-priority work, nice-to-have feat
 
 - add `PlotBubbles` (see MATLAB bubble chart)
 - add non-zero references for `PlotBars` etc.
-- add exploding to `PlotPieChart` (on hover-highlight?)
 - fix appearance of `PlotBars` spacing
 
 ## Styling

implot.cpp

@@ -125,8 +125,11 @@ You can read releases logs https://github.com/epezent/implot/releases for more d
 
 */
 
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include "implot.h"
+#ifndef IMGUI_DISABLE
 #include "implot_internal.h"
 
 #include <stdlib.h>
@@ -947,20 +950,6 @@ tm* GetLocTime(const ImPlotTime& t, tm* ptm) {
 #endif
 }
 
-inline ImPlotTime MkTime(struct tm *ptm) {
- if (GetStyle().UseLocalTime)
- return MkLocTime(ptm);
- else
- return MkGmtTime(ptm);
-}
-
-inline tm* GetTime(const ImPlotTime& t, tm* ptm) {
- if (GetStyle().UseLocalTime)
- return GetLocTime(t,ptm);
- else
- return GetGmtTime(t,ptm);
-}
-
 ImPlotTime MakeTime(int year, int month, int day, int hour, int min, int sec, int us) {
  tm& Tm = GImPlot->Tm;
 
@@ -990,6 +979,12 @@ int GetYear(const ImPlotTime& t) {
  return Tm.tm_year + 1900;
 }
 
+int GetMonth(const ImPlotTime& t) {
+ tm& Tm = GImPlot->Tm;
+ ImPlot::GetTime(t, &Tm);
+ return Tm.tm_mon;
+}
+
 ImPlotTime AddTime(const ImPlotTime& t, ImPlotTimeUnit unit, int count) {
  tm& Tm = GImPlot->Tm;
  ImPlotTime t_out = t;
@@ -5186,7 +5181,7 @@ void ShowUserGuide() {
  ImGui::Indent();
  ImGui::BulletText("Left-click drag on axis labels to pan an individual axis.");
  ImGui::Unindent();
- ImGui::BulletText("Scroll in the plot area to zoom both X any Y axes.");
+ ImGui::BulletText("Scroll in the plot area to zoom both X and Y axes.");
  ImGui::Indent();
  ImGui::BulletText("Scroll on axis labels to zoom an individual axis.");
  ImGui::Unindent();
@@ -5898,3 +5893,5 @@ bool BeginPlot(const char* title, const char* x_label, const char* y1_label, con
 #endif
 
 } // namespace ImPlot
+
+#endif // #ifndef IMGUI_DISABLE

implot.h

@@ -46,6 +46,7 @@
 
 #pragma once
 #include "imgui.h"
+#ifndef IMGUI_DISABLE
 
 //-----------------------------------------------------------------------------
 // [SECTION] Macros and Defines
@@ -288,7 +289,8 @@ enum ImPlotInfLinesFlags_ {
 enum ImPlotPieChartFlags_ {
  ImPlotPieChartFlags_None = 0, // default
  ImPlotPieChartFlags_Normalize = 1 << 10, // force normalization of pie chart values (i.e. always make a full circle if sum < 0)
- ImPlotPieChartFlags_IgnoreHidden = 1 << 11 // ignore hidden slices when drawing the pie chart (as if they were not there)
+ ImPlotPieChartFlags_IgnoreHidden = 1 << 11, // ignore hidden slices when drawing the pie chart (as if they were not there)
+ ImPlotPieChartFlags_Exploding = 1 << 12 // Explode legend-hovered slice
 };
 
 // Flags for PlotHeatmap
@@ -1296,4 +1298,5 @@ IMPLOT_DEPRECATED( IMPLOT_API bool BeginPlot(const char* title_id,
 
 } // namespace ImPlot
 
-#endif
+#endif // #ifndef IMPLOT_DISABLE_OBSOLETE_FUNCTIONS
+#endif // #ifndef IMGUI_DISABLE

implot_demo.cpp

@@ -28,6 +28,7 @@
 #endif
 
 #include "implot.h"
+#ifndef IMGUI_DISABLE
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,6 +44,8 @@
 
 #define CHECKBOX_FLAG(flags, flag) ImGui::CheckboxFlags(#flag, (unsigned int*)&flags, flag)
 
+#if !defined(IMGUI_DISABLE_DEMO_WINDOWS)
+
 // Encapsulates examples for customizing ImPlot.
 namespace MyImPlot {
 
@@ -612,6 +615,7 @@ void Demo_PieCharts() {
  ImGui::DragFloat4("Values", data1, 0.01f, 0, 1);
  CHECKBOX_FLAG(flags, ImPlotPieChartFlags_Normalize);
  CHECKBOX_FLAG(flags, ImPlotPieChartFlags_IgnoreHidden);
+ CHECKBOX_FLAG(flags, ImPlotPieChartFlags_Exploding);
 
  if (ImPlot::BeginPlot("##Pie1", ImVec2(250,250), ImPlotFlags_Equal | ImPlotFlags_NoMouseText)) {
  ImPlot::SetupAxes(nullptr, nullptr, ImPlotAxisFlags_NoDecorations, ImPlotAxisFlags_NoDecorations);
@@ -2495,3 +2499,11 @@ void PlotCandlestick(const char* label_id, const double* xs, const double* opens
 }
 
 } // namespace MyImplot
+
+#else
+
+void ImPlot::ShowDemoWindow(bool* p_open) {}
+
+#endif
+
+#endif // #ifndef IMGUI_DISABLE

implot_internal.h

@@ -31,13 +31,13 @@
 
 #pragma once
 
-#include <time.h>
-#include "imgui_internal.h"
-
 #ifndef IMPLOT_VERSION
 #error Must include implot.h before implot_internal.h
 #endif
 
+#ifndef IMGUI_DISABLE
+#include <time.h>
+#include "imgui_internal.h"
 
 // Support for pre-1.84 versions. ImPool's GetSize() -> GetBufSize()
 #if (IMGUI_VERSION_NUM < 18303)
@@ -1565,11 +1565,24 @@ IMPLOT_API tm* GetLocTime(const ImPlotTime& t, tm* ptm);
 // NB: The following functions only work if there is a current ImPlotContext because the
 // internal tm struct is owned by the context! They are aware of ImPlotStyle.UseLocalTime.
 
+// // Make a UNIX timestamp from a tm struct according to the current ImPlotStyle.UseLocalTime setting.
+static inline ImPlotTime MkTime(struct tm *ptm) {
+ if (GetStyle().UseLocalTime) return MkLocTime(ptm);
+ else return MkGmtTime(ptm);
+}
+// Get a tm struct from a UNIX timestamp according to the current ImPlotStyle.UseLocalTime setting.
+static inline tm* GetTime(const ImPlotTime& t, tm* ptm) {
+ if (GetStyle().UseLocalTime) return GetLocTime(t,ptm);
+ else return GetGmtTime(t,ptm);
+}
+
 // Make a timestamp from time components.
 // year[1970-3000], month[0-11], day[1-31], hour[0-23], min[0-59], sec[0-59], us[0,999999]
 IMPLOT_API ImPlotTime MakeTime(int year, int month = 0, int day = 1, int hour = 0, int min = 0, int sec = 0, int us = 0);
 // Get year component from timestamp [1970-3000]
 IMPLOT_API int GetYear(const ImPlotTime& t);
+// Get month component from timestamp [0-11]
+IMPLOT_API int GetMonth(const ImPlotTime& t);
 
 // Adds or subtracts time from a timestamp. #count > 0 to add, < 0 to subtract.
 IMPLOT_API ImPlotTime AddTime(const ImPlotTime& t, ImPlotTimeUnit unit, int count);
@@ -1582,6 +1595,11 @@ IMPLOT_API ImPlotTime RoundTime(const ImPlotTime& t, ImPlotTimeUnit unit);
 // Combines the date of one timestamp with the time-of-day of another timestamp.
 IMPLOT_API ImPlotTime CombineDateTime(const ImPlotTime& date_part, const ImPlotTime& time_part);
 
+// Get the current time as a timestamp.
+static inline ImPlotTime Now() { return ImPlotTime::FromDouble((double)time(nullptr)); }
+// Get the current date as a timestamp.
+static inline ImPlotTime Today() { return ImPlot::FloorTime(Now(), ImPlotTimeUnit_Day); }
+
 // Formats the time part of timestamp t into a buffer according to #fmt
 IMPLOT_API int FormatTime(const ImPlotTime& t, char* buffer, int size, ImPlotTimeFmt fmt, bool use_24_hr_clk);
 // Formats the date part of timestamp t into a buffer according to #fmt
@@ -1668,3 +1686,5 @@ void Locator_Log10(ImPlotTicker& ticker, const ImPlotRange& range, float pixels,
 void Locator_SymLog(ImPlotTicker& ticker, const ImPlotRange& range, float pixels, bool vertical, ImPlotFormatter formatter, void* formatter_data);
 
 } // namespace ImPlot
+
+#endif // #ifndef IMGUI_DISABLE

implot_items.cpp

@@ -22,8 +22,11 @@
 
 // ImPlot v0.17
 
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include "implot.h"
+#ifndef IMGUI_DISABLE
 #include "implot_internal.h"
 
 //-----------------------------------------------------------------------------
@@ -2197,20 +2200,53 @@ CALL_INSTANTIATE_FOR_NUMERIC_TYPES()
 // [SECTION] PlotPieChart
 //-----------------------------------------------------------------------------
 
-IMPLOT_INLINE void RenderPieSlice(ImDrawList& draw_list, const ImPlotPoint& center, double radius, double a0, double a1, ImU32 col) {
+IMPLOT_INLINE void RenderPieSlice(ImDrawList& draw_list, const ImPlotPoint& center, double radius, double a0, double a1, ImU32 col, bool detached = false) {
  const float resolution = 50 / (2 * IM_PI);
  ImVec2 buffer[52];
- buffer[0] = PlotToPixels(center,IMPLOT_AUTO,IMPLOT_AUTO);
+ 
  int n = ImMax(3, (int)((a1 - a0) * resolution));
  double da = (a1 - a0) / (n - 1);
  int i = 0;
- for (; i < n; ++i) {
- double a = a0 + i * da;
- buffer[i + 1] = PlotToPixels(center.x + radius * cos(a), center.y + radius * sin(a),IMPLOT_AUTO,IMPLOT_AUTO);
- }
- buffer[i+1] = buffer[0];
+
+ if (detached) {
+ const double offset = 0.08; // Offset of the detached slice
+ const double width_scale = 0.95; // Scale factor for the width of the detached slice
+ 
+ double a_mid = (a0 + a1) / 2;
+ double new_a0 = a_mid - (a1 - a0) * width_scale / 2;
+ double new_a1 = a_mid + (a1 - a0) * width_scale / 2;
+ double new_da = (new_a1 - new_a0) / (n - 1);
+ 
+ ImPlotPoint offsetCenter(center.x + offset * cos(a_mid), center.y + offset * sin(a_mid));
+ 
+ // Start point (center of the offset)
+ buffer[0] = PlotToPixels(offsetCenter, IMPLOT_AUTO, IMPLOT_AUTO);
+
+ for (; i < n; ++i) {
+ double a = new_a0 + i * new_da;
+ buffer[i + 1] = PlotToPixels(
+ offsetCenter.x + (radius + offset/2) * cos(a),
+ offsetCenter.y + (radius + offset/2) * sin(a),
+ IMPLOT_AUTO, IMPLOT_AUTO
+ );
+ }
+
+ } else {
+ buffer[0] = PlotToPixels(center, IMPLOT_AUTO, IMPLOT_AUTO);
+ for (; i < n; ++i) {
+ double a = a0 + i * da;
+ buffer[i + 1] = PlotToPixels(
+ center.x + radius * cos(a), 
+ center.y + radius * sin(a), 
+ IMPLOT_AUTO, IMPLOT_AUTO);
+ }
+ }
+ // Close the shape
+ buffer[i + 1] = buffer[0];
+ 
  // fill
- draw_list.AddConvexPolyFilled(buffer, n + 1, col);
+ draw_list.AddConvexPolyFilled(buffer, n + 2, col);
+ 
  // border (for AA)
  draw_list.AddPolyline(buffer, n + 2, col, 0, 2.0f);
 }
@@ -2254,21 +2290,21 @@ void PlotPieChartEx(const char* const label_ids[], const T* values, int count, I
  ImPlotPoint Pmax = ImPlotPoint(center.x + radius, center.y + radius);
  for (int i = 0; i < count; ++i) {
  ImPlotItem* item = GetItem(label_ids[i]);
-
  const double percent = normalize ? (double)values[i] / sum : (double)values[i];
  const bool skip = sum <= 0.0 || (ignore_hidden && item != nullptr && !item->Show);
  if (!skip)
  a1 = a0 + 2 * IM_PI * percent;
 
  if (BeginItemEx(label_ids[i], FitterRect(Pmin, Pmax))) {
+ const bool hovered = ImPlot::IsLegendEntryHovered(label_ids[i]) && ImHasFlag(flags, ImPlotPieChartFlags_Exploding);
  if (sum > 0.0) {
  ImU32 col = GetCurrentItem()->Color;
  if (percent < 0.5) {
- RenderPieSlice(draw_list, center, radius, a0, a1, col);
+ RenderPieSlice(draw_list, center, radius, a0, a1, col, hovered);
  }
  else {
- RenderPieSlice(draw_list, center, radius, a0, a0 + (a1 - a0) * 0.5, col);
- RenderPieSlice(draw_list, center, radius, a0 + (a1 - a0) * 0.5, a1, col);
+ RenderPieSlice(draw_list, center, radius, a0, a0 + (a1 - a0) * 0.5, col, hovered);
+ RenderPieSlice(draw_list, center, radius, a0 + (a1 - a0) * 0.5, a1, col, hovered);
  }
  }
  EndItem();
@@ -2320,7 +2356,9 @@ void PlotPieChart(const char* const label_ids[], const T* values, int count, dou
  fmt((double)values[i], buffer, 32, fmt_data);
  ImVec2 size = ImGui::CalcTextSize(buffer);
  double angle = a0 + (a1 - a0) * 0.5;
- ImVec2 pos = PlotToPixels(center.x + 0.5 * radius * cos(angle), center.y + 0.5 * radius * sin(angle), IMPLOT_AUTO, IMPLOT_AUTO);
+ const bool hovered = ImPlot::IsLegendEntryHovered(label_ids[i]) && ImHasFlag(flags, ImPlotPieChartFlags_Exploding);
+ const double offset = (hovered ? 0.6 : 0.5) * radius; 
+ ImVec2 pos = PlotToPixels(center.x + offset * cos(angle), center.y + offset * sin(angle), IMPLOT_AUTO, IMPLOT_AUTO);
  ImU32 col = CalcTextColor(ImGui::ColorConvertU32ToFloat4(item->Color));
  draw_list.AddText(pos - size * 0.5f, col, buffer);
  }
@@ -2806,3 +2844,5 @@ void PlotDummy(const char* label_id, ImPlotDummyFlags flags) {
 }
 
 } // namespace ImPlot
+
+#endif // #ifndef IMGUI_DISABLE