added: demo_SymmetricLogScale()

dinau · dinau · commit 452e7be4d4fd · 2024-07-06T11:25:05.000+09:00
added: demo_NaNValues()
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-# ImGuinZ x
+# ImGuinZ 
 
 This project aims to simply and easily build [Dear ImGui](https://github.com/ocornut/imgui) examples with **Zig language** using [CImGui](https://github.com/cimgui/cimgui) / [CImPlot](https://github.com/cimgui/cimplot)  as first step.
 
diff --git a/examples/imPlotDemo/imgui.ini b/examples/imPlotDemo/imgui.ini
@@ -44,7 +44,7 @@ Size=444,364
 Collapsed=1
 
 [Window][ImPlot Demo]
-Pos=528,9
+Pos=578,11
 Size=600,750
 Collapsed=0
 
@@ -79,8 +79,8 @@ Size=568,552
 Collapsed=0
 
 [Window][ ImPlot demo: All demos have been written in Zig lang.]
-Pos=21,16
-Size=531,722
+Pos=17,13
+Size=546,722
 Collapsed=0
 
 [Table][0x53416836,3]
diff --git a/examples/imPlotDemo/src/demoAll.zig b/examples/imPlotDemo/src/demoAll.zig
@@ -1,3 +1,6 @@
+//
+// 2024/07: Converted to Zig lang. from C++ by dinau
+//
 const std = @import("std");
 const math = @import("std").math;
 //
@@ -11,7 +14,9 @@ pub const c = @cImport({
     @cInclude("stdlib.h");
 });
 
-
+//----------------
+// imPlotDemoTabs
+//----------------
 pub fn imPlotDemoTabs() !void {
     if (ig.igBeginTabBar("ImPlotDemoTabs", 0)) {
         defer ig.igEndTabBar();
@@ -36,19 +41,19 @@ pub fn imPlotDemoTabs() !void {
             //  demoHeader("Digital Plots", demo_DigitalPlots);
             try demoHeader("Images", demo_Images);
             try  demoHeader("Markers and Text", demo_MarkersAndText);
-            //  demoHeader("NaN Values", demo_NaNValues);
+            try  demoHeader("NaN Values", demo_NaNValues);
         }
         if (ig.igBeginTabItem(fonts.ICON_FA_CHART_AREA ++ " Subplots", null, 0)) {
             defer ig.igEndTabItem();
-            //  demoHeader("Sizing", demo_SubplotsSizing);
+            try demoHeader("Sizing", demo_SubplotsSizing);
             //  demoHeader("Item Sharing", demo_SubplotItemSharing);
             //  demoHeader("Axis Linking", demo_SubplotAxisLinking);
             try demoHeader("Tables", demo_Tables);
         }
         if (ig.igBeginTabItem(fonts.ICON_FA_CHART_COLUMN ++ " Axes", null, 0)) {
             defer ig.igEndTabItem();
             try demoHeader("Log Scale", demo_LogScale);
-            //         demoHeader("Symmetric Log Scale", demo_SymmetricLogScale);
+            try demoHeader("Symmetric Log Scale", demo_SymmetricLogScale);
             //         demoHeader("Time Scale", demo_TimeScale);
             //         demoHeader("Custom Scale", demo_CustomScale);
             //         demoHeader("Multiple Axes", demo_MultipleAxes);
@@ -96,6 +101,55 @@ fn demoHeader(label: anytype, demo: anytype) !void {
     }
 }
 
+//-----------------------
+// demo_SubplotsSizing()
+//-----------------------
+pub fn demo_SubplotsSizing() !void {
+  if(false){
+    const st = struct {
+      var flags = ip.ImPlotSubplotFlags_ShareItems | ip.ImPlotSubplotFlags_NoLegend;
+      var rows:c_int  = 3;
+      var cols:c_int  = 3;
+      var rratios = [_]f32{5,1,1,1,1,1};
+      var cratios = [_]f32{5,1,1,1,1,1};
+    };
+    _ = ig.igCheckboxFlags_IntPtr("ImPlotSubplotFlags_NoResize", &st.flags, ip.ImPlotSubplotFlags_NoResize);
+    _ = ig.igCheckboxFlags_IntPtr("ImPlotSubplotFlags_NoTitle",  &st.flags, ip.ImPlotSubplotFlags_NoTitle);
+
+    _ = ig.igSliderInt("Rows",&st.rows,1,5, "%d", 0);
+    _ = ig.igSliderInt("Cols",&st.cols,1,5, "%d", 0);
+    if ( (st.rows < 1) or (st.cols < 1)) {
+        ig.igTextColored(.{.x=1, .y=0, .z=0, .w=1}, "Nice try, but the number of rows and columns must be greater than 0!");
+        return;
+    }
+    _ = ig.igDragScalarN("Row Ratios",ig.ImGuiDataType_Float,&st.rratios,st.rows,0.01,null,null,null,0);
+    _ = ig.igDragScalarN("Col Ratios",ig.ImGuiDataType_Float,&st.cratios,st.cols,0.01,null,null,null,0);
+    if (ip.ImPlot_BeginSubplots("My Subplots", st.rows, st.cols, .{.x=-1, .y=400}, st.flags, &st.rratios, &st.cratios)) {
+        var id:c_int = 0;
+        for (0..@intCast((st.rows * st.cols)))|i| {
+            if (ip.ImPlot_BeginPlot("", .{.x = 0, .y = 0}, ip.ImPlotFlags_NoLegend)) {
+                ip.ImPlot_SetupAxes(null,null,ip.ImPlotAxisFlags_NoDecorations,ip.ImPlotAxisFlags_NoDecorations);
+                 var fi = 0.01 * (@as(f32,@floatFromInt(i)) + 1);
+                if (st.rows*st.cols > 1) {
+                    // TODO
+                    var vec4 :ig.ImVec4 = undefined;
+                    ip.ImPlot_SampleColormap(@ptrCast(&vec4), @as(f32,@floatFromInt(i)) / @as(f32,@floatFromInt((st.rows * st.cols - 1))), ip.ImPlotColormap_Jet);
+                    ip.ImPlot_SetNextLineStyle(.{.x = vec4.x, .y = vec4.y, .z = vec4.z, .w = vec4.w}
+                                               , utils.IMPLOT_AUTO);
+                }
+                //var label:[16]u8 = undefined;
+                //const slLabel = try std.fmt.bufPrint(&label, "data{}", id);
+                id += 1;
+                //ip.ImPlot_PlotLineG(slLabel.ptr, utils.SineWave, &fi,1000, 0);
+                ip.ImPlot_PlotLineG("mmmm", utils.SineWave, &fi,1000, 0);
+                ip.ImPlot_EndPlot();
+            }
+        }
+        ip.ImPlot_EndSubplots();
+    }
+  }
+}
+
 //---------------
 // demo_LogScale()
 //---------------
@@ -121,7 +175,29 @@ pub fn demo_LogScale() !void {
     }
 }
 
+//-----------------
+// demo_LogScale()
+//-----------------
+pub fn demo_SymmetricLogScale() !void {
+    var  xs:[1001]f64 = undefined;
+    var  ys1:[1001]f64 = undefined;
+    var  ys2:[1001]f64 = undefined;
+    for (0..1001)|i| {
+        xs[i]  = @as(f64,@floatFromInt(i)) * 0.1 - 50;
+        ys1[i] = math.sin(xs[i]);
+        ys2[i] = @as(f64,@floatFromInt(i)) * 0.002 - 1;
+    }
+    if (ip.ImPlot_BeginPlot("SymLog Plot", .{.x=-1, .y=0} ,0)) {
+        ip.ImPlot_SetupAxisScale_PlotScale(ip.ImAxis_X1, ip.ImPlotScale_SymLog);
+        try ip.ImPlot_PlotLineXy("f(x) = a*x+b"       ,&xs, &ys2,1001);
+        try ip.ImPlot_PlotLineXy("f(x) = math.sin(x)" ,&xs, &ys1,1001);
+        ip.ImPlot_EndPlot();
+    }
+}
 
+//-----------------
+// demo_Config()
+//-----------------
 pub fn demo_Config() !void {
     ig.igShowFontSelector("Font");
     _ = ig.igShowStyleSelector("ImGui Style");
@@ -584,6 +660,34 @@ pub fn demo_MarkersAndText() !void {
     }
 }
 
+//------------------
+// demo_NaNValues()
+//------------------
+pub fn demo_NaNValues() !void {
+    const st = struct {
+      var  include_nan = true;
+      var  flags:ip.ImPlotLineFlags = 0;
+    };
+
+    var data1 = [5]f32{0.0,0.25,0.5,0.75,1.0};
+    var data2 = [5]f32{0.0,0.25,0.5,0.75,1.0};
+
+    if (st.include_nan){
+        data1[2] = utils.NaN_f32;
+    }
+
+    _ = ig.igCheckbox("Include NaN",&st.include_nan);
+    ig.igSameLine(0, -1.0);
+    _ = ig.igCheckboxFlags_IntPtr("Skip NaN", &st.flags, ip.ImPlotLineFlags_SkipNaN);
+
+    if (ip.ImPlot_BeginPlot("##NaNValues", .{ .x = -1, .y = 0 }, 0)) {
+        ip.ImPlot_SetNextMarkerStyle(ip.ImPlotMarker_Square, utils.IMPLOT_AUTO, utils.IMPLOT_AUTO_COL, utils.IMPLOT_AUTO, utils.IMPLOT_AUTO_COL);
+        try ip.ImPlot_PlotLineXyEx("line", &data1, &data2, 5, st.flags, 0, utils.stride(data1[0]));
+        try ip.ImPlot_PlotBars("bars", &data1, 5);
+        ip.ImPlot_EndPlot();
+    }
+}
+
 //------------------
 // demo_LinePlots()
 //------------------
diff --git a/examples/imPlotDemo/src/main.zig b/examples/imPlotDemo/src/main.zig
@@ -16,7 +16,7 @@ fn glfw_error_callback (err: c_int, description: [*c] const u8) callconv (.C) vo
   std.debug.print ("GLFW Error {d}: {s}\n", .{ err, description });
 }
 
-const MainWinWidth :i32 = 1100;
+const MainWinWidth :i32 = 1200;
 const MainWinHeight:i32 = 800;
 
 //--------
diff --git a/examples/imPlotDemo/src/utils.zig b/examples/imPlotDemo/src/utils.zig
@@ -5,16 +5,15 @@ pub const c = @cImport ({
   @cInclude ("stdlib.h");
 });
 
-pub const ig = @cImport ({
-  @cInclude ("cimgui.h");
-  @cInclude ("cimplot.h");
-});
-const ip = @import("zimplot.zig");
+const ig = @import ("imgui.zig");
+const ip = @import("implot.zig");
 
 pub const IMPLOT_AUTO: f32 = -1;
 pub const IMPLOT_AUTO_COL =  .{.x = 0, .y = 0, .z = 0, .w = -1};
 pub const INFINITY_f32 = std.math.inf(f32);
 pub const INFINITY_f64 = std.math.inf(f64);
+pub const NaN_f32      = std.math.nan(f32);
+pub const NaN_f64      = std.math.nan(f64);
 pub fn stride(value:anytype) c_int {
   return @sizeOf(@TypeOf(value));
 }
@@ -46,22 +45,33 @@ pub const WaveData = struct {
     }
 };
 
