gwm17/implot
1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-11-23 02:38:53 -05:00
Code Issues Projects Releases Wiki Activity

Curors

Browse Source 
Cursors query handling
This commit is contained in:
ozlb 2020-05-04 09:09:33 +02:00 committed by GitHub
parent d32567fe15
commit 2338c9b4c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 248 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
implot.cpp
View File

@ -26,8 +26,8 @@
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <implot.h> #include "implot.h"
#include <imgui_internal.h> #include "imgui_internal.h"
#define IM_NORMALIZE2F_OVER_ZERO(VX, VY) \ #define IM_NORMALIZE2F_OVER_ZERO(VX, VY) \
{ \ { \
@ -62,7 +62,8 @@ ImPlotStyle::ImPlotStyle() {
Colors[ImPlotCol_XAxis] = IM_COL_AUTO; Colors[ImPlotCol_XAxis] = IM_COL_AUTO;
Colors[ImPlotCol_YAxis] = IM_COL_AUTO; Colors[ImPlotCol_YAxis] = IM_COL_AUTO;
Colors[ImPlotCol_Selection] = ImVec4(1,1,0,1); Colors[ImPlotCol_Selection] = ImVec4(1,1,0,1);
Colors[ImPlotCol_Query] = ImVec4(0,1,0,1); Colors[ImPlotCol_Query] = ImVec4(0,1,0,1);
Colors[ImPlotCol_Cursors] = ImVec4(1,0,0,1);
} }
ImPlotRange::ImPlotRange() { ImPlotRange::ImPlotRange() {
@ -223,7 +224,9 @@ struct ImPlotAxis {
struct ImPlot { struct ImPlot {
ImPlot() { ImPlot() {
Selecting = Querying = Queried = DraggingQuery = false; Selecting = Querying = Queried = DraggingQuery = false;
DraggingCursor[0] = DraggingCursor[1] = false;
SelectStart = QueryStart = ImVec2(0,0); SelectStart = QueryStart = ImVec2(0,0);
CursorsRange = ImPlotRange();
Flags = ImPlotFlags_Default; Flags = ImPlotFlags_Default;
ColorIdx = 0; ColorIdx = 0;
} }
@ -238,6 +241,9 @@ struct ImPlot {
ImRect QueryRect; // relative to BB_grid!! ImRect QueryRect; // relative to BB_grid!!
bool DraggingQuery; bool DraggingQuery;
ImPlotRange QueryRange; ImPlotRange QueryRange;
bool DraggingCursor[2];
ImRect CursorRect[2]; // relative to BB_grid!!
ImPlotRange CursorsRange;
ImPlotAxis XAxis; ImPlotAxis XAxis;
ImPlotAxis YAxis; ImPlotAxis YAxis;
ImPlotFlags Flags; ImPlotFlags Flags;
@ -314,6 +320,7 @@ struct ImPlotContext {
Col_Txt, Col_TxtDis, Col_Txt, Col_TxtDis,
Col_SlctBg, Col_SlctBd, Col_SlctBg, Col_SlctBd,
Col_QryBg, Col_QryBd, Col_QryBg, Col_QryBd,
Col_Cursors,
Col_XMajor, Col_XMinor, Col_XTxt, Col_XMajor, Col_XMinor, Col_XTxt,
Col_YMajor, Col_YMinor, Col_YTxt; Col_YMajor, Col_YMinor, Col_YTxt;
@ -599,6 +606,8 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons
gp.Col_QryBg = GetColorU32(gp.Style.Colors[ImPlotCol_Query] * ImVec4(1,1,1,0.25f)); gp.Col_QryBg = GetColorU32(gp.Style.Colors[ImPlotCol_Query] * ImVec4(1,1,1,0.25f));
gp.Col_QryBd = GetColorU32(gp.Style.Colors[ImPlotCol_Query]); gp.Col_QryBd = GetColorU32(gp.Style.Colors[ImPlotCol_Query]);
gp.Col_Cursors = GetColorU32(gp.Style.Colors[ImPlotCol_Cursors]);
// BB AND HOVER ----------------------------------------------------------- // BB AND HOVER -----------------------------------------------------------
// frame // frame
@ -710,6 +719,56 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons
} }
} }
//CURSORS
bool hov_cursor[2];
for (size_t i = 0; i < 2; i++)
{
hov_cursor[i] = plot.CursorRect[i].Contains(IO.MousePos);
//x limits
bool xAtMax = false;
if (plot.CursorRect[i].Min.x <= gp.BB_Grid.Min.x) {
plot.CursorRect[i].Min.x = gp.BB_Grid.Min.x;
}
if (plot.CursorRect[i].Max.x >= (gp.BB_Grid.Max.x)) {
plot.CursorRect[i].Max.x = gp.BB_Grid.Max.x;
xAtMax = true;
}
//min cursor "line" width
if ((plot.CursorRect[i].Max.x - plot.CursorRect[i].Min.x) < 2) {
if (xAtMax)
plot.CursorRect[i].Min.x = plot.CursorRect[i].Max.x - 2;
else
plot.CursorRect[i].Max.x = plot.CursorRect[i].Min.x + 2;
}
//y locked to min max grid
plot.CursorRect[i].Min.y = gp.BB_Grid.Min.y;
plot.CursorRect[i].Max.y = gp.BB_Grid.Max.y;
// CURSOR1 DRAG -------------------------------------------------------------
if (plot.DraggingCursor[i] && (IO.MouseReleased[0] || !IO.MouseDown[0])) {
plot.DraggingCursor[i] = false;
}
if (plot.DraggingCursor[i]) {
ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeEW);
plot.CursorRect[i].Min += IO.MouseDelta;
plot.CursorRect[i].Max += IO.MouseDelta;
//x limits
//if (plot.CursorRect[i].Min.x < gp.BB_Grid.Min.x) plot.CursorRect[i].Min.x = gp.BB_Grid.Min.x;
//if (plot.CursorRect[i].Max.x > (gp.BB_Grid.Max.x - 10)) plot.CursorRect[i].Max.x = gp.BB_Grid.Max.x - 10;
}
if (gp.Hov_Frame && hov_cursor[i] && !plot.DraggingCursor[i] && !plot.Selecting && !plot.DraggingQuery && !hov_legend) {
ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeEW);
if (IO.MouseDown[0] && !plot.XAxis.Dragging && !plot.YAxis.Dragging) {
//allow only one cursor dragging per time
if (i==0)
plot.DraggingCursor[i] = !plot.DraggingCursor[1];
else
plot.DraggingCursor[i] = !plot.DraggingCursor[0];
}
}
}
plot.CursorsRange.XMin = gp.FromPixels(plot.CursorRect[0].Min).x;
plot.CursorsRange.XMax = gp.FromPixels(plot.CursorRect[1].Max).x;
// DRAG INPUT ------------------------------------------------------------- // DRAG INPUT -------------------------------------------------------------
// end drags // end drags
@ -748,9 +807,9 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons
ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeAll); ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeAll);
} }
// start drag // start drag
if (gp.Hov_Frame && hov_x_axis_region && IO.MouseDragMaxDistanceSqr[0] > 5 && !plot.Selecting && !hov_legend && !hov_query && !plot.DraggingQuery) if (gp.Hov_Frame && hov_x_axis_region && IO.MouseDragMaxDistanceSqr[0] > 5 && !plot.Selecting && !hov_legend && !hov_query && !plot.DraggingQuery && !hov_cursor[0] && !plot.DraggingCursor[0] && !hov_cursor[1] && !plot.DraggingCursor[1])
plot.XAxis.Dragging = true; plot.XAxis.Dragging = true;
if (gp.Hov_Frame && hov_y_axis_region && IO.MouseDragMaxDistanceSqr[0] > 5 && !plot.Selecting && !hov_legend && !hov_query && !plot.DraggingQuery) if (gp.Hov_Frame && hov_y_axis_region && IO.MouseDragMaxDistanceSqr[0] > 5 && !plot.Selecting && !hov_legend && !hov_query && !plot.DraggingQuery && !hov_cursor[0] && !plot.DraggingCursor[0] && !hov_cursor[1] && !plot.DraggingCursor[1])
plot.YAxis.Dragging = true; plot.YAxis.Dragging = true;
// SCROLL INPUT ----------------------------------------------------------- // SCROLL INPUT -----------------------------------------------------------
@ -866,7 +925,7 @@ bool BeginPlot(const char* title, const char* x_label, const char* y_label, cons
// DOUBLE CLICK ----------------------------------------------------------- // DOUBLE CLICK -----------------------------------------------------------
if ( IO.MouseDoubleClicked[0] && gp.Hov_Frame && (hov_x_axis_region || hov_y_axis_region) && !hov_legend && !hov_query) { if ( IO.MouseDoubleClicked[0] && gp.Hov_Frame && (hov_x_axis_region || hov_y_axis_region) && !hov_legend && !hov_query && !hov_cursor[0] && !hov_cursor[1]) {
gp.FitThisFrame = true; gp.FitThisFrame = true;
gp.FitX = hov_x_axis_region; gp.FitX = hov_x_axis_region;
gp.FitY = hov_y_axis_region; gp.FitY = hov_y_axis_region;
@ -1045,6 +1104,9 @@ void PlotContextMenu(ImPlot& plot) {
if (ImGui::MenuItem("Pixel Query",NULL,HasFlag(plot.Flags, ImPlotFlags_PixelQuery))) { if (ImGui::MenuItem("Pixel Query",NULL,HasFlag(plot.Flags, ImPlotFlags_PixelQuery))) {
FlipFlag(plot.Flags, ImPlotFlags_PixelQuery); FlipFlag(plot.Flags, ImPlotFlags_PixelQuery);
} }
if (ImGui::MenuItem("Show cursors",NULL,HasFlag(plot.Flags, ImPlotFlags_Cursors))) {
FlipFlag(plot.Flags, ImPlotFlags_Cursors);
}
if (ImGui::MenuItem("Crosshairs",NULL,HasFlag(plot.Flags, ImPlotFlags_Crosshairs))) { if (ImGui::MenuItem("Crosshairs",NULL,HasFlag(plot.Flags, ImPlotFlags_Crosshairs))) {
FlipFlag(plot.Flags, ImPlotFlags_Crosshairs); FlipFlag(plot.Flags, ImPlotFlags_Crosshairs);
} }
@ -1155,6 +1217,12 @@ void EndPlot() {
DrawList.AddRect( Min, Max, gp.Col_QryBd); DrawList.AddRect( Min, Max, gp.Col_QryBd);
} }
//render cursors
if (HasFlag(plot.Flags, ImPlotFlags_Cursors)) {
DrawList.AddRectFilled(plot.CursorRect[0].Min, plot.CursorRect[0].Max, gp.Col_Cursors);
DrawList.AddRectFilled(plot.CursorRect[1].Min, plot.CursorRect[1].Max, gp.Col_Cursors);
}
// render legend // render legend
const float txt_ht = GetTextLineHeight(); const float txt_ht = GetTextLineHeight();
const ImVec2 legend_offset(10, 10); const ImVec2 legend_offset(10, 10);
@ -1376,6 +1444,12 @@ ImPlotRange GetPlotQuery() {
return plot.QueryRange; return plot.QueryRange;
} }
ImPlotRange GetPlotCursors() {
IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "GetPlotCursors() Needs to be called between BeginPlot() and EndPlot()!");
ImPlot& plot = *gp.CurrentPlot;
return plot.CursorsRange;
}
//============================================================================= //=============================================================================
// STYLING // STYLING
//============================================================================= //=============================================================================
@ -1712,7 +1786,7 @@ void Plot(const char* label_id, ImVec2 (*getter)(void* data, int idx), void* dat
float dy = p2.y - p1.y; float dy = p2.y - p1.y;
IM_NORMALIZE2F_OVER_ZERO(dx, dy); IM_NORMALIZE2F_OVER_ZERO(dx, dy);
dx *= (line_weight * 0.5f); 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.x = p1.x + dy;
DrawList._VtxWritePtr[0].pos.y = p1.y - dx; DrawList._VtxWritePtr[0].pos.y = p1.y - dx;
DrawList._VtxWritePtr[0].uv = uv; DrawList._VtxWritePtr[0].uv = uv;
@ -1783,6 +1857,154 @@ void Plot(const char* label_id, ImVec2 (*getter)(void* data, int idx), void* dat
ImGui::PopClipRect(); ImGui::PopClipRect();
} }
void PlotP(const char* label_id, const float* xs, const float* ys, int count, int offset) {
IM_ASSERT_USER_ERROR(gp.CurrentPlot != NULL, "PlotP() Needs to be called between BeginPlot() and EndPlot()!");
ImPlotItem* item = gp.RegisterItem(label_id);
if (!item->Show)
return;
ImDrawList &DrawList = *ImGui::GetWindowDrawList();
const bool rend_line = gp.Style.Colors[ImPlotCol_Line].w != 0 && gp.Style.LineWeight > 0;
const bool rend_mk_line = gp.Style.Colors[ImPlotCol_MarkerOutline].w != 0 && gp.Style.MarkerWeight > 0;
const bool rend_mk_fill = gp.Style.Colors[ImPlotCol_MarkerFill].w != 0;
ImU32 col_line = gp.Style.Colors[ImPlotCol_Line].w == -1 ? GetColorU32(item->Color) : GetColorU32(gp.Style.Colors[ImPlotCol_Line]);
ImU32 col_mk_line = gp.Style.Colors[ImPlotCol_MarkerOutline].w == -1 ? col_line : GetColorU32(gp.Style.Colors[ImPlotCol_MarkerOutline]);
ImU32 col_mk_fill = gp.Style.Colors[ImPlotCol_MarkerFill].w == -1 ? col_line : GetColorU32(gp.Style.Colors[ImPlotCol_MarkerFill]);
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 = {xs[i], ys[i]};
gp.FitPoint(p);
}
}
ImGui::PushClipRect(gp.BB_Grid.Min, gp.BB_Grid.Max, true);
bool cull = HasFlag(gp.CurrentPlot->Flags, ImPlotFlags_CullData);
const float line_weight = item->Highlight ? gp.Style.LineWeight * 2 : gp.Style.LineWeight;
// render line segments
if (count > 1 && rend_line) {
const int segments = count - 1;
int i1 = offset;
ImVec2 p1, p2;
if (HasFlag(gp.CurrentPlot->Flags, ImPlotFlags_AntiAliased)) {
for (int s = 0; s < segments; ++s) {
const int i2 = (i1 + 1) % count;
p1 = gp.ToPixels({xs[i1], ys[i1]});
p2 = gp.ToPixels({xs[i2], ys[i2]});
i1 = i2;
while (((s+1) < segments) && (round(p2.x) == round(p1.x))) {
const int i2 = (i1 + 1) % count;
p2 = ImMax(p2, gp.ToPixels({xs[i2], ys[i2]}));
i1 = i2;
s++;
}
if (!cull || gp.BB_Grid.Contains(p1) || gp.BB_Grid.Contains(p2))
DrawList.AddLine(p1, p2, col_line, line_weight);
}
}
else {
const int idx_count = segments * 6;
const int vtx_count = segments * 4;
const ImVec2 uv = DrawList._Data->TexUvWhitePixel;
DrawList.PrimReserve(idx_count, vtx_count);
int segments_culled = 0;
for (int s = 0; s < segments; ++s) {
const int i2 = (i1 + 1) % count;
p1 = gp.ToPixels({xs[i1], ys[i1]});
p2 = gp.ToPixels({xs[i2], ys[i2]});
i1 = i2;
while (((s+1) < segments) && (round(p2.x) == round(p1.x))) {
segments_culled++;
const int i2 = (i1 + 1) % count;
p2 = ImMax(p2, gp.ToPixels({xs[i2], ys[i2]}));
i1 = i2;
s++;
}
if (!cull || gp.BB_Grid.Contains(p1) || gp.BB_Grid.Contains(p2)) {
float dx = p2.x - p1.x;
float dy = p2.y - p1.y;
IM_NORMALIZE2F_OVER_ZERO(dx, dy);
dx *= (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;
DrawList._VtxWritePtr[0].col = col_line;
DrawList._VtxWritePtr[1].pos.x = p2.x + dy;
DrawList._VtxWritePtr[1].pos.y = p2.y - dx;
DrawList._VtxWritePtr[1].uv = uv;
DrawList._VtxWritePtr[1].col = col_line;
DrawList._VtxWritePtr[2].pos.x = p2.x - dy;
DrawList._VtxWritePtr[2].pos.y = p2.y + dx;
DrawList._VtxWritePtr[2].uv = uv;
DrawList._VtxWritePtr[2].col = col_line;
DrawList._VtxWritePtr[3].pos.x = p1.x - dy;
DrawList._VtxWritePtr[3].pos.y = p1.y + dx;
DrawList._VtxWritePtr[3].uv = uv;
DrawList._VtxWritePtr[3].col = col_line;
DrawList._VtxWritePtr += 4;
DrawList._IdxWritePtr[0] = (ImDrawIdx)(DrawList._VtxCurrentIdx);
DrawList._IdxWritePtr[1] = (ImDrawIdx)(DrawList._VtxCurrentIdx + 1);
DrawList._IdxWritePtr[2] = (ImDrawIdx)(DrawList._VtxCurrentIdx + 2);
DrawList._IdxWritePtr[3] = (ImDrawIdx)(DrawList._VtxCurrentIdx);
DrawList._IdxWritePtr[4] = (ImDrawIdx)(DrawList._VtxCurrentIdx + 2);
DrawList._IdxWritePtr[5] = (ImDrawIdx)(DrawList._VtxCurrentIdx + 3);
DrawList._IdxWritePtr += 6;
DrawList._VtxCurrentIdx += 4;
}
else {
segments_culled++;
}
}
if (segments_culled > 0)
DrawList.PrimUnreserve(segments_culled * 6, segments_culled * 4);
}
}
// render markers
if (gp.Style.Marker != ImMarker_None) {
int idx = offset;
for (int i = 0; i < count; ++i) {
ImVec2 c;
c = gp.ToPixels({xs[idx], ys[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, ImMarker_Circle))
MakerCircle(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))
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))
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))
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))
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))
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))
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))
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))
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))
MarkerAsterisk(DrawList, c, gp.Style.MarkerSize, rend_mk_line, col_mk_line, rend_mk_fill, col_mk_fill, gp.Style.MarkerWeight);
}
}
}
ImGui::PopClipRect();
}
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
void PlotDigital(const char* label_id, const float* xs, const float* ys, int count, int offset, int stride) { void PlotDigital(const char* label_id, const float* xs, const float* ys, int count, int offset, int stride) {

17
implot.h
View File

@ -23,7 +23,7 @@
// ImPlot v0.1 WIP // ImPlot v0.1 WIP
#pragma once #pragma once
#include <imgui.h> #include "imgui.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Basic types and flags // Basic types and flags
@ -43,10 +43,11 @@ enum ImPlotFlags_ {
ImPlotFlags_Selection = 1 << 3, // the user will be able to box-select with right-mouse ImPlotFlags_Selection = 1 << 3, // the user will be able to box-select with right-mouse
ImPlotFlags_PixelQuery = 1 << 4, // query ranges will not change their pixel position if the plot is scrolled/zoomed ImPlotFlags_PixelQuery = 1 << 4, // query ranges will not change their pixel position if the plot is scrolled/zoomed
ImPlotFlags_ContextMenu = 1 << 5, // the user will be able to open a context menu with double-right click ImPlotFlags_ContextMenu = 1 << 5, // the user will be able to open a context menu with double-right click
ImPlotFlags_Crosshairs = 1 << 6, // the default mouse cursor will be replaced with a crosshair when hovered ImPlotFlags_Cursors = 1 << 6, // show cursors
ImPlotFlags_CullData = 1 << 7, // plot data outside the plot area will be culled from rendering ImPlotFlags_Crosshairs = 1 << 7, // the default mouse cursor will be replaced with a crosshair when hovered
ImPlotFlags_AntiAliased = 1 << 8, // lines and fills will be anti-aliased (not recommended) ImPlotFlags_CullData = 1 << 8, // plot data outside the plot area will be culled from rendering
ImPlotFlags_Default = ImPlotFlags_MousePos | ImPlotFlags_Legend | ImPlotFlags_Highlight | ImPlotFlags_Selection | ImPlotFlags_ContextMenu | ImPlotFlags_CullData ImPlotFlags_AntiAliased = 1 << 9, // lines and fills will be anti-aliased (not recommended)
ImPlotFlags_Default = ImPlotFlags_MousePos | ImPlotFlags_Legend | ImPlotFlags_Highlight | ImPlotFlags_Selection | ImPlotFlags_ContextMenu | ImPlotFlags_Cursors | ImPlotFlags_CullData
}; };
// Options for plot axes (X and Y) // Options for plot axes (X and Y)
@ -77,6 +78,7 @@ enum ImPlotCol_ {
ImPlotCol_YAxis, // x-axis grid/label color (defaults to ImGuiCol_Text) ImPlotCol_YAxis, // x-axis grid/label color (defaults to ImGuiCol_Text)
ImPlotCol_Selection, // box-selection color (defaults to yellow) ImPlotCol_Selection, // box-selection color (defaults to yellow)
ImPlotCol_Query, // box-query color (defaults to green) ImPlotCol_Query, // box-query color (defaults to green)
ImPlotCol_Cursors, // cursor colors (defaults to red)
ImPlotCol_COUNT ImPlotCol_COUNT
}; };
@ -157,6 +159,7 @@ void EndPlot();
void Plot(const char* label_id, const float* values, int count, int offset = 0, int stride = sizeof(float)); void Plot(const char* label_id, const float* values, int count, int offset = 0, int stride = sizeof(float));
void Plot(const char* label_id, const float* xs, const float* ys, int count, int offset = 0, int stride = sizeof(float)); void Plot(const char* label_id, const float* xs, const float* ys, int count, int offset = 0, int stride = sizeof(float));
void Plot(const char* label_id, ImVec2 (*getter)(void* data, int idx), void* data, int count, int offset = 0); void Plot(const char* label_id, ImVec2 (*getter)(void* data, int idx), void* data, int count, int offset = 0);
void PlotP(const char* label_id, const float* xs, const float* ys, int count, int offset = 0);
// Plots digital channels. // Plots digital channels.
void PlotDigital(const char* label_id, const float* xs, const float* ys, int count, int offset = 0, int stride = sizeof(float) + sizeof(bool)); void PlotDigital(const char* label_id, const float* xs, const float* ys, int count, int offset = 0, int stride = sizeof(float) + sizeof(bool));
void PlotDigital(const char* label_id, ImVec2 (*getter)(void* data, int idx), void* data, int count, int offset = 0); void PlotDigital(const char* label_id, ImVec2 (*getter)(void* data, int idx), void* data, int count, int offset = 0);
@ -189,6 +192,8 @@ ImPlotRange GetPlotRange();
bool IsPlotQueried(); bool IsPlotQueried();
/// Returns the current or most recent plot querey range. /// Returns the current or most recent plot querey range.
ImPlotRange GetPlotQuery(); ImPlotRange GetPlotQuery();
/// Returns the current cursors range.
ImPlotRange GetPlotCursors();
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Plot Styling // Plot Styling
@ -249,4 +254,4 @@ void PopPlotClipRect();
// Shows the ImPlot demo. Add implot_demo.cpp to your sources! // Shows the ImPlot demo. Add implot_demo.cpp to your sources!
void ShowImPlotDemoWindow(bool* p_open = NULL); void ShowImPlotDemoWindow(bool* p_open = NULL);
} // namespace ImGui } // namespace ImGui

