From 869687714d76643cc8ba9a84a430147acf3b13c6 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 12:19:50 +0900
Subject: [PATCH 01/18] Defining axis serializer function

---
 plotly/src/layout/mod.rs | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index 7a70c23..57ec0fe 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -17,6 +17,43 @@ use crate::{
     private::{NumOrString, NumOrStringCollection},
 };
 
+
+fn serialize_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer: S, axis_prefix: &str) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    let mut map = HashMap::new();
+    let axes = axes.as_ref().unwrap();
+
+    for (i, axis) in axes.iter().enumerate() {
+        let axe = axis.as_ref().unwrap();
+        let key = if i == 0 {
+            axis_prefix.to_string()
+        } else {
+            format!("{}{}", axis_prefix, i + 1)
+        };
+        map.insert(key, axe);
+    }
+
+    map.serialize(serializer)
+}
+
+fn serialize_x_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer:S)-> Result<S::Ok,S::Error>
+where S:Serializer{
+    serialize_axes(axes, serializer, "xaxis")
+}
+
+fn serialize_y_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer:S)-> Result<S::Ok,S::Error>
+where S:Serializer{
+    serialize_axes(axes, serializer, "yaxis")
+}
+
+
+fn serialize_z_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer:S)-> Result<S::Ok,S::Error>
+where S:Serializer{
+    serialize_axes(axes, serializer, "zaxis")
+}
+
 #[derive(Serialize, Debug, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum AxisType {

From d45f901bf8441a7969c20a6675126f2c7e35358d Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 12:21:04 +0900
Subject: [PATCH 02/18] Defining axes as vector instead of filed items values

---
 plotly/src/layout/mod.rs | 93 +++++-----------------------------------
 1 file changed, 11 insertions(+), 82 deletions(-)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index 57ec0fe..df4a672 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -2,7 +2,7 @@ pub mod themes;
 pub mod update_menu;
 
 use std::borrow::Cow;
-
+use std::collections::HashMap;
 use plotly_derive::FieldSetter;
 use serde::{Serialize, Serializer};
 use update_menu::UpdateMenu;
