mirror of
https://github.com/gwm17/implot.git
synced 2024-11-22 18:28:53 -05:00
add ImPlotColormapScaleFlags
This commit is contained in:
Evan Pezent
parent
6f4986b14f
commit
0f4d4dccc3
57
implot.cpp
57
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.
|
||||
|
||||
- 2022/06/19 (0.14) - The signature of ColormapScale has changed to accommodate a new ImPlotColormapScaleFlags parameter
|
||||
- 2022/06/17 (0.14) - **IMPORTANT** All PlotX functions now take an ImPlotX_Flags `flags` parameter. Where applicable, it is located before the existing `offset` and `stride` parameters.
|
||||
If you were providing offset and stride values, you will need to update your function call to include a `flags` value. If you fail to do this, you will likely see
|
||||
unexpected results or crashes without a compiler warning since these three are all default args. We apologize for the inconvenience, but this was a necessary evil.
|
||||
|
|
@ -4451,7 +4452,7 @@ void RenderColorBar(const ImU32* colors, int size, ImDrawList& DrawList, const I
|
|||
}
|
||||
}
|
||||
|
||||
void ColormapScale(const char* label, double scale_min, double scale_max, const ImVec2& size, ImPlotColormap cmap, const char* fmt) {
|
||||
void ColormapScale(const char* label, double scale_min, double scale_max, const ImVec2& size, const char* format, ImPlotColormapScaleFlags flags, ImPlotColormap cmap) {
|
||||
ImGuiContext &G = *GImGui;
|
||||
ImGuiWindow * Window = G.CurrentWindow;
|
||||
if (Window->SkipItems)
|
||||
|
|
@ -4459,7 +4460,9 @@ void ColormapScale(const char* label, double scale_min, double scale_max, const
|
|||
|
||||
const ImGuiID ID = Window->GetID(label);
|
||||
ImVec2 label_size(0,0);
|
||||
label_size = ImGui::CalcTextSize(label,NULL,true);
|
||||
if (!ImHasFlag(flags, ImPlotColormapScaleFlags_NoLabel)) {
|
||||
label_size = ImGui::CalcTextSize(label,NULL,true);
|
||||
}
|
||||
|
||||
ImPlotContext& gp = *GImPlot;
|
||||
cmap = cmap == IMPLOT_AUTO ? gp.Style.Colormap : cmap;
|
||||
|
|
@ -4471,16 +4474,16 @@ void ColormapScale(const char* label, double scale_min, double scale_max, const
|
|||
|
||||
ImPlotRange range(scale_min,scale_max);
|
||||
gp.CTicker.Reset();
|
||||
Locator_Default(gp.CTicker, range, frame_size.y, true, Formatter_Default, (void*)fmt);
|
||||
Locator_Default(gp.CTicker, range, frame_size.y, true, Formatter_Default, (void*)format);
|
||||
|
||||
const bool rend_label = label_size.x > 0;
|
||||
const float txt_off = gp.Style.LabelPadding.x;
|
||||
const float pad_right = txt_off + gp.CTicker.MaxSize.x + (label_size.x > 0 ? txt_off + label_size.y : 0);
|
||||
const float pad = txt_off + gp.CTicker.MaxSize.x + (rend_label ? txt_off + label_size.y : 0);
|
||||
float bar_w = 20;
|
||||
|
||||
if (frame_size.x == 0)
|
||||
frame_size.x = bar_w + pad_right + 2 * gp.Style.PlotPadding.x;
|
||||
frame_size.x = bar_w + pad + 2 * gp.Style.PlotPadding.x;
|
||||
else {
|
||||
bar_w = frame_size.x - (pad_right + 2 * gp.Style.PlotPadding.x);
|
||||
bar_w = frame_size.x - (pad + 2 * gp.Style.PlotPadding.x);
|
||||
if (bar_w < gp.Style.MajorTickLen.y)
|
||||
bar_w = gp.Style.MajorTickLen.y;
|
||||
}
|
||||
|
|
@ -4492,24 +4495,44 @@ void ColormapScale(const char* label, double scale_min, double scale_max, const
|
|||
return;
|
||||
|
||||
ImGui::RenderFrame(bb_frame.Min, bb_frame.Max, GetStyleColorU32(ImPlotCol_FrameBg), true, G.Style.FrameRounding);
|
||||
ImRect bb_grad(bb_frame.Min + gp.Style.PlotPadding, bb_frame.Min + ImVec2(bar_w + gp.Style.PlotPadding.x, frame_size.y - gp.Style.PlotPadding.y));
|
||||
|
||||
const bool opposite = ImHasFlag(flags, ImPlotColormapScaleFlags_Opposite);
|
||||
float bb_grad_shift = opposite ? pad : 0;
|
||||
ImRect bb_grad(bb_frame.Min + gp.Style.PlotPadding + ImVec2(bb_grad_shift, 0),
|
||||
bb_frame.Min + ImVec2(bar_w + gp.Style.PlotPadding.x + bb_grad_shift,
|
||||
frame_size.y - gp.Style.PlotPadding.y));
|
||||
|
||||
ImGui::PushClipRect(bb_frame.Min, bb_frame.Max, true);
|
||||
RenderColorBar(gp.ColormapData.GetKeys(cmap), gp.ColormapData.GetKeyCount(cmap), DrawList, bb_grad, true, true, !gp.ColormapData.IsQual(cmap));
|
||||
const ImU32 col_tick = GetStyleColorU32(ImPlotCol_AxisText);
|
||||
const ImU32 col_text = ImGui::GetColorU32(ImGuiCol_Text);
|
||||
|
||||
const bool invert = ImHasFlag(flags, ImPlotColormapScaleFlags_Invert);
|
||||
const float y_min = invert ? bb_grad.Max.y : bb_grad.Min.y;
|
||||
const float y_max = invert ? bb_grad.Min.y : bb_grad.Max.y;
|
||||
|
||||
RenderColorBar(gp.ColormapData.GetKeys(cmap), gp.ColormapData.GetKeyCount(cmap), DrawList, bb_grad, true, !invert, !gp.ColormapData.IsQual(cmap));
|
||||
for (int i = 0; i < gp.CTicker.TickCount(); ++i) {
|
||||
const float ypos = ImRemap((float)gp.CTicker.Ticks[i].PlotPos, (float)range.Max, (float)range.Min, bb_grad.Min.y, bb_grad.Max.y);
|
||||
const double y_pos_plt = gp.CTicker.Ticks[i].PlotPos;
|
||||
const float y_pos = ImRemap((float)y_pos_plt, (float)range.Max, (float)range.Min, y_min, y_max);
|
||||
const float tick_width = gp.CTicker.Ticks[i].Major ? gp.Style.MajorTickLen.y : gp.Style.MinorTickLen.y;
|
||||
const float tick_thick = gp.CTicker.Ticks[i].Major ? gp.Style.MajorTickSize.y : gp.Style.MinorTickSize.y;
|
||||
if (ypos < bb_grad.Max.y - 2 && ypos > bb_grad.Min.y + 2)
|
||||
DrawList.AddLine(ImVec2(bb_grad.Max.x-1, ypos), ImVec2(bb_grad.Max.x - tick_width, ypos), col_tick, tick_thick);
|
||||
DrawList.AddText(ImVec2(bb_grad.Max.x-1, ypos) + ImVec2(txt_off, -gp.CTicker.Ticks[i].LabelSize.y * 0.5f), col_text, gp.CTicker.GetText(i));
|
||||
const float tick_t = (float)((y_pos_plt - scale_min) / (scale_max - scale_min));
|
||||
const ImU32 tick_col = CalcTextColor(GImPlot->ColormapData.LerpTable(cmap,tick_t));
|
||||
if (y_pos < bb_grad.Max.y - 2 && y_pos > bb_grad.Min.y + 2) {
|
||||
DrawList.AddLine(opposite ? ImVec2(bb_grad.Min.x+1, y_pos) : ImVec2(bb_grad.Max.x-1, y_pos),
|
||||
opposite ? ImVec2(bb_grad.Min.x + tick_width, y_pos) : ImVec2(bb_grad.Max.x - tick_width, y_pos),
|
||||
tick_col,
|
||||
tick_thick);
|
||||
}
|
||||
const float txt_x = opposite ? bb_grad.Min.x - txt_off - gp.CTicker.Ticks[i].LabelSize.x : bb_grad.Max.x + txt_off;
|
||||
const float txt_y = y_pos - gp.CTicker.Ticks[i].LabelSize.y * 0.5f;
|
||||
DrawList.AddText(ImVec2(txt_x, txt_y), col_text, gp.CTicker.GetText(i));
|
||||
}
|
||||
if (label_size.x > 0) {
|
||||
ImVec2 label_pos(bb_grad.Max.x - 1 + 2*txt_off + gp.CTicker.MaxSize.x, bb_grad.GetCenter().y + label_size.x*0.5f );
|
||||
|
||||
if (rend_label) {
|
||||
const float pos_x = opposite ? bb_frame.Min.x + gp.Style.PlotPadding.x : bb_grad.Max.x + 2 * txt_off + gp.CTicker.MaxSize.x;
|
||||
const float pos_y = bb_grad.GetCenter().y + label_size.x * 0.5f;
|
||||
const char* label_end = ImGui::FindRenderedTextEnd(label);
|
||||
AddTextVertical(&DrawList,label_pos,col_text,label,label_end);
|
||||
AddTextVertical(&DrawList,ImVec2(pos_x,pos_y),col_text,label,label_end);
|
||||
}
|
||||
DrawList.AddRect(bb_grad.Min, bb_grad.Max, GetStyleColorU32(ImPlotCol_PlotBorder));
|
||||
ImGui::PopClipRect();
|
||||
|
|
|
|||
76
implot.h
76
implot.h
|
|
@ -76,40 +76,40 @@
|
|||
struct ImPlotContext; // ImPlot context (opaque struct, see implot_internal.h)
|
||||
|
||||
// Enums/Flags
|
||||
typedef int ImAxis; // -> enum ImAxis_
|
||||
typedef int ImPlotFlags; // -> enum ImPlotFlags_
|
||||
typedef int ImPlotAxisFlags; // -> enum ImPlotAxisFlags_
|
||||
typedef int ImPlotSubplotFlags; // -> enum ImPlotSubplotFlags_
|
||||
typedef int ImPlotLegendFlags; // -> enum ImPlotLegendFlags_
|
||||
typedef int ImPlotMouseTextFlags; // -> enum ImPlotMouseTextFlags_
|
||||
typedef int ImPlotDragToolFlags; // -> ImPlotDragToolFlags_
|
||||
typedef int ImAxis; // -> enum ImAxis_
|
||||
typedef int ImPlotFlags; // -> enum ImPlotFlags_
|
||||
typedef int ImPlotAxisFlags; // -> enum ImPlotAxisFlags_
|
||||
typedef int ImPlotSubplotFlags; // -> enum ImPlotSubplotFlags_
|
||||
typedef int ImPlotLegendFlags; // -> enum ImPlotLegendFlags_
|
||||
typedef int ImPlotMouseTextFlags; // -> enum ImPlotMouseTextFlags_
|
||||
typedef int ImPlotDragToolFlags; // -> ImPlotDragToolFlags_
|
||||
typedef int ImPlotColormapScaleFlags; // -> ImPlotColormapScaleFlags_
|
||||
typedef int ImPlotItemFlags; // -> ImPlotItemFlags_
|
||||
typedef int ImPlotLineFlags; // -> ImPlotLineFlags_
|
||||
typedef int ImPlotScatterFlags; // -> ImPlotScatterFlags
|
||||
typedef int ImPlotStairsFlags; // -> ImPlotStairsFlags_
|
||||
typedef int ImPlotShadedFlags; // -> ImPlotShadedFlags_
|
||||
typedef int ImPlotBarsFlags; // -> ImPlotBarsFlags_
|
||||
typedef int ImPlotBarGroupsFlags; // -> ImPlotBarGroupsFlags_
|
||||
typedef int ImPlotErrorBarsFlags; // -> ImPlotErrorBarsFlags_
|
||||
typedef int ImPlotStemsFlags; // -> ImPlotStemsFlags_
|
||||
typedef int ImPlotInfLinesFlags; // -> ImPlotInfLinesFlags_
|
||||
typedef int ImPlotPieChartFlags; // -> ImPlotPieChartFlags_
|
||||
typedef int ImPlotHeatmapFlags; // -> ImPlotHeatmapFlags_
|
||||
typedef int ImPlotHistogramFlags; // -> ImPlotHistogramFlags_
|
||||
typedef int ImPlotDigitalFlags; // -> ImPlotDigitalFlags_
|
||||
typedef int ImPlotImageFlags; // -> ImPlotImageFlags_
|
||||
typedef int ImPlotTextFlags; // -> ImPlotTextFlags_
|
||||
typedef int ImPlotDummyFlags; // -> ImPlotDummyFlags_
|
||||
|
||||
typedef int ImPlotItemFlags; // -> ImPlotItemFlags_
|
||||
typedef int ImPlotLineFlags; // -> ImPlotLineFlags_
|
||||
typedef int ImPlotScatterFlags; // -> ImPlotScatterFlags
|
||||
typedef int ImPlotStairsFlags; // -> ImPlotStairsFlags_
|
||||
typedef int ImPlotShadedFlags; // -> ImPlotShadedFlags_
|
||||
typedef int ImPlotBarsFlags; // -> ImPlotBarsFlags_
|
||||
typedef int ImPlotBarGroupsFlags; // -> ImPlotBarGroupsFlags_
|
||||
typedef int ImPlotErrorBarsFlags; // -> ImPlotErrorBarsFlags_
|
||||
typedef int ImPlotStemsFlags; // -> ImPlotStemsFlags_
|
||||
typedef int ImPlotInfLinesFlags; // -> ImPlotInfLinesFlags_
|
||||
typedef int ImPlotPieChartFlags; // -> ImPlotPieChartFlags_
|
||||
typedef int ImPlotHeatmapFlags; // -> ImPlotHeatmapFlags_
|
||||
typedef int ImPlotHistogramFlags; // -> ImPlotHistogramFlags_
|
||||
typedef int ImPlotDigitalFlags; // -> ImPlotDigitalFlags_
|
||||
typedef int ImPlotImageFlags; // -> ImPlotImageFlags_
|
||||
typedef int ImPlotTextFlags; // -> ImPlotTextFlags_
|
||||
typedef int ImPlotDummyFlags; // -> ImPlotDummyFlags_
|
||||
|
||||
typedef int ImPlotCond; // -> enum ImPlotCond_
|
||||
typedef int ImPlotCol; // -> enum ImPlotCol_
|
||||
typedef int ImPlotStyleVar; // -> enum ImPlotStyleVar_
|
||||
typedef int ImPlotScale; // -> enum ImPlotScale_
|
||||
typedef int ImPlotMarker; // -> enum ImPlotMarker_
|
||||
typedef int ImPlotColormap; // -> enum ImPlotColormap_
|
||||
typedef int ImPlotLocation; // -> enum ImPlotLocation_
|
||||
typedef int ImPlotBin; // -> enum ImPlotBin_
|
||||
typedef int ImPlotCond; // -> enum ImPlotCond_
|
||||
typedef int ImPlotCol; // -> enum ImPlotCol_
|
||||
typedef int ImPlotStyleVar; // -> enum ImPlotStyleVar_
|
||||
typedef int ImPlotScale; // -> enum ImPlotScale_
|
||||
typedef int ImPlotMarker; // -> enum ImPlotMarker_
|
||||
typedef int ImPlotColormap; // -> enum ImPlotColormap_
|
||||
typedef int ImPlotLocation; // -> enum ImPlotLocation_
|
||||
typedef int ImPlotBin; // -> enum ImPlotBin_
|
||||
|
||||
// Axis indices. The values assigned may change; NEVER hardcode these.
|
||||
enum ImAxis_ {
|
||||
|
|
@ -207,6 +207,14 @@ enum ImPlotDragToolFlags_ {
|
|||
ImPlotDragToolFlags_Delayed = 1 << 3, // tool rendering will be delayed one frame; useful when applying position-constraints
|
||||
};
|
||||
|
||||
// Flags for ColormapScale
|
||||
enum ImPlotColormapScaleFlags_ {
|
||||
ImPlotColormapScaleFlags_None = 0, // default
|
||||
ImPlotColormapScaleFlags_NoLabel = 1 << 0, // the colormap axis label will not be displayed
|
||||
ImPlotColormapScaleFlags_Opposite = 1 << 1, // render the colormap label and tick labels on the opposite side
|
||||
ImPlotColormapScaleFlags_Invert = 1 << 2, // invert the colormap axis scale
|
||||
};
|
||||
|
||||
// Flags for ANY PlotX function
|
||||
enum ImPlotItemFlags_ {
|
||||
ImPlotItemFlags_None = 0,
|
||||
|
|
@ -1157,7 +1165,7 @@ IMPLOT_API ImVec4 GetColormapColor(int idx, ImPlotColormap cmap = IMPLOT_AUTO);
|
|||
IMPLOT_API ImVec4 SampleColormap(float t, ImPlotColormap cmap = IMPLOT_AUTO);
|
||||
|
||||
// Shows a vertical color scale with linear spaced ticks using the specified color map. Use double hashes to hide label (e.g. "##NoLabel").
|
||||
IMPLOT_API void ColormapScale(const char* label, double scale_min, double scale_max, const ImVec2& size = ImVec2(0,0), ImPlotColormap cmap = IMPLOT_AUTO, const char* format = "%g");
|
||||
IMPLOT_API void ColormapScale(const char* label, double scale_min, double scale_max, const ImVec2& size = ImVec2(0,0), const char* format = "%g", ImPlotColormapScaleFlags flags = 0, ImPlotColormap cmap = IMPLOT_AUTO);
|
||||
// Shows a horizontal slider with a colormap gradient background. Optionally returns the color sampled at t in [0 1].
|
||||
IMPLOT_API bool ColormapSlider(const char* label, float* t, ImVec4* out = NULL, const char* format = "", ImPlotColormap cmap = IMPLOT_AUTO);
|
||||
// Shows a button with a colormap gradient brackground.
|
||||
|
|
|
|||
|
|
@ -2062,16 +2062,24 @@ void Demo_LegendPopups() {
|
|||
|
||||
void Demo_ColormapWidgets() {
|
||||
static int cmap = ImPlotColormap_Viridis;
|
||||
|
||||
if (ImPlot::ColormapButton("Button",ImVec2(0,0),cmap)) {
|
||||
cmap = (cmap + 1) % ImPlot::GetColormapCount();
|
||||
}
|
||||
|
||||
static float t = 0.5f;
|
||||
static ImVec4 col;
|
||||
ImGui::ColorButton("##Display",col,ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::SameLine();
|
||||
ImPlot::ColormapSlider("Slider", &t, &col, "%.3f", cmap);
|
||||
|
||||
ImPlot::ColormapIcon(cmap); ImGui::SameLine(); ImGui::Text("Icon");
|
||||
ImPlot::ColormapScale("Scale",0,1,ImVec2(0,0),cmap);
|
||||
|
||||
static ImPlotColormapScaleFlags flags = 0;
|
||||
ImPlot::ColormapScale("Scale",0,100,ImVec2(0,0),"%g dB",flags,cmap);
|
||||
CHECKBOX_FLAG(flags, ImPlotColormapScaleFlags_NoLabel);
|
||||
CHECKBOX_FLAG(flags, ImPlotColormapScaleFlags_Opposite);
|
||||
CHECKBOX_FLAG(flags, ImPlotColormapScaleFlags_Invert);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user