-pub fn SineWave(idx: u32, wave_data: *WaveData) ImPlotPoint {
-    const t = idx;
-    return ImPlotPoint{
-        .x = wave_data.x + t,
-        .y = wave_data.amp * math.sin(wave_data.freq * (wave_data.x + t) + wave_data.offset),
-    };
+pub fn SineWave(data: ?*anyopaque, idx: c_int, point: [*c]ip.ImPlotPoint ) callconv(.C) ?*anyopaque  {
+    const v1:*f32 = @as(*f32,@alignCast(data.?));
+    const fval =  v1.*;
+    const fidx =  @as(f32,@floatFromInt(idx));
+    point.x = fval;
+    point.y = math.sin(fval * fidx );
+    return point;
 }
-
-pub fn SawWave(idx: u32, wave_data: *WaveData) ImPlotPoint {
-    const t = idx;
-    return ImPlotPoint{
-        .x = wave_data.x + t,
-        .y = wave_data.amp * 2.0 * (wave_data.freq * (wave_data.x + t) - math.floor(0.5 + wave_data.freq * (wave_data.x + t))),
-    };
+// Nim: ///type ImPlotPointGetter* = proc (data: pointer; idx: cint; point: ptr ImPlotPoint): pointer {.cdecl.}
+// C++: typedef ImPlotPoint (*ImPlotGetter)      (            int idx, void* user_data);
+//  void PlotLineG       (const char* label_id, ImPlotGetter getter,      void* data, int count, ImPlotLineFlags flags=0);
+// C:   typedef void *      (*ImPlotPoint_getter)(void* data, int idx, ImPlotPoint *point);
+//  void ImPlot_PlotLineG(const char* label_id, ImPlotPoint_getter getter,void* data, int count, ImPlotLineFlags flags);//custom generation
+//
+pub fn SinewaveGetter(i:c_int,  data:*anyopaque) ImPlotPoint {
+    const f = (@as(f32,@ptrCast(data))).*;
+    return ImPlotPoint(i,math.sin(f * i));
 }
 
+//pub fn SawWave(data: *anyopaque, idx: u32, point: ip.ImPlotPoint) *anyopaque {
+//    const t = idx;
+//    return ImPlotPoint{
+//        .x = wave_data.x + t,
+//        .y = wave_data.amp * 2.0 * (wave_data.freq * (wave_data.x + t) - math.floor(0.5 + wave_data.freq * (wave_data.x + t))),
+//    };
+//}
+
 pub fn Spiral(idx: u32, wave_data: *WaveData) ImPlotPoint {
     const t = idx;
     return ImPlotPoint{
@@ -238,16 +248,16 @@ pub const HugeTimeData = struct {
 //    // Implement sparkline plotting
 //}
 pub fn Sparkline(id: anytype, values: anytype, count: c_int, min_v: f32, max_v: f32, offset: c_int, col: anytype, size: ig.ImVec2) void {
-    ig.ImPlot_PushStyleVar_Vec2(ig.ImPlotStyleVar_PlotPadding, .{ .x = 0, .y = 0 });
-    if (ig.ImPlot_BeginPlot(id, size, ig.ImPlotFlags_CanvasOnly)) {
-        ig.ImPlot_SetupAxes(null, null, ig.ImPlotAxisFlags_NoDecorations, ig.ImPlotAxisFlags_NoDecorations);
-        ig.ImPlot_SetupAxesLimits(0, @floatFromInt(count - 1), min_v, max_v, ig.ImGuiCond_Always);
-        ig.ImPlot_SetNextLineStyle(col, IMPLOT_AUTO);
-        ig.ImPlot_SetNextFillStyle(col, 0.25);
-        try ip.ImPlot_PlotLineEx(id, values, count, 1.0, 0, ig.ImPlotLineFlags_Shaded, offset, stride(values[0]));
-        ig.ImPlot_EndPlot();
+    ip.ImPlot_PushStyleVar_Vec2(ip.ImPlotStyleVar_PlotPadding, .{ .x = 0, .y = 0 });
+    if (ip.ImPlot_BeginPlot(id, .{.x=size.x,.y=size.y}, ip.ImPlotFlags_CanvasOnly)) {
+        ip.ImPlot_SetupAxes(null, null, ip.ImPlotAxisFlags_NoDecorations, ip.ImPlotAxisFlags_NoDecorations);
+        ip.ImPlot_SetupAxesLimits(0, @floatFromInt(count - 1), min_v, max_v, ig.ImGuiCond_Always);
+        ip.ImPlot_SetNextLineStyle(col, IMPLOT_AUTO);
+        ip.ImPlot_SetNextFillStyle(col, 0.25);
+        try ip.ImPlot_PlotLineEx(id, values, count, 1.0, 0, ip.ImPlotLineFlags_Shaded, offset, stride(values[0]));
+        ip.ImPlot_EndPlot();
     }
-    ig.ImPlot_PopStyleVar(1);
+    ip.ImPlot_PopStyleVar(1);
 }
 //
 //pub fn PlotCandlestick(label_id: []const u8, xs: []const f64, opens: []const f64, closes: []const f64, lows: []const f64, highs: []const f64, count: i32, tooltip: bool = true, width_percent: f32 = 0.25, bullCol: ImVec4 = ImVec4{.x = 0, .y = 1, .z = 0, .w = 1}, bearCol: ImVec4 = ImVec4{.x = 1, .y = 0, .z = 0, .w = 1}) void {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ fn glfw_error_callback (err: c_int, description: [*c] const u8) callconv (.C) vo`
`16`	`16`	`std.debug.print ("GLFW Error {d}: {s}\n", .{ err, description });`
`17`	`17`	`}`
`18`	`18`
`19`		`-const MainWinWidth :i32 = 1100;`
	`19`	`+const MainWinWidth :i32 = 1200;`
`20`	`20`	`const MainWinHeight:i32 = 800;`
`21`	`21`
`22`	`22`	`//--------`