@@ -1743,38 +1743,10 @@ pub struct LayoutTemplate {
     grid: Option<LayoutGrid>,
     calendar: Option<Calendar>,
 
-    #[serde(rename = "xaxis")]
-    x_axis: Option<Box<Axis>>,
-    #[serde(rename = "yaxis")]
-    y_axis: Option<Box<Axis>>,
-    #[serde(rename = "xaxis2")]
-    x_axis2: Option<Box<Axis>>,
-    #[serde(rename = "yaxis2")]
-    y_axis2: Option<Box<Axis>>,
-    #[serde(rename = "xaxis3")]
-    x_axis3: Option<Box<Axis>>,
-    #[serde(rename = "yaxis3")]
-    y_axis3: Option<Box<Axis>>,
-    #[serde(rename = "xaxis4")]
-    x_axis4: Option<Box<Axis>>,
-    #[serde(rename = "yaxis4")]
-    y_axis4: Option<Box<Axis>>,
-    #[serde(rename = "xaxis5")]
-    x_axis5: Option<Box<Axis>>,
-    #[serde(rename = "yaxis5")]
-    y_axis5: Option<Box<Axis>>,
-    #[serde(rename = "xaxis6")]
-    x_axis6: Option<Box<Axis>>,
-    #[serde(rename = "yaxis6")]
-    y_axis6: Option<Box<Axis>>,
-    #[serde(rename = "xaxis7")]
-    x_axis7: Option<Box<Axis>>,
-    #[serde(rename = "yaxis7")]
-    y_axis7: Option<Box<Axis>>,
-    #[serde(rename = "xaxis8")]
-    x_axis8: Option<Box<Axis>>,
-    #[serde(rename = "yaxis8")]
-    y_axis8: Option<Box<Axis>>,
+    #[serde(flatten, serialize_with="serialize_x_axes")]
+    x_axis: Option<Vec<Option<Box<Axis>>>>,
+    #[serde(flatten, serialize_with="serialize_y_axes")]
+    y_axis: Option<Vec<Option<Box<Axis>>>>,
 
     // ternary: Option<LayoutTernary>,
     scene: Option<LayoutScene>,
@@ -1910,55 +1882,12 @@ pub struct Layout {
     grid: Option<LayoutGrid>,
     calendar: Option<Calendar>,
 
-    #[serde(rename = "xaxis")]
-    x_axis: Option<Box<Axis>>,
-    #[serde(rename = "yaxis")]
-    y_axis: Option<Box<Axis>>,
-    #[serde(rename = "zaxis")]
-    z_axis: Option<Box<Axis>>,
-
-    #[serde(rename = "xaxis2")]
-    x_axis2: Option<Box<Axis>>,
-    #[serde(rename = "yaxis2")]
-    y_axis2: Option<Box<Axis>>,
-    #[serde(rename = "zaxis2")]
-    z_axis2: Option<Box<Axis>>,
-    #[serde(rename = "xaxis3")]
-    x_axis3: Option<Box<Axis>>,
-    #[serde(rename = "yaxis3")]
-    y_axis3: Option<Box<Axis>>,
-    #[serde(rename = "zaxis3")]
-    z_axis3: Option<Box<Axis>>,
-    #[serde(rename = "xaxis4")]
-    x_axis4: Option<Box<Axis>>,
-    #[serde(rename = "yaxis4")]
-    y_axis4: Option<Box<Axis>>,
-    #[serde(rename = "zaxis4")]
-    z_axis4: Option<Box<Axis>>,
-    #[serde(rename = "xaxis5")]
-    x_axis5: Option<Box<Axis>>,
-    #[serde(rename = "yaxis5")]
-    y_axis5: Option<Box<Axis>>,
-    #[serde(rename = "zaxis5")]
-    z_axis5: Option<Box<Axis>>,
-    #[serde(rename = "xaxis6")]
-    x_axis6: Option<Box<Axis>>,
-    #[serde(rename = "yaxis6")]
-    y_axis6: Option<Box<Axis>>,
-    #[serde(rename = "zaxis6")]
-    z_axis6: Option<Box<Axis>>,
-    #[serde(rename = "xaxis7")]
-    x_axis7: Option<Box<Axis>>,
-    #[serde(rename = "yaxis7")]
-    y_axis7: Option<Box<Axis>>,
-    #[serde(rename = "zaxis7")]
-    z_axis7: Option<Box<Axis>>,
-    #[serde(rename = "xaxis8")]
-    x_axis8: Option<Box<Axis>>,
-    #[serde(rename = "yaxis8")]
-    y_axis8: Option<Box<Axis>>,
-    #[serde(rename = "zaxis8")]
-    z_axis8: Option<Box<Axis>>,
+    #[serde(flatten, serialize_with="serialize_x_axes")]
+    x_axis: Option<Vec<Option<Box<Axis>>>>,
+    #[serde(flatten, serialize_with="serialize_y_axes")]
+    y_axis: Option<Vec<Option<Box<Axis>>>>,
+    #[serde(flatten, serialize_with="serialize_z_axes")]
+    z_axis: Option<Vec<Option<Box<Axis>>>>,
 
     // ternary: Option<LayoutTernary>,
     scene: Option<LayoutScene>,

From b39bd4e6e771ef471f5d117582566ed5befa52b4 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 12:22:34 +0900
Subject: [PATCH 03/18] Updating layout test to use the new vector axis instead
 of filed accessed ones

---
 plotly/src/layout/mod.rs | 54 ++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index df4a672..72331a4 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -2927,6 +2927,14 @@ mod tests {
 
     #[test]
     fn test_serialize_layout_template() {
+
+        let mut xaxis:Vec<Option<Box<Axis>>> = Vec::new();
+        let mut yaxis:Vec<Option<Box<Axis>>> = Vec::new();
+        for _ in 0..8{
+            xaxis.push(Some(Box::new(Axis::new())));
+            yaxis.push(Some(Box::new(Axis::new())));
+        }
+
         let layout_template = LayoutTemplate::new()
             .title("Title")
             .show_legend(false)
@@ -2953,22 +2961,8 @@ mod tests {
             .hover_label(Label::new())
             .grid(LayoutGrid::new())
             .calendar(Calendar::Jalali)
-            .x_axis(Axis::new())
-            .x_axis2(Axis::new())
-            .x_axis3(Axis::new())
-            .x_axis4(Axis::new())
-            .x_axis5(Axis::new())
-            .x_axis6(Axis::new())
-            .x_axis7(Axis::new())
-            .x_axis8(Axis::new())
-            .y_axis(Axis::new())
-            .y_axis2(Axis::new())
-            .y_axis3(Axis::new())
-            .y_axis4(Axis::new())
-            .y_axis5(Axis::new())
-            .y_axis6(Axis::new())
-            .y_axis7(Axis::new())
-            .y_axis8(Axis::new())
+            .x_axis(xaxis)
+            .y_axis(yaxis)
             .annotations(vec![Annotation::new()])
             .shapes(vec![Shape::new()])
             .new_shape(NewShape::new())
@@ -3069,6 +3063,14 @@ mod tests {
 
     #[test]
     fn test_serialize_layout() {
+
+        let mut xaxis:Vec<Option<Box<Axis>>> = Vec::new();
+        let mut yaxis:Vec<Option<Box<Axis>>> = Vec::new();
+        for _ in 0..8{
+            xaxis.push(Some(Box::new(Axis::new())));
+            yaxis.push(Some(Box::new(Axis::new())));
+        }
+
         let layout = Layout::new()
             .title("Title")
             .title(String::from("Title"))
@@ -3098,22 +3100,8 @@ mod tests {
             .template(Template::new())
             .grid(LayoutGrid::new())
             .calendar(Calendar::Jalali)
-            .x_axis(Axis::new())
-            .x_axis2(Axis::new())
-            .x_axis3(Axis::new())
-            .x_axis4(Axis::new())
-            .x_axis5(Axis::new())
-            .x_axis6(Axis::new())
-            .x_axis7(Axis::new())
-            .x_axis8(Axis::new())
-            .y_axis(Axis::new())
-            .y_axis2(Axis::new())
-            .y_axis3(Axis::new())
-            .y_axis4(Axis::new())
-            .y_axis5(Axis::new())
-            .y_axis6(Axis::new())
-            .y_axis7(Axis::new())
-            .y_axis8(Axis::new())
+            .x_axis(xaxis)
+            .y_axis(yaxis)
             .annotations(vec![Annotation::new()])
             .shapes(vec![Shape::new()])
             .new_shape(NewShape::new())
@@ -3135,7 +3123,7 @@ mod tests {
             .extend_pie_colors(true)
             .sunburst_colorway(vec!["#654654"])
             .extend_sunburst_colors(false)
-            .z_axis(Axis::new())
+            .z_axis(Vec::from([Some(Box::new(Axis::new()))]))
             .scene(LayoutScene::new());
 
         let expected = json!({

From 1fc5ab2cf915d06494b98e09bfb51d74b93b9d04 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 12:36:31 +0900
Subject: [PATCH 04/18] Updating themes layout usage signature

---
 plotly/src/layout/themes.rs | 40 ++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/plotly/src/layout/themes.rs b/plotly/src/layout/themes.rs
index a687caa..e5f0cd5 100644
--- a/plotly/src/layout/themes.rs
+++ b/plotly/src/layout/themes.rs
@@ -64,22 +64,22 @@ pub static PLOTLY_WHITE: Lazy<Template> = Lazy::new(|| {
         .plot_background_color("#ffffff")
         .title(Title::new().x(0.05))
         .x_axis(
-            Axis::new()
+            Vec::from([Some(Box::new(Axis::new()
                 .auto_margin(true)
                 .grid_color("#EBF0F8")
                 .line_color("#EBF0F8")
                 // missing title.standoff = 15
                 .zero_line_color("#EBF0F8")
-                .zero_line_width(2),
+                .zero_line_width(2)))])
         )
         .y_axis(
-            Axis::new()
+            Vec::from([Some(Box::new(Axis::new()
                 .auto_margin(true)
                 .grid_color("#EBF0F8")
                 .line_color("#EBF0F8")
                 // missing title.standoff = 15
                 .zero_line_color("#EBF0F8")
-                .zero_line_width(2),
+                .zero_line_width(2)))])
         );
     Template::new().layout(layout_template)
 });
@@ -140,22 +140,26 @@ pub static PLOTLY_DARK: Lazy<Template> = Lazy::new(|| {
         .plot_background_color("#111111")
         .title(Title::new().x(0.05))
         .x_axis(
-            Axis::new()
-                .auto_margin(true)
-                .grid_color("#283442")
-                .line_color("#506784")
-                // missing title.standoff = 15
-                .zero_line_color("#283442")
-                .zero_line_width(2),
+            Vec::from(
+                [Some(Box::new(Axis::new()
+                    .auto_margin(true)
+                    .grid_color("#283442")
+                    .line_color("#506784")
+                    // missing title.standoff = 15
+                    .zero_line_color("#283442")
+                    .zero_line_width(2)))]
+            )
         )
         .y_axis(
-            Axis::new()
-                .auto_margin(true)
-                .grid_color("#283442")
-                .line_color("#506784")
-                // missing title.standoff = 15
-                .zero_line_color("#283442")
-                .zero_line_width(2),
+            Vec::from(
+                [Some(Box::new(Axis::new()
+                    .auto_margin(true)
+                    .grid_color("#283442")
+                    .line_color("#506784")
+                    // missing title.standoff = 15
+                    .zero_line_color("#283442")
+                    .zero_line_width(2)))]
+            )
         );
     Template::new().layout(layout_template)
 });

From d3e3ef208d27b9c842f5d2e99cc29440abca6151 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 15:40:56 +0900
Subject: [PATCH 05/18] Updating test to new axis definition

---
 examples/subplots/src/main.rs | 106 +++++++++++++++++++---------------
 1 file changed, 59 insertions(+), 47 deletions(-)

diff --git a/examples/subplots/src/main.rs b/examples/subplots/src/main.rs
index c78bde5..bf959a5 100644
--- a/examples/subplots/src/main.rs
+++ b/examples/subplots/src/main.rs
@@ -1,5 +1,6 @@
 #![allow(dead_code)]
 
+use std::vec;
 use plotly::common::{Anchor, AxisSide, Font, Title};
 use plotly::layout::{
     Annotation, Axis, GridPattern, Layout, LayoutGrid, Legend, RowOrder, TraceOrder,
@@ -40,7 +41,7 @@ fn simple_subplot_matches_x_axis() {
     plot.add_trace(trace1);
     plot.add_trace(trace2);
 
-    let layout = Layout::new().x_axis(Axis::new().matches("x2")).grid(
+    let layout = Layout::new().x_axis(Vec::from([Some(Box::new(Axis::new().matches("x2")))])).grid(
         LayoutGrid::new()
             .rows(1)
             .columns(2)
@@ -50,7 +51,7 @@ fn simple_subplot_matches_x_axis() {
 
     plot.show();
 }
-
+//
 fn simple_subplot_matches_y_axis() {
     let trace1 = Scatter::new(vec![1, 2, 3], vec![4, 5, 6]).name("trace1");
     let trace2 = Scatter::new(vec![20, 30, 40], vec![50, 60, 70])
@@ -62,7 +63,7 @@ fn simple_subplot_matches_y_axis() {
     plot.add_trace(trace1);
     plot.add_trace(trace2);
 
-    let layout = Layout::new().y_axis(Axis::new().matches("y2")).grid(
+    let layout = Layout::new().y_axis(Vec::from([Some(Box::new(Axis::new().matches("x2")))])).grid(
         LayoutGrid::new()
             .rows(1)
             .columns(2)
@@ -72,7 +73,7 @@ fn simple_subplot_matches_y_axis() {
 
     plot.show();
 }
-
+//
 fn custom_sized_subplot() {
     let trace1 = Scatter::new(vec![1, 2, 3], vec![4, 5, 6]).name("trace1");
     let trace2 = Scatter::new(vec![20, 30, 40], vec![50, 60, 70])
@@ -84,10 +85,14 @@ fn custom_sized_subplot() {
     plot.add_trace(trace1);
     plot.add_trace(trace2);
 
+    let mut x_axis = Vec::new();
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0., 0.7]))));
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0.8, 1.]))));
+    let y_axis = Vec::from([Some(Box::new(Axis::new().anchor("x2")))]);
+
     let layout = Layout::new()
-        .x_axis(Axis::new().domain(&[0., 0.7]))
-        .y_axis2(Axis::new().anchor("x2"))
-        .x_axis2(Axis::new().domain(&[0.8, 1.]));
+        .x_axis(x_axis)
+        .y_axis(y_axis);
     plot.set_layout(layout);
 
     plot.show();
@@ -162,11 +167,13 @@ fn stacked_subplots_with_shared_x_axis() {
     plot.add_trace(trace2);
     plot.add_trace(trace3);
 
+    let mut y_axis = Vec::new();
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0., 0.33]))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.33, 0.66]))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.66, 1.]))));
     let layout = Layout::new()
-        .y_axis(Axis::new().domain(&[0., 0.33]))
         .legend(Legend::new().trace_order(TraceOrder::Reversed))
-        .y_axis2(Axis::new().domain(&[0.33, 0.66]))
-        .y_axis3(Axis::new().domain(&[0.66, 1.]));
+        .y_axis(y_axis);
     plot.set_layout(layout);
 
     plot.show();
@@ -193,22 +200,29 @@ fn multiple_custom_sized_subplots() {
     plot.add_trace(trace3);
     plot.add_trace(trace4);
 
+    let mut x_axis = Vec::new();
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0., 0.45]).anchor("y1"))));
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0.55, 1.]).anchor("y2"))));
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0.55, 1.]).anchor("y3"))));
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0., 1.]).anchor("y4"))));
+
+    let mut y_axis = Vec::new();
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.5, 1.]).anchor("x1"))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.8, 1.]).anchor("x2"))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.5, 0.75]).anchor("x3"))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0., 0.45]).anchor("x4"))));
+
     let layout = Layout::new()
         .title("Multiple Custom Sized Subplots")
