mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #602 from brianwatling/optional-chart-boxes

Browse Source 
Add a style option to disable point markers on charts
This commit is contained in:
Rob Loach 2024-04-04 13:17:17 -04:00 committed by GitHub
commit 34ea8bb042
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo/common/overview.c
View File

@ -632,6 +632,7 @@ overview(struct nk_context *ctx)
float id = 0; float id = 0;
static int col_index = -1; static int col_index = -1;
static int line_index = -1; static int line_index = -1;
static int show_markers = nk_true;
float step = (2*3.141592654f) / 32; float step = (2*3.141592654f) / 32;
int i; int i;
@ -640,7 +641,10 @@ overview(struct nk_context *ctx)
/* line chart */ /* line chart */
id = 0; id = 0;
index = -1; index = -1;
nk_layout_row_dynamic(ctx, 15, 1);
nk_checkbox_label(ctx, "Show markers", &show_markers);
nk_layout_row_dynamic(ctx, 100, 1); nk_layout_row_dynamic(ctx, 100, 1);
ctx->style.chart.show_markers = show_markers;
if (nk_chart_begin(ctx, NK_CHART_LINES, 32, -1.0f, 1.0f)) { if (nk_chart_begin(ctx, NK_CHART_LINES, 32, -1.0f, 1.0f)) {
for (i = 0; i < 32; ++i) { for (i = 0; i < 32; ++i) {
nk_flags res = nk_chart_push(ctx, (float)cos(id)); nk_flags res = nk_chart_push(ctx, (float)cos(id));

17
nuklear.h
View File

@ -5220,6 +5220,7 @@ struct nk_style_chart {
struct nk_vec2 padding; struct nk_vec2 padding;
float color_factor; float color_factor;
float disabled_factor; float disabled_factor;
nk_bool show_markers;
}; };
struct nk_style_combo { struct nk_style_combo {
@ -5410,6 +5411,7 @@ struct nk_chart_slot {
int count; int count;
struct nk_vec2 last; struct nk_vec2 last;
int index; int index;
nk_bool show_markers;
}; };
struct nk_chart { struct nk_chart {
@ -18678,6 +18680,7 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
chart->rounding = 0; chart->rounding = 0;
chart->color_factor = 1.0f; chart->color_factor = 1.0f;
chart->disabled_factor = NK_WIDGET_DISABLED_FACTOR; chart->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
chart->show_markers = nk_true;
/* combo */ /* combo */
combo = &style->combo; combo = &style->combo;
@ -28629,7 +28632,8 @@ nk_chart_begin_colored(struct nk_context *ctx, enum nk_chart_type type,
slot->highlight = highlight; slot->highlight = highlight;
slot->min = NK_MIN(min_value, max_value); slot->min = NK_MIN(min_value, max_value);
slot->max = NK_MAX(min_value, max_value); slot->max = NK_MAX(min_value, max_value);
slot->range = slot->max - slot->min;} slot->range = slot->max - slot->min;
slot->show_markers = style->show_markers;}
/* draw chart background */ /* draw chart background */
background = &style->background; background = &style->background;
@ -28681,7 +28685,8 @@ nk_chart_add_slot_colored(struct nk_context *ctx, const enum nk_chart_type type,
slot->highlight = highlight; slot->highlight = highlight;
slot->min = NK_MIN(min_value, max_value); slot->min = NK_MIN(min_value, max_value);
slot->max = NK_MAX(min_value, max_value); slot->max = NK_MAX(min_value, max_value);
slot->range = slot->max - slot->min;} slot->range = slot->max - slot->min;
slot->show_markers = style->show_markers;}
} }
NK_API void NK_API void
nk_chart_add_slot(struct nk_context *ctx, const enum nk_chart_type type, nk_chart_add_slot(struct nk_context *ctx, const enum nk_chart_type type,
@ -28728,7 +28733,9 @@ nk_chart_push_line(struct nk_context *ctx, struct nk_window *win,
i->mouse.buttons[NK_BUTTON_LEFT].clicked) ? NK_CHART_CLICKED: 0; i->mouse.buttons[NK_BUTTON_LEFT].clicked) ? NK_CHART_CLICKED: 0;
color = g->slots[slot].highlight; color = g->slots[slot].highlight;
} }
nk_fill_rect(out, bounds, 0, color); if (g->slots[slot].show_markers) {
nk_fill_rect(out, bounds, 0, color);
}
g->slots[slot].index += 1; g->slots[slot].index += 1;
return ret; return ret;
} }
@ -28752,7 +28759,9 @@ nk_chart_push_line(struct nk_context *ctx, struct nk_window *win,
color = g->slots[slot].highlight; color = g->slots[slot].highlight;
} }
} }
nk_fill_rect(out, nk_rect(cur.x - 2, cur.y - 2, 4, 4), 0, color); if (g->slots[slot].show_markers) {
nk_fill_rect(out, nk_rect(cur.x - 2, cur.y - 2, 4, 4), 0, color);
}
/* save current data point position */ /* save current data point position */
g->slots[slot].last.x = cur.x; g->slots[slot].last.x = cur.x;

