Started new plot impl

examples/data_analysis_example/main.v

@@ -89,7 +89,7 @@ fn main() {
 		trace_type: .scatter3d
 		x: x1_class0
 		y: x2_class0
-		z: [][]f64{len: x1_class0.len, init: [0.0]}
+		z: []f64{len: x1_class0.len, init: 0.0}
 		mode: 'markers'
 		marker: plot.Marker{
 			size: []f64{len: x1_class0.len, init: 8.0}
@@ -102,7 +102,7 @@ fn main() {
 		trace_type: .scatter3d
 		x: x1_class1
 		y: x2_class1
-		z: [][]f64{len: x1_class1.len, init: [0.0]}
+		z: []f64{len: x1_class1.len, init: 0.0}
 		mode: 'markers'
 		marker: plot.Marker{
 			size: []f64{len: x1_class1.len, init: 8.0}
@@ -138,14 +138,14 @@ fn main() {
 
 	plt_bars.add_trace(
 		trace_type: .bar
-		x_str: []string{len: stat.mean_x.len, init: 'Class ${index}'}
+		x: []string{len: stat.mean_x.len, init: 'Class ${index}'}
 		y: stat.mean_x
 		name: 'Mean'
 	)
 
 	plt_bars.add_trace(
 		trace_type: .bar
-		x_str: []string{len: stat.sig_x.len, init: 'Class ${index}'}
+		x: []string{len: stat.sig_x.len, init: 'Class ${index}'}
 		y: stat.sig_x
 		name: 'Standard Deviation'
 	)

examples/plot_bar/main.v

@@ -7,7 +7,7 @@ fn main() {
 
 	plt.add_trace(
 		trace_type: .bar
-		x_str: ['China', 'India', 'USA', 'Indonesia', 'Pakistan']
+		x: ['China', 'India', 'USA', 'Indonesia', 'Pakistan']
 		y: [1411778724.0, 1379217184, 331989449, 271350000, 225200000]
 	)
 	plt.set_layout(

examples/plot_basic_heatmap/main.v

@@ -10,7 +10,7 @@ mut plt := plot.new_plot()
 
 plt.add_trace(
 	trace_type: .heatmap
-	x_str: x
+	x: x
 	y_str: y
 	z: z
 )

examples/plot_grouped_bar_chart/main.v

@@ -10,13 +10,13 @@ fn main() {
 	mut plt := plot.new_plot()
 	plt.add_trace(
 		trace_type: .bar
-		x_str: categories
+		x: categories
 		y: values1
 		name: 'Group 1'
 	)
 	plt.add_trace(
 		trace_type: .bar
-		x_str: categories
+		x: categories
 		y: values2
 		name: 'Group 2'
 	)

examples/plot_scatter3d_2/main.v

@@ -6,13 +6,13 @@ import vsl.plot
 fn main() {
 	mut x := []f64{cap: 100}
 	mut y := []f64{cap: 100}
-	mut z := [][]f64{cap: 100}
+	mut z := []f64{cap: 100}
 
 	for i in 0 .. 100 {
 		val := f64(i) * 0.1
 		x << math.cos(val)
 		y << math.sin(val)
-		z << [val]
+		z << val
 	}
 
 	mut plt := plot.new_plot()

examples/plot_scatter_with_bars/main.v

@@ -20,7 +20,7 @@ fn main() {
 	)
 	plt.add_trace(
 		trace_type: .bar
-		x_str: x.map(it.str())
+		x: x.map(it.str())
 		y: y
 		marker: plot.Marker{
 			color: []string{len: x.len, init: '#0000FF'}

plot/plot.v

@@ -1,5 +1,7 @@
 module plot
 
+import arrays
+
 // Plot is the main structure that contains layout and traces
 // to generate plots
 pub struct Plot {
@@ -13,7 +15,14 @@ pub fn new_plot() Plot {
 }
 
 pub fn (mut p Plot) add_trace(trace Trace) Plot {
-	p.traces << trace
+	mut next_trace := trace
+	if trace.trace_type == .scatter3d {
+		z := next_trace.z
+		if z is [][]f64 {
+			next_trace.z = arrays.flatten(z)
+		}
+	}
+	p.traces << next_trace
 	return p
 }
 

plot/plot_test.v

@@ -5,7 +5,7 @@ fn test_bar() {
 
 	plt.add_trace(
 		trace_type: .bar
-		x_str: ['China', 'India', 'USA', 'Indonesia', 'Pakistan']
+		x: ['China', 'India', 'USA', 'Indonesia', 'Pakistan']
 		y: [1411778724.0, 1379217184, 331989449, 271350000, 225200000]
 	)
 	plt.set_layout(

plot/scripts/plotter.py

@@ -73,11 +73,10 @@ def process_trace(trace):
     """
     Process a trace to ensure only accepted keys are present.
     """
-    custom_keys = ["x_str"]
     trace_type = trace.pop("trace_type")
 
     # Remove all JSON keys not accepted by Plotly.
-    accepted = dir(map_trace_type_to_plotly_object(trace_type)) + custom_keys
+    accepted = dir(map_trace_type_to_plotly_object(trace_type))
     keys = list(trace.keys())
     for k in keys:
         if k not in accepted:
@@ -90,15 +89,6 @@ def process_trace(trace):
             trace["marker"].pop("opacity")
             trace["marker"].pop("colorscale")
 
-    if "x_str" in trace:
-        if trace_type == 'bar':
-            trace["x"] = trace["x_str"]
-        trace.pop("x_str")
-
-    # Flatten 'z' when dealing with 3D scatters.
-    if trace_type == 'scatter3d':
-        trace["z"] = [item for sublist in trace["z"] for item in sublist]
-
     return map_trace_type_to_plotly_object(trace_type)(trace)
 
 

plot/trace.v

@@ -10,16 +10,17 @@ pub enum TraceType {
 	histogram
 }
 
+type XType = []f64 | []string
+type ZType = [][]f64 | []f64
+
 [params]
 pub struct Trace {
 pub mut:
 	trace_type    TraceType      [required]
-	x             []f64
-	x_str         []string
-	y_str         []string
+	x             XType
 	xbins         map[string]f32
 	y             []f64
-	z             [][]f64
+	z             ZType
 	values        []f64
 	labels        []string
 	text          []string