-        .x_axis(Axis::new().domain(&[0., 0.45]).anchor("y1"))
-        .y_axis(Axis::new().domain(&[0.5, 1.]).anchor("x1"))
-        .x_axis2(Axis::new().domain(&[0.55, 1.]).anchor("y2"))
-        .y_axis2(Axis::new().domain(&[0.8, 1.]).anchor("x2"))
-        .x_axis3(Axis::new().domain(&[0.55, 1.]).anchor("y3"))
-        .y_axis3(Axis::new().domain(&[0.5, 0.75]).anchor("x3"))
-        .x_axis4(Axis::new().domain(&[0., 1.]).anchor("y4"))
-        .y_axis4(Axis::new().domain(&[0., 0.45]).anchor("x4"));
+        .x_axis(x_axis)
+        .y_axis(y_axis);
+
     plot.set_layout(layout);
 
     plot.show();
 }
 
-// Multiple Axes
+// // Multiple Axes
 fn two_y_axes() {
     let trace1 = Scatter::new(vec![1, 2, 3], vec![40, 50, 60]).name("trace1");
     let trace2 = Scatter::new(vec![2, 3, 4], vec![4, 5, 6])
@@ -219,16 +233,17 @@ fn two_y_axes() {
     plot.add_trace(trace1);
     plot.add_trace(trace2);
 
+    let mut y_axis = Vec::new();
+    y_axis.push(Some(Box::new(Axis::new().title("yaxis title"))));
+    y_axis.push(Some(Box::new(Axis::new().title(Title::from("yaxis2 title").font(Font::new().color(Rgb::new(148, 103, 189))))
+        .tick_font(Font::new().color(Rgb::new(148, 103, 189)))
+                .overlaying("y")
+                .side(AxisSide::Right))));
+
     let layout = Layout::new()
         .title("Double Y Axis Example")
-        .y_axis(Axis::new().title("yaxis title"))
-        .y_axis2(
-            Axis::new()
-                .title(Title::from("yaxis2 title").font(Font::new().color(Rgb::new(148, 103, 189))))
-                .tick_font(Font::new().color(Rgb::new(148, 103, 189)))
-                .overlaying("y")
-                .side(AxisSide::Right),
-        );
+        .y_axis(y_axis);
+
     plot.set_layout(layout);
 
     plot.show();
@@ -248,41 +263,38 @@ fn multiple_axes() {
     plot.add_trace(trace3);
     plot.add_trace(trace4);
 
-    let layout = Layout::new()
-        .title("multiple y-axes example")
-        .width(800)
-        .x_axis(Axis::new().domain(&[0.3, 0.7]))
-        .y_axis(
-            Axis::new()
+    let mut y_axis = Vec::new();
+
+    y_axis.push(Some(Box::new(Axis::new()
                 .title(Title::from("yaxis title").font(Font::new().color("#1f77b4")))
-                .tick_font(Font::new().color("#1f77b4")),
-        )
-        .y_axis2(
-            Axis::new()
+                .tick_font(Font::new().color("#1f77b4")))));
+    y_axis.push(Some(Box::new(Axis::new()
                 .title(Title::from("yaxis2 title").font(Font::new().color("#ff7f0e")))
                 .tick_font(Font::new().color("#ff7f0e"))
                 .anchor("free")
                 .overlaying("y")
                 .side(AxisSide::Left)
-                .position(0.15),
-        )
-        .y_axis3(
-            Axis::new()
+                .position(0.15))));
+    y_axis.push(Some(Box::new(Axis::new()
                 .title(Title::from("yaxis3 title").font(Font::new().color("#d62728")))
                 .tick_font(Font::new().color("#d62728"))
                 .anchor("x")
                 .overlaying("y")
-                .side(AxisSide::Right),
-        )
-        .y_axis4(
-            Axis::new()
+                .side(AxisSide::Right))));
+    y_axis.push(Some(Box::new(Axis::new()
                 .title(Title::from("yaxis4 title").font(Font::new().color("#9467bd")))
                 .tick_font(Font::new().color("#9467bd"))
                 .anchor("free")
                 .overlaying("y")
                 .side(AxisSide::Right)
-                .position(0.85),
-        );
+                .position(0.85))));
+
+
+    let layout = Layout::new()
+        .title("multiple y-axes example")
+        .width(800)
+        .x_axis(Vec::from([Some(Box::new(Axis::new().domain(&[0.3, 0.7])))]))
+        .y_axis(y_axis);
     plot.set_layout(layout);
 
     plot.show();

From df4759b6b9b158fee008f812865c67ca7e314c24 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Tue, 6 Aug 2024 14:38:24 +0900
Subject: [PATCH 06/18] Updating statistical charts example

---
 examples/statistical_charts/src/main.rs | 27 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/examples/statistical_charts/src/main.rs b/examples/statistical_charts/src/main.rs
index f1c0063..e663dcd 100644
--- a/examples/statistical_charts/src/main.rs
+++ b/examples/statistical_charts/src/main.rs
@@ -202,8 +202,9 @@ fn grouped_box_plot() {
     plot.add_trace(trace2);
     plot.add_trace(trace3);
 
+    let y_axis = Vec::from([Some(Box::new(Axis::new().title("normalized moisture").zero_line(false)))]);
     let layout = Layout::new()
-        .y_axis(Axis::new().title("normalized moisture").zero_line(false))
+        .y_axis(y_axis)
         .box_mode(BoxMode::Group);
 
     plot.set_layout(layout);
@@ -316,9 +317,10 @@ fn grouped_horizontal_box_plot() {
     plot.add_trace(trace2);
     plot.add_trace(trace3);
 
+    let x_axis = Vec::from([Some(Box::new(Axis::new().title("normalized moisture").zero_line(false)))]);
     let layout = Layout::new()
         .title("Grouped Horizontal Box Plot")
-        .x_axis(Axis::new().title("normalized moisture").zero_line(false))
+        .x_axis(x_axis)
         .box_mode(BoxMode::Group);
 
     plot.set_layout(layout);
@@ -361,10 +363,9 @@ fn fully_styled_box_plot() {
     ];
 
     let mut plot = Plot::new();
-    let layout = Layout::new()
-        .title("Points Scored by the Top 9 Scoring NBA Players in 2012")
-        .y_axis(
-            Axis::new()
+
+    let y_axis = Vec::from([Some(
+        Box::new(Axis::new()
                 .auto_range(true)
                 .show_grid(true)
                 .zero_line(true)
@@ -372,8 +373,11 @@ fn fully_styled_box_plot() {
                 .grid_color(Rgb::new(255, 255, 255))
                 .grid_width(1)
                 .zero_line_color(Rgb::new(255, 255, 255))
-                .zero_line_width(2),
-        )
+                .zero_line_width(2)
+        ))]);
+    let layout = Layout::new()
+        .title("Points Scored by the Top 9 Scoring NBA Players in 2012")
+        .y_axis(y_axis )
         .margin(Margin::new().left(40).right(30).bottom(80).top(100))
         .paper_background_color(Rgb::new(243, 243, 243))
         .plot_background_color(Rgb::new(243, 243, 243))
@@ -511,10 +515,13 @@ fn colored_and_styled_histograms() {
         .opacity(0.75)
         .auto_bin_x(false)
         .x_bins(Bins::new(-3.2, 4.0, 0.06));
+
+    let x_axis = Vec::from([Some(Box::new(Axis::new().title("Value")))]);
+    let y_axis = Vec::from([Some(Box::new(Axis::new().title("Count")))]);
     let layout = Layout::new()
         .title("Colored and Styled Histograms")
-        .x_axis(Axis::new().title("Value"))
-        .y_axis(Axis::new().title("Count"))
+        .x_axis(x_axis)
+        .y_axis(y_axis)
         .bar_mode(BarMode::Overlay)
         .bar_gap(0.05)
         .bar_group_gap(0.2);

From 3e910b28f1200f129a3c3a48238cf28d1b94defe Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Sun, 11 Aug 2024 21:20:57 +0900
Subject: [PATCH 07/18] Creating axis builders

---
 plotly/src/layout/mod.rs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index 72331a4..2c3718d 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -597,6 +597,14 @@ impl Axis {
         self.domain = Some(domain.to_vec());
         self
     }
+
+    pub fn single_axis(axis: Axis)->Vec<Option<Box<Axis>>>{
+        vec![Some(Box::new(axis))]
+    }
+
+    pub fn from_axes(axes: Vec<Axis>) -> Vec<Option<Box<Axis>>> {
+        axes.into_iter().map(|axis| Some(Box::new(axis))).collect()
+    }
 }
 
 #[derive(Serialize, Debug, Clone)]
@@ -2872,6 +2880,20 @@ mod tests {
         assert_eq!(to_value(annotation).unwrap(), expected);
     }
 
+    #[test]
+    fn test_single_axis_builder(){
+        let single_axis = Axis::single_axis(Axis::new());
+        let expected = json!([{}]);
+        assert_eq!(to_value(single_axis).unwrap(), expected);
+    }
+
+    #[test]
+    fn test_axes_builder(){
+        let axes = Axis::from_axes(vec![Axis::new(), Axis::new()]);
+        let expected = json!([{}, {}]);
+        assert_eq!(to_value(axes).unwrap(), expected);
+    }
+
     #[test]
     #[rustfmt::skip]
     fn test_serialize_click_mode() {

From 52e687b96aad917905e59066e8e42005fc7cacfa Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 23 Aug 2024 01:22:29 +0900
Subject: [PATCH 08/18] Adding x,y,z add axis to api

---
 plotly/src/layout/mod.rs | 43 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index 2c3718d..efc25d5 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -597,14 +597,6 @@ impl Axis {
         self.domain = Some(domain.to_vec());
         self
     }
-
-    pub fn single_axis(axis: Axis)->Vec<Option<Box<Axis>>>{
-        vec![Some(Box::new(axis))]
-    }
-
-    pub fn from_axes(axes: Vec<Axis>) -> Vec<Option<Box<Axis>>> {
-        axes.into_iter().map(|axis| Some(Box::new(axis))).collect()
-    }
 }
 
 #[derive(Serialize, Debug, Clone)]
@@ -1983,6 +1975,27 @@ impl Layout {
         self.template = Some(Box::new(template.into()));
         self
     }
+
+    pub fn add_x_axis(&mut self, axis: Axis){
+        if self.x_axis.is_none(){
+            self.x_axis = Some(Vec::new());
+        }
+        self.x_axis.as_mut().unwrap().push(Some(Box::new(axis)));
+    }
+
+    pub fn add_y_axis(&mut self, axis: Axis){
+        if self.y_axis.is_none(){
+            self.y_axis = Some(Vec::new());
+        }
+        self.y_axis.as_mut().unwrap().push(Some(Box::new(axis)));
+    }
+
+    pub fn add_z_axis(&mut self, axis: Axis){
+        if self.z_axis.is_none(){
+            self.z_axis = Some(Vec::new());
+        }
+        self.z_axis.as_mut().unwrap().push(Some(Box::new(axis)));
+    }
 }
 
 #[cfg(test)]
@@ -2880,20 +2893,6 @@ mod tests {
         assert_eq!(to_value(annotation).unwrap(), expected);
     }
 
-    #[test]
-    fn test_single_axis_builder(){
-        let single_axis = Axis::single_axis(Axis::new());
-        let expected = json!([{}]);
-        assert_eq!(to_value(single_axis).unwrap(), expected);
-    }
-
-    #[test]
-    fn test_axes_builder(){
-        let axes = Axis::from_axes(vec![Axis::new(), Axis::new()]);
-        let expected = json!([{}, {}]);
-        assert_eq!(to_value(axes).unwrap(), expected);
-    }
-
     #[test]
     #[rustfmt::skip]
     fn test_serialize_click_mode() {

From e53ceadf34525ebebafaa088415b8db4c1e4244d Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 12:19:50 +0900
Subject: [PATCH 09/18] Defining axis serializer function

---
 plotly/src/layout/mod.rs | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index 7a70c23..57ec0fe 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -17,6 +17,43 @@ use crate::{
     private::{NumOrString, NumOrStringCollection},
 };
 
+
+fn serialize_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer: S, axis_prefix: &str) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    let mut map = HashMap::new();
+    let axes = axes.as_ref().unwrap();
+
+    for (i, axis) in axes.iter().enumerate() {
+        let axe = axis.as_ref().unwrap();
+        let key = if i == 0 {
+            axis_prefix.to_string()
+        } else {
+            format!("{}{}", axis_prefix, i + 1)
+        };
+        map.insert(key, axe);
+    }
+
+    map.serialize(serializer)
+}
+
+fn serialize_x_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer:S)-> Result<S::Ok,S::Error>
+where S:Serializer{
+    serialize_axes(axes, serializer, "xaxis")
+}
+
+fn serialize_y_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer:S)-> Result<S::Ok,S::Error>
+where S:Serializer{
+    serialize_axes(axes, serializer, "yaxis")
+}
+
+
+fn serialize_z_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer:S)-> Result<S::Ok,S::Error>
+where S:Serializer{
+    serialize_axes(axes, serializer, "zaxis")
+}
+
 #[derive(Serialize, Debug, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum AxisType {

From 14721ac58c279421daeacf33b19d5258e8e58f77 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 12:21:04 +0900
Subject: [PATCH 10/18] Defining axes as vector instead of filed items values

---
 plotly/src/layout/mod.rs | 93 +++++-----------------------------------
 1 file changed, 11 insertions(+), 82 deletions(-)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index 57ec0fe..df4a672 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -2,7 +2,7 @@ pub mod themes;
 pub mod update_menu;
 
 use std::borrow::Cow;
-
+use std::collections::HashMap;
 use plotly_derive::FieldSetter;
 use serde::{Serialize, Serializer};
 use update_menu::UpdateMenu;
@@ -1743,38 +1743,10 @@ pub struct LayoutTemplate {
     grid: Option<LayoutGrid>,
     calendar: Option<Calendar>,
 
-    #[serde(rename = "xaxis")]
-    x_axis: Option<Box<Axis>>,
-    #[serde(rename = "yaxis")]
-    y_axis: Option<Box<Axis>>,
-    #[serde(rename = "xaxis2")]
-    x_axis2: Option<Box<Axis>>,
-    #[serde(rename = "yaxis2")]
-    y_axis2: Option<Box<Axis>>,
-    #[serde(rename = "xaxis3")]
-    x_axis3: Option<Box<Axis>>,
-    #[serde(rename = "yaxis3")]
-    y_axis3: Option<Box<Axis>>,
-    #[serde(rename = "xaxis4")]
-    x_axis4: Option<Box<Axis>>,
-    #[serde(rename = "yaxis4")]
-    y_axis4: Option<Box<Axis>>,
-    #[serde(rename = "xaxis5")]
-    x_axis5: Option<Box<Axis>>,
-    #[serde(rename = "yaxis5")]
-    y_axis5: Option<Box<Axis>>,
-    #[serde(rename = "xaxis6")]
-    x_axis6: Option<Box<Axis>>,
-    #[serde(rename = "yaxis6")]
-    y_axis6: Option<Box<Axis>>,
-    #[serde(rename = "xaxis7")]
-    x_axis7: Option<Box<Axis>>,
-    #[serde(rename = "yaxis7")]
-    y_axis7: Option<Box<Axis>>,
-    #[serde(rename = "xaxis8")]
-    x_axis8: Option<Box<Axis>>,
-    #[serde(rename = "yaxis8")]
-    y_axis8: Option<Box<Axis>>,
+    #[serde(flatten, serialize_with="serialize_x_axes")]
+    x_axis: Option<Vec<Option<Box<Axis>>>>,
+    #[serde(flatten, serialize_with="serialize_y_axes")]
+    y_axis: Option<Vec<Option<Box<Axis>>>>,
 
     // ternary: Option<LayoutTernary>,
     scene: Option<LayoutScene>,
@@ -1910,55 +1882,12 @@ pub struct Layout {
     grid: Option<LayoutGrid>,
     calendar: Option<Calendar>,
 
-    #[serde(rename = "xaxis")]
-    x_axis: Option<Box<Axis>>,
-    #[serde(rename = "yaxis")]
-    y_axis: Option<Box<Axis>>,
-    #[serde(rename = "zaxis")]
-    z_axis: Option<Box<Axis>>,
-
-    #[serde(rename = "xaxis2")]
-    x_axis2: Option<Box<Axis>>,
-    #[serde(rename = "yaxis2")]
-    y_axis2: Option<Box<Axis>>,
-    #[serde(rename = "zaxis2")]
-    z_axis2: Option<Box<Axis>>,
-    #[serde(rename = "xaxis3")]
-    x_axis3: Option<Box<Axis>>,
-    #[serde(rename = "yaxis3")]
-    y_axis3: Option<Box<Axis>>,
-    #[serde(rename = "zaxis3")]
-    z_axis3: Option<Box<Axis>>,
-    #[serde(rename = "xaxis4")]
-    x_axis4: Option<Box<Axis>>,
-    #[serde(rename = "yaxis4")]
-    y_axis4: Option<Box<Axis>>,
-    #[serde(rename = "zaxis4")]
-    z_axis4: Option<Box<Axis>>,
-    #[serde(rename = "xaxis5")]
-    x_axis5: Option<Box<Axis>>,
-    #[serde(rename = "yaxis5")]
-    y_axis5: Option<Box<Axis>>,
-    #[serde(rename = "zaxis5")]
-    z_axis5: Option<Box<Axis>>,
-    #[serde(rename = "xaxis6")]
-    x_axis6: Option<Box<Axis>>,
-    #[serde(rename = "yaxis6")]
-    y_axis6: Option<Box<Axis>>,
-    #[serde(rename = "zaxis6")]
-    z_axis6: Option<Box<Axis>>,
-    #[serde(rename = "xaxis7")]
-    x_axis7: Option<Box<Axis>>,
-    #[serde(rename = "yaxis7")]
-    y_axis7: Option<Box<Axis>>,
-    #[serde(rename = "zaxis7")]
-    z_axis7: Option<Box<Axis>>,
-    #[serde(rename = "xaxis8")]
-    x_axis8: Option<Box<Axis>>,
-    #[serde(rename = "yaxis8")]
-    y_axis8: Option<Box<Axis>>,
-    #[serde(rename = "zaxis8")]
-    z_axis8: Option<Box<Axis>>,
+    #[serde(flatten, serialize_with="serialize_x_axes")]
+    x_axis: Option<Vec<Option<Box<Axis>>>>,
+    #[serde(flatten, serialize_with="serialize_y_axes")]
+    y_axis: Option<Vec<Option<Box<Axis>>>>,
+    #[serde(flatten, serialize_with="serialize_z_axes")]
+    z_axis: Option<Vec<Option<Box<Axis>>>>,
 
     // ternary: Option<LayoutTernary>,
     scene: Option<LayoutScene>,

From 8f39f9b3c4875aca85a442b82098ec86075f6e09 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 12:22:34 +0900
Subject: [PATCH 11/18] Updating layout test to use the new vector axis instead
 of filed accessed ones

---
 plotly/src/layout/mod.rs | 54 ++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index df4a672..72331a4 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -2927,6 +2927,14 @@ mod tests {
 
     #[test]
     fn test_serialize_layout_template() {
+
+        let mut xaxis:Vec<Option<Box<Axis>>> = Vec::new();
+        let mut yaxis:Vec<Option<Box<Axis>>> = Vec::new();
+        for _ in 0..8{
+            xaxis.push(Some(Box::new(Axis::new())));
+            yaxis.push(Some(Box::new(Axis::new())));
+        }
+
         let layout_template = LayoutTemplate::new()
             .title("Title")
             .show_legend(false)
@@ -2953,22 +2961,8 @@ mod tests {
             .hover_label(Label::new())
             .grid(LayoutGrid::new())
             .calendar(Calendar::Jalali)
-            .x_axis(Axis::new())
-            .x_axis2(Axis::new())
-            .x_axis3(Axis::new())
-            .x_axis4(Axis::new())
-            .x_axis5(Axis::new())
-            .x_axis6(Axis::new())
-            .x_axis7(Axis::new())
-            .x_axis8(Axis::new())
-            .y_axis(Axis::new())
-            .y_axis2(Axis::new())
-            .y_axis3(Axis::new())
-            .y_axis4(Axis::new())
-            .y_axis5(Axis::new())
-            .y_axis6(Axis::new())
-            .y_axis7(Axis::new())
-            .y_axis8(Axis::new())
+            .x_axis(xaxis)
+            .y_axis(yaxis)
             .annotations(vec![Annotation::new()])
             .shapes(vec![Shape::new()])
             .new_shape(NewShape::new())
@@ -3069,6 +3063,14 @@ mod tests {
 
     #[test]
     fn test_serialize_layout() {
+
+        let mut xaxis:Vec<Option<Box<Axis>>> = Vec::new();
+        let mut yaxis:Vec<Option<Box<Axis>>> = Vec::new();
+        for _ in 0..8{
+            xaxis.push(Some(Box::new(Axis::new())));
+            yaxis.push(Some(Box::new(Axis::new())));
+        }
+
         let layout = Layout::new()
             .title("Title")
             .title(String::from("Title"))
@@ -3098,22 +3100,8 @@ mod tests {
             .template(Template::new())
             .grid(LayoutGrid::new())
             .calendar(Calendar::Jalali)
-            .x_axis(Axis::new())
-            .x_axis2(Axis::new())
-            .x_axis3(Axis::new())
-            .x_axis4(Axis::new())
-            .x_axis5(Axis::new())
-            .x_axis6(Axis::new())
-            .x_axis7(Axis::new())
-            .x_axis8(Axis::new())
-            .y_axis(Axis::new())
-            .y_axis2(Axis::new())
-            .y_axis3(Axis::new())
-            .y_axis4(Axis::new())
-            .y_axis5(Axis::new())
-            .y_axis6(Axis::new())
-            .y_axis7(Axis::new())
-            .y_axis8(Axis::new())
+            .x_axis(xaxis)
+            .y_axis(yaxis)
             .annotations(vec![Annotation::new()])
             .shapes(vec![Shape::new()])
             .new_shape(NewShape::new())
@@ -3135,7 +3123,7 @@ mod tests {
             .extend_pie_colors(true)
             .sunburst_colorway(vec!["#654654"])
             .extend_sunburst_colors(false)
-            .z_axis(Axis::new())
+            .z_axis(Vec::from([Some(Box::new(Axis::new()))]))
             .scene(LayoutScene::new());
 
         let expected = json!({

From da083f245c20a059d663d1221c94e11725e62e03 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 12:36:31 +0900
Subject: [PATCH 12/18] Updating themes layout usage signature

---
 plotly/src/layout/themes.rs | 40 ++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/plotly/src/layout/themes.rs b/plotly/src/layout/themes.rs
index a687caa..e5f0cd5 100644
--- a/plotly/src/layout/themes.rs
+++ b/plotly/src/layout/themes.rs
@@ -64,22 +64,22 @@ pub static PLOTLY_WHITE: Lazy<Template> = Lazy::new(|| {
         .plot_background_color("#ffffff")
         .title(Title::new().x(0.05))
         .x_axis(
-            Axis::new()
+            Vec::from([Some(Box::new(Axis::new()
                 .auto_margin(true)
                 .grid_color("#EBF0F8")
                 .line_color("#EBF0F8")
                 // missing title.standoff = 15
                 .zero_line_color("#EBF0F8")
-                .zero_line_width(2),
+                .zero_line_width(2)))])
         )
         .y_axis(
-            Axis::new()
+            Vec::from([Some(Box::new(Axis::new()
                 .auto_margin(true)
                 .grid_color("#EBF0F8")
                 .line_color("#EBF0F8")
                 // missing title.standoff = 15
                 .zero_line_color("#EBF0F8")
-                .zero_line_width(2),
+                .zero_line_width(2)))])
         );
     Template::new().layout(layout_template)
 });
@@ -140,22 +140,26 @@ pub static PLOTLY_DARK: Lazy<Template> = Lazy::new(|| {
         .plot_background_color("#111111")
         .title(Title::new().x(0.05))
         .x_axis(
-            Axis::new()
-                .auto_margin(true)
-                .grid_color("#283442")
-                .line_color("#506784")
-                // missing title.standoff = 15
-                .zero_line_color("#283442")
-                .zero_line_width(2),
+            Vec::from(
+                [Some(Box::new(Axis::new()
+                    .auto_margin(true)
+                    .grid_color("#283442")
+                    .line_color("#506784")
+                    // missing title.standoff = 15
+                    .zero_line_color("#283442")
+                    .zero_line_width(2)))]
+            )
         )
         .y_axis(
-            Axis::new()
-                .auto_margin(true)
-                .grid_color("#283442")
-                .line_color("#506784")
-                // missing title.standoff = 15
-                .zero_line_color("#283442")
-                .zero_line_width(2),
+            Vec::from(
+                [Some(Box::new(Axis::new()
+                    .auto_margin(true)
+                    .grid_color("#283442")
+                    .line_color("#506784")
+                    // missing title.standoff = 15
+                    .zero_line_color("#283442")
+                    .zero_line_width(2)))]
+            )
         );
     Template::new().layout(layout_template)
 });

From b93a5d445a6e1ec67c290fa9dc9e8960ca4deaf5 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Fri, 2 Aug 2024 15:40:56 +0900
Subject: [PATCH 13/18] Updating test to new axis definition

---
 examples/subplots/src/main.rs | 106 +++++++++++++++++++---------------
 1 file changed, 59 insertions(+), 47 deletions(-)

diff --git a/examples/subplots/src/main.rs b/examples/subplots/src/main.rs
index c78bde5..bf959a5 100644
--- a/examples/subplots/src/main.rs
+++ b/examples/subplots/src/main.rs
@@ -1,5 +1,6 @@
 #![allow(dead_code)]
 
+use std::vec;
 use plotly::common::{Anchor, AxisSide, Font, Title};
 use plotly::layout::{
     Annotation, Axis, GridPattern, Layout, LayoutGrid, Legend, RowOrder, TraceOrder,
@@ -40,7 +41,7 @@ fn simple_subplot_matches_x_axis() {
     plot.add_trace(trace1);
     plot.add_trace(trace2);
 
-    let layout = Layout::new().x_axis(Axis::new().matches("x2")).grid(
+    let layout = Layout::new().x_axis(Vec::from([Some(Box::new(Axis::new().matches("x2")))])).grid(
         LayoutGrid::new()
             .rows(1)
             .columns(2)
@@ -50,7 +51,7 @@ fn simple_subplot_matches_x_axis() {
 
     plot.show();
 }
-
+//
 fn simple_subplot_matches_y_axis() {
     let trace1 = Scatter::new(vec![1, 2, 3], vec![4, 5, 6]).name("trace1");
     let trace2 = Scatter::new(vec![20, 30, 40], vec![50, 60, 70])
@@ -62,7 +63,7 @@ fn simple_subplot_matches_y_axis() {
     plot.add_trace(trace1);
     plot.add_trace(trace2);
 
-    let layout = Layout::new().y_axis(Axis::new().matches("y2")).grid(
+    let layout = Layout::new().y_axis(Vec::from([Some(Box::new(Axis::new().matches("x2")))])).grid(
         LayoutGrid::new()
             .rows(1)
             .columns(2)
@@ -72,7 +73,7 @@ fn simple_subplot_matches_y_axis() {
 
     plot.show();
 }
-
+//
 fn custom_sized_subplot() {
     let trace1 = Scatter::new(vec![1, 2, 3], vec![4, 5, 6]).name("trace1");
     let trace2 = Scatter::new(vec![20, 30, 40], vec![50, 60, 70])
@@ -84,10 +85,14 @@ fn custom_sized_subplot() {
     plot.add_trace(trace1);
     plot.add_trace(trace2);
 
+    let mut x_axis = Vec::new();
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0., 0.7]))));
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0.8, 1.]))));
+    let y_axis = Vec::from([Some(Box::new(Axis::new().anchor("x2")))]);
+
     let layout = Layout::new()
-        .x_axis(Axis::new().domain(&[0., 0.7]))
-        .y_axis2(Axis::new().anchor("x2"))
-        .x_axis2(Axis::new().domain(&[0.8, 1.]));
+        .x_axis(x_axis)
+        .y_axis(y_axis);
     plot.set_layout(layout);
 
     plot.show();
@@ -162,11 +167,13 @@ fn stacked_subplots_with_shared_x_axis() {
     plot.add_trace(trace2);
     plot.add_trace(trace3);
 
+    let mut y_axis = Vec::new();
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0., 0.33]))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.33, 0.66]))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.66, 1.]))));
     let layout = Layout::new()
-        .y_axis(Axis::new().domain(&[0., 0.33]))
         .legend(Legend::new().trace_order(TraceOrder::Reversed))
-        .y_axis2(Axis::new().domain(&[0.33, 0.66]))
-        .y_axis3(Axis::new().domain(&[0.66, 1.]));
+        .y_axis(y_axis);
     plot.set_layout(layout);
 
     plot.show();
@@ -193,22 +200,29 @@ fn multiple_custom_sized_subplots() {
     plot.add_trace(trace3);
     plot.add_trace(trace4);
 
+    let mut x_axis = Vec::new();
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0., 0.45]).anchor("y1"))));
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0.55, 1.]).anchor("y2"))));
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0.55, 1.]).anchor("y3"))));
+    x_axis.push(Some(Box::new(Axis::new().domain(&[0., 1.]).anchor("y4"))));
+
+    let mut y_axis = Vec::new();
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.5, 1.]).anchor("x1"))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.8, 1.]).anchor("x2"))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0.5, 0.75]).anchor("x3"))));
+    y_axis.push(Some(Box::new(Axis::new().domain(&[0., 0.45]).anchor("x4"))));
+
     let layout = Layout::new()
         .title("Multiple Custom Sized Subplots")