2
src/nuklear.h
View File

@ -4998,6 +4998,7 @@ struct nk_style_chart {
struct nk_vec2 padding; struct nk_vec2 padding;
float color_factor; float color_factor;
float disabled_factor; float disabled_factor;
nk_bool show_markers;
}; };
struct nk_style_combo { struct nk_style_combo {
@ -5188,6 +5189,7 @@ struct nk_chart_slot {
int count; int count;
struct nk_vec2 last; struct nk_vec2 last;
int index; int index;
nk_bool show_markers;
}; };
struct nk_chart { struct nk_chart {

14
src/nuklear_chart.c
View File

@ -52,7 +52,8 @@ nk_chart_begin_colored(struct nk_context *ctx, enum nk_chart_type type,
slot->highlight = highlight; slot->highlight = highlight;
slot->min = NK_MIN(min_value, max_value); slot->min = NK_MIN(min_value, max_value);
slot->max = NK_MAX(min_value, max_value); slot->max = NK_MAX(min_value, max_value);
slot->range = slot->max - slot->min;} slot->range = slot->max - slot->min;
slot->show_markers = style->show_markers;}
/* draw chart background */ /* draw chart background */
background = &style->background; background = &style->background;
@ -104,7 +105,8 @@ nk_chart_add_slot_colored(struct nk_context *ctx, const enum nk_chart_type type,
slot->highlight = highlight; slot->highlight = highlight;
slot->min = NK_MIN(min_value, max_value); slot->min = NK_MIN(min_value, max_value);
slot->max = NK_MAX(min_value, max_value); slot->max = NK_MAX(min_value, max_value);
slot->range = slot->max - slot->min;} slot->range = slot->max - slot->min;
slot->show_markers = style->show_markers;}
} }
NK_API void NK_API void
nk_chart_add_slot(struct nk_context *ctx, const enum nk_chart_type type, nk_chart_add_slot(struct nk_context *ctx, const enum nk_chart_type type,
@ -151,7 +153,9 @@ nk_chart_push_line(struct nk_context *ctx, struct nk_window *win,
i->mouse.buttons[NK_BUTTON_LEFT].clicked) ? NK_CHART_CLICKED: 0; i->mouse.buttons[NK_BUTTON_LEFT].clicked) ? NK_CHART_CLICKED: 0;
color = g->slots[slot].highlight; color = g->slots[slot].highlight;
} }
nk_fill_rect(out, bounds, 0, color); if (g->slots[slot].show_markers) {
nk_fill_rect(out, bounds, 0, color);
}
g->slots[slot].index += 1; g->slots[slot].index += 1;
return ret; return ret;
} }
@ -175,7 +179,9 @@ nk_chart_push_line(struct nk_context *ctx, struct nk_window *win,
color = g->slots[slot].highlight; color = g->slots[slot].highlight;
} }
} }
nk_fill_rect(out, nk_rect(cur.x - 2, cur.y - 2, 4, 4), 0, color); if (g->slots[slot].show_markers) {
nk_fill_rect(out, nk_rect(cur.x - 2, cur.y - 2, 4, 4), 0, color);
}
/* save current data point position */ /* save current data point position */
g->slots[slot].last.x = cur.x; g->slots[slot].last.x = cur.x;

1
src/nuklear_style.c
View File

@ -486,6 +486,7 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
chart->rounding = 0; chart->rounding = 0;
chart->color_factor = 1.0f; chart->color_factor = 1.0f;
chart->disabled_factor = NK_WIDGET_DISABLED_FACTOR; chart->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
chart->show_markers = nk_true;
/* combo */ /* combo */
combo = &style->combo; combo = &style->combo;