16
implot_demo.cpp
View File

@ -22,9 +22,9 @@
// ImPlot v0.1 WIP // ImPlot v0.1 WIP
#include <implot.h> #include "implot.h"
#include <math.h> #include "imgui_internal.h"
#include <stdio.h> #include <iostream>
namespace { namespace {
@ -59,7 +59,7 @@ struct RollingData {
ImVector<ImVec2> Data; ImVector<ImVec2> Data;
RollingData() { Data.reserve(1000); } RollingData() { Data.reserve(1000); }
void AddPoint(float x, float y) { void AddPoint(float x, float y) {
float xmod = fmodf(x, Span); float xmod = ImFmod(x, Span);
if (!Data.empty() && xmod < Data.back().x) if (!Data.empty() && xmod < Data.back().x)
Data.shrink(0); Data.shrink(0);
Data.push_back(ImVec2(xmod, y)); Data.push_back(ImVec2(xmod, y));
@ -89,10 +89,10 @@ namespace ImGui {
void ShowImPlotDemoWindow(bool* p_open) { void ShowImPlotDemoWindow(bool* p_open) {
static DemoData data; //static DemoData data;
ImVec2 main_viewport_pos = ImGui::GetMainViewport()->Pos; //ImVec2 main_viewport_pos = ImGui::GetMainViewport()->Pos;
ImGui::SetNextWindowPos(ImVec2(main_viewport_pos.x + 650, main_viewport_pos.y + 20), ImGuiCond_FirstUseEver); //ImGui::SetNextWindowPos(ImVec2(main_viewport_pos.x + 650, main_viewport_pos.y + 20), ImGuiCond_FirstUseEver);
ImGui::SetNextWindowSize(ImVec2(550, 680), ImGuiCond_FirstUseEver); ImGui::SetNextWindowSize(ImVec2(550, 680), ImGuiCond_FirstUseEver);
ImGui::Begin("ImPlot Demo", p_open); ImGui::Begin("ImPlot Demo", p_open);
ImGui::Text("ImPlot says hello. (0.1 WIP)"); ImGui::Text("ImPlot says hello. (0.1 WIP)");
@ -687,7 +687,7 @@ void ShowImPlotDemoWindow(bool* p_open) {
for (int i = 0; i < 100; ++i) { for (int i = 0; i < 100; ++i) {
sprintf(buff, "item_%d",i); sprintf(buff, "item_%d",i);
ImGui::PushPlotColor(ImPlotCol_Line, items[i].Col); ImGui::PushPlotColor(ImPlotCol_Line, items[i].Col);
ImGui::Plot(buff, items[i].Xs, items[i].Ys, 1000); ImGui::PlotP(buff, items[i].Xs, items[i].Ys, 1000, 0);
ImGui::PopPlotColor(); ImGui::PopPlotColor();
} }
ImGui::EndPlot(); ImGui::EndPlot();