-        .x_axis(Axis::new().domain(&[0., 0.45]).anchor("y1"))
-        .y_axis(Axis::new().domain(&[0.5, 1.]).anchor("x1"))
-        .x_axis2(Axis::new().domain(&[0.55, 1.]).anchor("y2"))
-        .y_axis2(Axis::new().domain(&[0.8, 1.]).anchor("x2"))
-        .x_axis3(Axis::new().domain(&[0.55, 1.]).anchor("y3"))
-        .y_axis3(Axis::new().domain(&[0.5, 0.75]).anchor("x3"))
-        .x_axis4(Axis::new().domain(&[0., 1.]).anchor("y4"))
-        .y_axis4(Axis::new().domain(&[0., 0.45]).anchor("x4"));
+        .x_axis(x_axis)
+        .y_axis(y_axis);
+
     plot.set_layout(layout);
 
     plot.show();
 }
 
-// Multiple Axes
+// // Multiple Axes
 fn two_y_axes() {
     let trace1 = Scatter::new(vec![1, 2, 3], vec![40, 50, 60]).name("trace1");
     let trace2 = Scatter::new(vec![2, 3, 4], vec![4, 5, 6])
@@ -219,16 +233,17 @@ fn two_y_axes() {
     plot.add_trace(trace1);
     plot.add_trace(trace2);
 
+    let mut y_axis = Vec::new();
+    y_axis.push(Some(Box::new(Axis::new().title("yaxis title"))));
+    y_axis.push(Some(Box::new(Axis::new().title(Title::from("yaxis2 title").font(Font::new().color(Rgb::new(148, 103, 189))))
+        .tick_font(Font::new().color(Rgb::new(148, 103, 189)))
+                .overlaying("y")
+                .side(AxisSide::Right))));
+
     let layout = Layout::new()
         .title("Double Y Axis Example")
-        .y_axis(Axis::new().title("yaxis title"))
-        .y_axis2(
-            Axis::new()
-                .title(Title::from("yaxis2 title").font(Font::new().color(Rgb::new(148, 103, 189))))
-                .tick_font(Font::new().color(Rgb::new(148, 103, 189)))
-                .overlaying("y")
-                .side(AxisSide::Right),
-        );
+        .y_axis(y_axis);
+
     plot.set_layout(layout);
 
     plot.show();
@@ -248,41 +263,38 @@ fn multiple_axes() {
     plot.add_trace(trace3);
     plot.add_trace(trace4);
 
-    let layout = Layout::new()
-        .title("multiple y-axes example")
-        .width(800)
-        .x_axis(Axis::new().domain(&[0.3, 0.7]))
-        .y_axis(
-            Axis::new()
+    let mut y_axis = Vec::new();
+
+    y_axis.push(Some(Box::new(Axis::new()
                 .title(Title::from("yaxis title").font(Font::new().color("#1f77b4")))
-                .tick_font(Font::new().color("#1f77b4")),
-        )
-        .y_axis2(
-            Axis::new()
+                .tick_font(Font::new().color("#1f77b4")))));
+    y_axis.push(Some(Box::new(Axis::new()
                 .title(Title::from("yaxis2 title").font(Font::new().color("#ff7f0e")))
                 .tick_font(Font::new().color("#ff7f0e"))
                 .anchor("free")
                 .overlaying("y")
                 .side(AxisSide::Left)
-                .position(0.15),
-        )
-        .y_axis3(
-            Axis::new()
+                .position(0.15))));
+    y_axis.push(Some(Box::new(Axis::new()
                 .title(Title::from("yaxis3 title").font(Font::new().color("#d62728")))
                 .tick_font(Font::new().color("#d62728"))
                 .anchor("x")
                 .overlaying("y")
-                .side(AxisSide::Right),
-        )
-        .y_axis4(
-            Axis::new()
+                .side(AxisSide::Right))));
+    y_axis.push(Some(Box::new(Axis::new()
                 .title(Title::from("yaxis4 title").font(Font::new().color("#9467bd")))
                 .tick_font(Font::new().color("#9467bd"))
                 .anchor("free")
                 .overlaying("y")
                 .side(AxisSide::Right)
-                .position(0.85),
-        );
+                .position(0.85))));
+
+
+    let layout = Layout::new()
+        .title("multiple y-axes example")
+        .width(800)
+        .x_axis(Vec::from([Some(Box::new(Axis::new().domain(&[0.3, 0.7])))]))
+        .y_axis(y_axis);
     plot.set_layout(layout);
 
     plot.show();

From 92fc89c9fda97ed7a665a327aa1e05b45c57cfd5 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Tue, 6 Aug 2024 14:38:24 +0900
Subject: [PATCH 14/18] Updating statistical charts example

---
 examples/statistical_charts/src/main.rs | 27 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/examples/statistical_charts/src/main.rs b/examples/statistical_charts/src/main.rs
index 8bde9c9..f89f076 100644
--- a/examples/statistical_charts/src/main.rs
+++ b/examples/statistical_charts/src/main.rs
@@ -202,8 +202,9 @@ fn grouped_box_plot() {
     plot.add_trace(trace2);
     plot.add_trace(trace3);
 
+    let y_axis = Vec::from([Some(Box::new(Axis::new().title("normalized moisture").zero_line(false)))]);
     let layout = Layout::new()
-        .y_axis(Axis::new().title("normalized moisture").zero_line(false))
+        .y_axis(y_axis)
         .box_mode(BoxMode::Group);
 
     plot.set_layout(layout);
@@ -316,9 +317,10 @@ fn grouped_horizontal_box_plot() {
     plot.add_trace(trace2);
     plot.add_trace(trace3);
 
+    let x_axis = Vec::from([Some(Box::new(Axis::new().title("normalized moisture").zero_line(false)))]);
     let layout = Layout::new()
         .title("Grouped Horizontal Box Plot")
-        .x_axis(Axis::new().title("normalized moisture").zero_line(false))
+        .x_axis(x_axis)
         .box_mode(BoxMode::Group);
 
     plot.set_layout(layout);
@@ -361,10 +363,9 @@ fn fully_styled_box_plot() {
     ];
 
     let mut plot = Plot::new();
-    let layout = Layout::new()
-        .title("Points Scored by the Top 9 Scoring NBA Players in 2012")
-        .y_axis(
-            Axis::new()
+
+    let y_axis = Vec::from([Some(
+        Box::new(Axis::new()
                 .auto_range(true)
                 .show_grid(true)
                 .zero_line(true)
@@ -372,8 +373,11 @@ fn fully_styled_box_plot() {
                 .grid_color(Rgb::new(255, 255, 255))
                 .grid_width(1)
                 .zero_line_color(Rgb::new(255, 255, 255))
-                .zero_line_width(2),
-        )
+                .zero_line_width(2)
+        ))]);
+    let layout = Layout::new()
+        .title("Points Scored by the Top 9 Scoring NBA Players in 2012")
+        .y_axis(y_axis )
         .margin(Margin::new().left(40).right(30).bottom(80).top(100))
         .paper_background_color(Rgb::new(243, 243, 243))
         .plot_background_color(Rgb::new(243, 243, 243))
@@ -511,10 +515,13 @@ fn colored_and_styled_histograms() {
         .opacity(0.75)
         .auto_bin_x(false)
         .x_bins(Bins::new(-3.2, 4.0, 0.06));
+
+    let x_axis = Vec::from([Some(Box::new(Axis::new().title("Value")))]);
+    let y_axis = Vec::from([Some(Box::new(Axis::new().title("Count")))]);
     let layout = Layout::new()
         .title("Colored and Styled Histograms")
-        .x_axis(Axis::new().title("Value"))
-        .y_axis(Axis::new().title("Count"))
+        .x_axis(x_axis)
+        .y_axis(y_axis)
         .bar_mode(BarMode::Overlay)
         .bar_gap(0.05)
         .bar_group_gap(0.2);

From 73657bd077aaf177974921966cd01658f4a8516b Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Sun, 11 Aug 2024 21:20:57 +0900
Subject: [PATCH 15/18] Creating axis builders

---
 plotly/src/layout/mod.rs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index 72331a4..2c3718d 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -597,6 +597,14 @@ impl Axis {
         self.domain = Some(domain.to_vec());
         self
     }
+
+    pub fn single_axis(axis: Axis)->Vec<Option<Box<Axis>>>{
+        vec![Some(Box::new(axis))]
+    }
+
+    pub fn from_axes(axes: Vec<Axis>) -> Vec<Option<Box<Axis>>> {
+        axes.into_iter().map(|axis| Some(Box::new(axis))).collect()
+    }
 }
 
 #[derive(Serialize, Debug, Clone)]
@@ -2872,6 +2880,20 @@ mod tests {
         assert_eq!(to_value(annotation).unwrap(), expected);
     }
 
+    #[test]
+    fn test_single_axis_builder(){
+        let single_axis = Axis::single_axis(Axis::new());
+        let expected = json!([{}]);
+        assert_eq!(to_value(single_axis).unwrap(), expected);
+    }
+
+    #[test]
+    fn test_axes_builder(){
+        let axes = Axis::from_axes(vec![Axis::new(), Axis::new()]);
+        let expected = json!([{}, {}]);
+        assert_eq!(to_value(axes).unwrap(), expected);
+    }
+
     #[test]
     #[rustfmt::skip]
     fn test_serialize_click_mode() {

From bb2dfb136963cfb524f903102670d75fc575d6de Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Tue, 22 Oct 2024 22:30:40 -0600
Subject: [PATCH 16/18] Reducing code complexity

---
 plotly/src/layout/mod.rs | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index efc25d5..d16a997 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -1976,25 +1976,16 @@ impl Layout {
         self
     }
 
-    pub fn add_x_axis(&mut self, axis: Axis){
-        if self.x_axis.is_none(){
-            self.x_axis = Some(Vec::new());
-        }
-        self.x_axis.as_mut().unwrap().push(Some(Box::new(axis)));
+    pub fn add_x_axis(&mut self, axis: Axis) {
+        self.x_axis.get_or_insert_with(|| Vec::new()).push(Some(Box::new(axis)));
     }
 
-    pub fn add_y_axis(&mut self, axis: Axis){
-        if self.y_axis.is_none(){
-            self.y_axis = Some(Vec::new());
-        }
-        self.y_axis.as_mut().unwrap().push(Some(Box::new(axis)));
+    pub fn add_y_axis(&mut self, axis: Axis) {
+        self.y_axis.get_or_insert_with(|| Vec::new()).push(Some(Box::new(axis)));
     }
 
-    pub fn add_z_axis(&mut self, axis: Axis){
-        if self.z_axis.is_none(){
-            self.z_axis = Some(Vec::new());
-        }
-        self.z_axis.as_mut().unwrap().push(Some(Box::new(axis)));
+    pub fn add_z_axis(&mut self, axis: Axis) {
+        self.z_axis.get_or_insert_with(|| Vec::new()).push(Some(Box::new(axis)));
     }
 }
 

From 99db7dc5a91267431dd4564689655cbc9eb84f90 Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Tue, 22 Oct 2024 22:35:01 -0600
Subject: [PATCH 17/18] Implementing axis and axes setters

---
 plotly/src/layout/mod.rs | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index d16a997..9de19fa 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -1987,6 +1987,44 @@ impl Layout {
     pub fn add_z_axis(&mut self, axis: Axis) {
         self.z_axis.get_or_insert_with(|| Vec::new()).push(Some(Box::new(axis)));
     }
+
+    fn set_axis(axes: &mut Option<Vec<Option<Box<Axis>>>>, index: usize, axis: Axis) -> Result<(), String> {
+        match axes {
+            None => Err("No axes found".into()),
+            Some(axes) => {
+                if index < axes.len() {
+                    axes[index] = Some(Box::new(axis));
+                    Ok(())
+                } else {
+                    Err("Index out of bounds".into())
+                }
+            }
+        }
+    }
+
+    pub fn set_x_axis(&mut self, axis_index: u32, axis: Axis) -> Result<(), String> {
+        Self::set_axis(&mut self.x_axis, axis_index as usize, axis)
+    }
+
+    pub fn set_x_axes(&mut self, axes: Vec<Axis>) {
+        self.x_axis = Some(axes.into_iter().map(|axis| Some(Box::new(axis))).collect());
+    }
+
+    pub fn set_y_axis(&mut self, axis_index: u32, axis: Axis) -> Result<(), String> {
+        Self::set_axis(&mut self.y_axis, axis_index as usize, axis)
+    }
+
+    pub fn set_y_axes(&mut self, axes: Vec<Axis>) {
+        self.y_axis = Some(axes.into_iter().map(|axis| Some(Box::new(axis))).collect());
+    }
+
+    pub fn set_z_axis(&mut self, axis_index: u32, axis: Axis) -> Result<(), String> {
+        Self::set_axis(&mut self.z_axis, axis_index as usize, axis)
+    }
+
+    pub fn set_z_axes(&mut self, axes: Vec<Axis>) {
+        self.z_axis = Some(axes.into_iter().map(|axis| Some(Box::new(axis))).collect());
+    }
 }
 
 #[cfg(test)]

From c0d81e7332e37c84b15ffd7ec1a668aac980804f Mon Sep 17 00:00:00 2001
From: yasuomaidana <yasuomaidana@gmail.com>
Date: Tue, 22 Oct 2024 22:35:59 -0600
Subject: [PATCH 18/18] Formatting code

---
 plotly/src/layout/mod.rs | 48 ++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index 9de19fa..7f71a49 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -38,19 +38,25 @@ where
     map.serialize(serializer)
 }
 
-fn serialize_x_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer:S)-> Result<S::Ok,S::Error>
-where S:Serializer{
+fn serialize_x_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
     serialize_axes(axes, serializer, "xaxis")
 }
 
-fn serialize_y_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer:S)-> Result<S::Ok,S::Error>
-where S:Serializer{
+fn serialize_y_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
     serialize_axes(axes, serializer, "yaxis")
 }
 
 
-fn serialize_z_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer:S)-> Result<S::Ok,S::Error>
-where S:Serializer{
+fn serialize_z_axes<S>(axes: &Option<Vec<Option<Box<Axis>>>>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
     serialize_axes(axes, serializer, "zaxis")
 }
 
@@ -181,7 +187,7 @@ pub enum ItemClick {
 impl Serialize for ItemClick {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
-        S: serde::Serializer,
+        S: Serializer,
     {
         match *self {
             Self::Toggle => serializer.serialize_str("toggle"),
@@ -1303,7 +1309,7 @@ pub enum DragMode {
 impl Serialize for DragMode {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
-        S: serde::Serializer,
+        S: Serializer,
     {
         match *self {
             Self::Zoom => serializer.serialize_str("zoom"),
@@ -1335,7 +1341,7 @@ pub enum DragMode3D {
 impl Serialize for DragMode3D {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
-        S: serde::Serializer,
+        S: Serializer,
     {
         match *self {
             Self::Zoom => serializer.serialize_str("zoom"),
@@ -1743,9 +1749,9 @@ pub struct LayoutTemplate {
     grid: Option<LayoutGrid>,
     calendar: Option<Calendar>,
 
-    #[serde(flatten, serialize_with="serialize_x_axes")]
+    #[serde(flatten, serialize_with = "serialize_x_axes")]
     x_axis: Option<Vec<Option<Box<Axis>>>>,
-    #[serde(flatten, serialize_with="serialize_y_axes")]
+    #[serde(flatten, serialize_with = "serialize_y_axes")]
     y_axis: Option<Vec<Option<Box<Axis>>>>,
 
     // ternary: Option<LayoutTernary>,
@@ -1882,11 +1888,11 @@ pub struct Layout {
     grid: Option<LayoutGrid>,
     calendar: Option<Calendar>,
 
-    #[serde(flatten, serialize_with="serialize_x_axes")]
+    #[serde(flatten, serialize_with = "serialize_x_axes")]
     x_axis: Option<Vec<Option<Box<Axis>>>>,
-    #[serde(flatten, serialize_with="serialize_y_axes")]
+    #[serde(flatten, serialize_with = "serialize_y_axes")]
     y_axis: Option<Vec<Option<Box<Axis>>>>,
-    #[serde(flatten, serialize_with="serialize_z_axes")]
+    #[serde(flatten, serialize_with = "serialize_z_axes")]
     z_axis: Option<Vec<Option<Box<Axis>>>>,
 
     // ternary: Option<LayoutTernary>,
@@ -2977,10 +2983,9 @@ mod tests {
 
     #[test]
     fn test_serialize_layout_template() {
-
-        let mut xaxis:Vec<Option<Box<Axis>>> = Vec::new();
-        let mut yaxis:Vec<Option<Box<Axis>>> = Vec::new();
-        for _ in 0..8{
+        let mut xaxis: Vec<Option<Box<Axis>>> = Vec::new();
+        let mut yaxis: Vec<Option<Box<Axis>>> = Vec::new();
+        for _ in 0..8 {
             xaxis.push(Some(Box::new(Axis::new())));
             yaxis.push(Some(Box::new(Axis::new())));
         }
@@ -3113,10 +3118,9 @@ mod tests {
 
     #[test]
     fn test_serialize_layout() {
-
-        let mut xaxis:Vec<Option<Box<Axis>>> = Vec::new();
-        let mut yaxis:Vec<Option<Box<Axis>>> = Vec::new();
-        for _ in 0..8{
+        let mut xaxis: Vec<Option<Box<Axis>>> = Vec::new();
+        let mut yaxis: Vec<Option<Box<Axis>>> = Vec::new();
+        for _ in 0..8 {
             xaxis.push(Some(Box::new(Axis::new())));
             yaxis.push(Some(Box::new(Axis::new())));
         }