From 89cccb111bb4a67a95cb72d55b842cfeb9a92b6f Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Wed, 2 Mar 2016 16:14:45 -0500
Subject: [PATCH] [zr] update zahnrad

---
 deps/zahnrad/zahnrad.c | 74 +++++++++++++++++++++++++++++++++++++++++-
 deps/zahnrad/zahnrad.h |  6 ++++
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/deps/zahnrad/zahnrad.c b/deps/zahnrad/zahnrad.c
index f6f3c4bb15..ddf89fcaef 100644
--- a/deps/zahnrad/zahnrad.c
+++ b/deps/zahnrad/zahnrad.c
@@ -8043,6 +8043,22 @@ zr_window_is_active(struct zr_context *ctx, const char *name)
     return win == ctx->active;
 }
 
+void
+zr_window_close(struct zr_context *ctx, const char *name)
+{
+    int title_len;
+    zr_hash title_hash;
+    struct zr_window *win;
+    ZR_ASSERT(ctx);
+    if (!ctx) return;
+
+    title_len = (int)zr_strsiz(name);
+    title_hash = zr_murmur_hash(name, (int)title_len, ZR_WINDOW_TITLE);
+    win = zr_find_window(ctx, title_hash);
+    if (!win) return;
+    win->flags |= ZR_WINDOW_HIDDEN;
+}
+
 void
 zr_window_set_bounds(struct zr_context *ctx, struct zr_rect bounds)
 {
@@ -8136,7 +8152,7 @@ zr_window_set_focus(struct zr_context *ctx, const char *name)
     title_len = (int)zr_strsiz(name);
     title_hash = zr_murmur_hash(name, (int)title_len, ZR_WINDOW_TITLE);
     win = zr_find_window(ctx, title_hash);
-    if (ctx->end != win) {
+    if (win && ctx->end != win) {
         zr_remove_window(ctx, win);
         zr_insert_window(ctx, win);
     }
@@ -13395,6 +13411,62 @@ zr_chart_end(struct zr_context *ctx)
     zr_op_handle(ctx, &p, &queue);
 }
 
+void
+zr_plot(struct zr_context *ctx, enum zr_chart_type type, const float *values,
+    int count, int offset)
+{
+    int i;
+    float min_value;
+    float max_value;
+
+    ZR_ASSERT(ctx);
+    ZR_ASSERT(values);
+    ZR_ASSERT(offset < count);
+    if (!ctx || !values || !count) return;
+
+    /* first pass: find out min and max values */
+    min_value = values[offset];
+    max_value = values[offset];
+    for (i = offset+1; i < count; ++i) {
+        min_value = (values[i] < min_value) ? values[i]: min_value;
+        max_value = (values[i] > max_value) ? values[i]: max_value;
+    }
+
+    /* second pass: draw graph out to window */
+    zr_chart_begin(ctx, type, count, min_value, max_value);
+    for (i = offset; i < count; ++i)
+        zr_chart_push(ctx, values[i]);
+    zr_chart_end(ctx);
+}
+
+void
+zr_plot_function(struct zr_context *ctx, enum zr_chart_type type, void *userdata,
+    float(*value_getter)(void* user, int index), int count, int offset)
+{
+    int i;
+    float min_value;
+    float max_value;
+
+    ZR_ASSERT(ctx);
+    ZR_ASSERT(value_getter);
+    ZR_ASSERT(offset < count);
+    if (!ctx || !value_getter || !count) return;
+
+    /* first pass: find out min and max values */
+    min_value = max_value = value_getter(userdata, offset);
+    for (i = offset+1; i < count; ++i) {
+        float value = value_getter(userdata, i);
+        min_value = (value <= min_value) ? value: min_value;
+        max_value = (value >= max_value) ? value: max_value;
+    }
+
+    /* second pass: draw graph out to window */
+    zr_chart_begin(ctx, type, count, min_value, max_value);
+    for (i = offset; i < count; ++i)
+        zr_chart_push(ctx, value_getter(userdata, i));
+    zr_chart_end(ctx);
+}
+
 /* ==============================================================
  *
  *                          RETAIN
diff --git a/deps/zahnrad/zahnrad.h b/deps/zahnrad/zahnrad.h
index 52d2736178..78fa6195b1 100644
--- a/deps/zahnrad/zahnrad.h
+++ b/deps/zahnrad/zahnrad.h
@@ -1724,6 +1724,7 @@ int zr_window_is_collapsed(struct zr_context*, const char*);
 int zr_window_is_closed(struct zr_context*, const char*);
 int zr_window_is_active(struct zr_context*, const char*);
 
+void zr_window_close(struct zr_context*, const char *name);
 void zr_window_set_bounds(struct zr_context*, struct zr_rect);
 void zr_window_set_position(struct zr_context*, struct zr_vec2);
 void zr_window_set_size(struct zr_context*, struct zr_vec2);
@@ -1911,6 +1912,11 @@ zr_flags zr_edit_buffer(struct zr_context*, zr_flags, struct zr_buffer*, zr_filt
 void zr_chart_begin(struct zr_context*, enum zr_chart_type, int num, float min, float max);
 zr_flags zr_chart_push(struct zr_context*, float);
 void zr_chart_end(struct zr_context*);
+void zr_plot(struct zr_context*, enum zr_chart_type, const float *values,
+            int count, int offset);
+void zr_plot_function(struct zr_context*, enum zr_chart_type, void *userdata,
+                        float(*value_getter)(void* user, int index),
+                        int count, int offset);
 
 /*--------------------------------------------------------------
  *                          POPUPS