add support for optional axis range bounds

Signed-off-by: Andrei Gherghescu <[email protected]>

Author: andrei-ng

examples/basic_charts/Cargo.toml

@@ -10,3 +10,4 @@ plotly = { path = "../../plotly" }
 plotly_utils = { path = "../plotly_utils" }
 rand = "0.9"
 rand_distr = "0.5"
+csv = "1.3"

examples/basic_charts/assets/iris.csv

@@ -0,0 +1,151 @@
+sepal_length,sepal_width,petal_length,petal_width,species
+5.1,3.5,1.4,0.2,setosa
+4.9,3.0,1.4,0.2,setosa
+4.7,3.2,1.3,0.2,setosa
+4.6,3.1,1.5,0.2,setosa
+5.0,3.6,1.4,0.2,setosa
+5.4,3.9,1.7,0.4,setosa
+4.6,3.4,1.4,0.3,setosa
+5.0,3.4,1.5,0.2,setosa
+4.4,2.9,1.4,0.2,setosa
+4.9,3.1,1.5,0.1,setosa
+5.4,3.7,1.5,0.2,setosa
+4.8,3.4,1.6,0.2,setosa
+4.8,3.0,1.4,0.1,setosa
+4.3,3.0,1.1,0.1,setosa
+5.8,4.0,1.2,0.2,setosa
+5.7,4.4,1.5,0.4,setosa
+5.4,3.9,1.3,0.4,setosa
+5.1,3.5,1.4,0.3,setosa
+5.7,3.8,1.7,0.3,setosa
+5.1,3.8,1.5,0.3,setosa
+5.4,3.4,1.7,0.2,setosa
+5.1,3.7,1.5,0.4,setosa
+4.6,3.6,1.0,0.2,setosa
+5.1,3.3,1.7,0.5,setosa
+4.8,3.4,1.9,0.2,setosa
+5.0,3.0,1.6,0.2,setosa
+5.0,3.4,1.6,0.4,setosa
+5.2,3.5,1.5,0.2,setosa
+5.2,3.4,1.4,0.2,setosa
+4.7,3.2,1.6,0.2,setosa
+4.8,3.1,1.6,0.2,setosa
+5.4,3.4,1.5,0.4,setosa
+5.2,4.1,1.5,0.1,setosa
+5.5,4.2,1.4,0.2,setosa
+4.9,3.1,1.5,0.2,setosa
+5.0,3.2,1.2,0.2,setosa
+5.5,3.5,1.3,0.2,setosa
+4.9,3.6,1.4,0.1,setosa
+4.4,3.0,1.3,0.2,setosa
+5.1,3.4,1.5,0.2,setosa
+5.0,3.5,1.3,0.3,setosa
+4.5,2.3,1.3,0.3,setosa
+4.4,3.2,1.3,0.2,setosa
+5.0,3.5,1.6,0.6,setosa
+5.1,3.8,1.9,0.4,setosa
+4.8,3.0,1.4,0.3,setosa
+5.1,3.8,1.6,0.2,setosa
+4.6,3.2,1.4,0.2,setosa
+5.3,3.7,1.5,0.2,setosa
+5.0,3.3,1.4,0.2,setosa
+7.0,3.2,4.7,1.4,versicolor
+6.4,3.2,4.5,1.5,versicolor
+6.9,3.1,4.9,1.5,versicolor
+5.5,2.3,4.0,1.3,versicolor
+6.5,2.8,4.6,1.5,versicolor
+5.7,2.8,4.5,1.3,versicolor
+6.3,3.3,4.7,1.6,versicolor
+4.9,2.4,3.3,1.0,versicolor
+6.6,2.9,4.6,1.3,versicolor
+5.2,2.7,3.9,1.4,versicolor
+5.0,2.0,3.5,1.0,versicolor
+5.9,3.0,4.2,1.5,versicolor
+6.0,2.2,4.0,1.0,versicolor
+6.1,2.9,4.7,1.4,versicolor
+5.6,2.9,3.6,1.3,versicolor
+6.7,3.1,4.4,1.4,versicolor
+5.6,3.0,4.5,1.5,versicolor
+5.8,2.7,4.1,1.0,versicolor
+6.2,2.2,4.5,1.5,versicolor
+5.6,2.5,3.9,1.1,versicolor
+5.9,3.2,4.8,1.8,versicolor
+6.1,2.8,4.0,1.3,versicolor
+6.3,2.5,4.9,1.5,versicolor
+6.1,2.8,4.7,1.2,versicolor
+6.4,2.9,4.3,1.3,versicolor
+6.6,3.0,4.4,1.4,versicolor
+6.8,2.8,4.8,1.4,versicolor
+6.7,3.0,5.0,1.7,versicolor
+6.0,2.9,4.5,1.5,versicolor
+5.7,2.6,3.5,1.0,versicolor
+5.5,2.4,3.8,1.1,versicolor
+5.5,2.4,3.7,1.0,versicolor
+5.8,2.7,3.9,1.2,versicolor
+6.0,2.7,5.1,1.6,versicolor
+5.4,3.0,4.5,1.5,versicolor
+6.0,3.4,4.5,1.6,versicolor
+6.7,3.1,4.7,1.5,versicolor
+6.3,2.3,4.4,1.3,versicolor
+5.6,3.0,4.1,1.3,versicolor
+5.5,2.5,4.0,1.3,versicolor
+5.5,2.6,4.4,1.2,versicolor
+6.1,3.0,4.6,1.4,versicolor
+5.8,2.6,4.0,1.2,versicolor
+5.0,2.3,3.3,1.0,versicolor
+5.6,2.7,4.2,1.3,versicolor
+5.7,3.0,4.2,1.2,versicolor
+5.7,2.9,4.2,1.3,versicolor
+6.2,2.9,4.3,1.3,versicolor
+5.1,2.5,3.0,1.1,versicolor
+5.7,2.8,4.1,1.3,versicolor
+6.3,3.3,6.0,2.5,virginica
+5.8,2.7,5.1,1.9,virginica
+7.1,3.0,5.9,2.1,virginica
+6.3,2.9,5.6,1.8,virginica
+6.5,3.0,5.8,2.2,virginica
+7.6,3.0,6.6,2.1,virginica
+4.9,2.5,4.5,1.7,virginica
+7.3,2.9,6.3,1.8,virginica
+6.7,2.5,5.8,1.8,virginica
+7.2,3.6,6.1,2.5,virginica
+6.5,3.2,5.1,2.0,virginica
+6.4,2.7,5.3,1.9,virginica
+6.8,3.0,5.5,2.1,virginica
+5.7,2.5,5.0,2.0,virginica
+5.8,2.8,5.1,2.4,virginica
+6.4,3.2,5.3,2.3,virginica
+6.5,3.0,5.5,1.8,virginica
+7.7,3.8,6.7,2.2,virginica
+7.7,2.6,6.9,2.3,virginica
+6.0,2.2,5.0,1.5,virginica
+6.9,3.2,5.7,2.3,virginica
+5.6,2.8,4.9,2.0,virginica
+7.7,2.8,6.7,2.0,virginica
+6.3,2.7,4.9,1.8,virginica
+6.7,3.3,5.7,2.1,virginica
+7.2,3.2,6.0,1.8,virginica
+6.2,2.8,4.8,1.8,virginica
+6.1,3.0,4.9,1.8,virginica
+6.4,2.8,5.6,2.1,virginica
+7.2,3.0,5.8,1.6,virginica
+7.4,2.8,6.1,1.9,virginica
+7.9,3.8,6.4,2.0,virginica
+6.4,2.8,5.6,2.2,virginica
+6.3,2.8,5.1,1.5,virginica
+6.1,2.6,5.6,1.4,virginica
+7.7,3.0,6.1,2.3,virginica
+6.3,3.4,5.6,2.4,virginica
+6.4,3.1,5.5,1.8,virginica
+6.0,3.0,4.8,1.8,virginica
+6.9,3.1,5.4,2.1,virginica
+6.7,3.1,5.6,2.4,virginica
+6.9,3.1,5.1,2.3,virginica
+5.8,2.7,5.1,1.9,virginica
+6.8,3.2,5.9,2.3,virginica
+6.7,3.3,5.7,2.5,virginica
+6.7,3.0,5.2,2.3,virginica
+6.3,2.5,5.0,1.9,virginica
+6.5,3.0,5.2,2.0,virginica
+6.2,3.4,5.4,2.3,virginica
+5.9,3.0,5.1,1.8,virginica

examples/basic_charts/src/main.rs

@@ -142,8 +142,8 @@ fn data_labels_hover(show: bool, file_name: &str) {
 
     let layout = Layout::new()
         .title("Data Labels Hover")
-        .x_axis(Axis::new().title("x").range(vec![0.75, 5.25]))
-        .y_axis(Axis::new().title("y").range(vec![0., 8.]));
+        .x_axis(Axis::new().title("x").range(vec![0.75, 5.25].into()))
+        .y_axis(Axis::new().title("y").range(vec![0., 8.].into()));
     plot.set_layout(layout);
 
     let path = write_example_to_html(&plot, file_name);
@@ -172,8 +172,8 @@ fn data_labels_on_the_plot(show: bool, file_name: &str) {
 
     let layout = Layout::new()
         .title("Data Labels on the Plot")
-        .x_axis(Axis::new().range(vec![0.75, 5.25]))
-        .y_axis(Axis::new().range(vec![0., 8.]));
+        .x_axis(Axis::new().range(vec![0.75, 5.25].into()))
+        .y_axis(Axis::new().range(vec![0., 8.].into()));
     plot.set_layout(layout);
 
     let path = write_example_to_html(&plot, file_name);
@@ -482,8 +482,8 @@ fn line_dash(show: bool, file_name: &str) {
                 .trace_order(TraceOrder::Reversed)
                 .font(Font::new().size(16)),
         )
-        .x_axis(Axis::new().range(vec![0.95, 5.05]).auto_range(false))
-        .y_axis(Axis::new().range(vec![0.0, 28.5]).auto_range(false));
+        .x_axis(Axis::new().range(vec![0.95, 5.05].into()).auto_range(false))
+        .y_axis(Axis::new().range(vec![0.0, 28.5].into()).auto_range(false));
     plot.set_layout(layout);
     plot.add_trace(trace1);
     plot.add_trace(trace2);
@@ -564,7 +564,7 @@ fn filled_lines(show: bool, file_name: &str) {
         .x_axis(
             Axis::new()
                 .grid_color(Rgb::new(255, 255, 255))
-                .range(vec![1.0, 10.0])
+                .range(vec![1.0, 10.0].into())
                 .show_grid(true)
                 .show_line(false)
                 .show_tick_labels(true)
@@ -997,6 +997,97 @@ fn grouped_donout_pie_charts(show: bool, file_name: &str) {
 }
 // ANCHOR_END: grouped_donout_pie_charts
 
+// ANCHOR: iris_faceted_plot
+fn iris_faceted_plot(show: bool, file_name: &str) {
+    use std::fs::File;
+    use std::io::BufReader;
+    
+    // Read the iris dataset
+    let file = File::open("assets/iris.csv").expect("Failed to open iris.csv");
+    let reader = BufReader::new(file);
+    let mut csv_reader = csv::Reader::from_reader(reader);
+    
+    // Parse the data
+    let mut sepal_width = Vec::new();
+    let mut sepal_length = Vec::new();
+    let mut species = Vec::new();
+    
+    for result in csv_reader.records() {
+        let record = result.expect("Failed to read CSV record");
+        sepal_width.push(record[1].parse::<f64>().unwrap());
+        sepal_length.push(record[0].parse::<f64>().unwrap());
+        species.push(record[4].to_string());
+    }
+    
+    // Create separate traces for each species (faceted plot)
+    let mut traces = Vec::new();
+    let unique_species: Vec<String> = species.iter().cloned().collect::<std::collections::HashSet<_>>().into_iter().collect();
+    
+    for (i, species_name) in unique_species.iter().enumerate() {
+        let mut x = Vec::new();
+        let mut y = Vec::new();
+        
+        for (j, s) in species.iter().enumerate() {
+            if s == species_name {
+                x.push(sepal_width[j]);
+                y.push(sepal_length[j]);
+            }
+        }
+        
+        let trace = Scatter::new(x, y)
+            .name(species_name)
+            .mode(plotly::common::Mode::Markers)
+            .x_axis(format!("x{}", i + 1))
+            .y_axis(format!("y{}", i + 1));
+        traces.push(trace);
+    }
+    
+    let mut plot = Plot::new();
+    for trace in traces {
+        plot.add_trace(trace);
+    }
+    
+    // Create layout with subplots (faceted)
+    let mut layout = Layout::new()
+        .title("Iris Dataset - Faceted by Species")
+        .grid(LayoutGrid::new()
+            .rows(1)
+            .columns(3)
+            .pattern(plotly::layout::GridPattern::Independent));
+    
+    // Set x-axis range for all subplots: [None, 4.5]
+    layout = layout
+        .x_axis(Axis::new()
+            .title("sepal_width")
+            .range(vec![None, Some(4.5)].into()))
+        .x_axis2(Axis::new()
+            .title("sepal_width")
+            .range(vec![None, Some(4.5)].into()))
+        .x_axis3(Axis::new()
+            .title("sepal_width")
+            .range(vec![None, Some(4.5)].into()));
+    
+    // Set y-axis range for all subplots: [3, None]
+    layout = layout
+        .y_axis(Axis::new()
+            .title("sepal_length")
+            .range(vec![Some(3.0), None].into()))
+        .y_axis2(Axis::new()
+            .title("sepal_length")
+            .range(vec![Some(3.0), None].into()))
+        .y_axis3(Axis::new()
+            .title("sepal_length")
+            .range(vec![Some(3.0), None].into()));
+    
+    plot.set_layout(layout);
+
+    let path = write_example_to_html(&plot, file_name);
+    if show {
+        plot.show_html(path);
+    }
+}
+// ANCHOR_END: iris_faceted_plot
+
 fn main() {
     // Change false to true on any of these lines to display the example.
 
@@ -1013,7 +1104,6 @@ fn main() {
     categories_scatter_chart(false, "categories_scatter_chart");
 
     // Line Charts
-
     adding_names_to_line_and_scatter_plot(false, "adding_names_to_line_and_scatter_plot");
     line_and_scatter_styling(false, "line_and_scatter_styling");
     styling_line_plot(false, "styling_line_plot");
@@ -1041,4 +1131,7 @@ fn main() {
     pie_chart_text_control(false, "pie_chart_text_control");
 
     grouped_donout_pie_charts(false, "grouped_donout_pie_charts");
+
+    // Iris Faceted Plot with Partial Axis Ranges
+    iris_faceted_plot(false, "iris_faceted_plot");
 }

examples/financial_charts/src/main.rs

@@ -6,7 +6,9 @@ use std::path::PathBuf;
 use chrono::{DateTime, Duration};
 use plotly::common::TickFormatStop;
 use plotly::layout::{Axis, RangeSelector, RangeSlider, SelectorButton, SelectorStep, StepMode};
-use plotly::{Candlestick, Layout, Ohlc, Plot, Scatter};
+use plotly::{
+    Candlestick, Layout, Ohlc, Plot, Scatter
+};
 use plotly_utils::write_example_to_html;
 use serde::Deserialize;
 
@@ -52,7 +54,7 @@ fn time_series_plot_with_custom_date_range(show: bool, file_name: &str) {
     plot.add_trace(trace);
 
     let layout = Layout::new()
-        .x_axis(Axis::new().range(vec!["2016-07-01", "2016-12-31"]))
+        .x_axis(Axis::new().range(vec!["2016-07-01", "2016-12-31"].into()))
         .title("Manually Set Date Range");
     plot.set_layout(layout);
 
@@ -343,7 +345,7 @@ fn series_with_gaps_for_weekends_and_holidays(show: bool, file_name: &str) {
         .title("Series with Weekend and Holiday Gaps")
         .x_axis(
             Axis::new()
-                .range(vec!["2015-12-01", "2016-01-15"])
+                .range(vec!["2015-12-01", "2016-01-15"].into())
                 .title("Date"),
         )
         .y_axis(Axis::new().title("Price"));
@@ -378,7 +380,7 @@ fn hiding_weekends_and_holidays_with_rangebreaks(show: bool, file_name: &str) {
         .title("Hide Weekend and Holiday Gaps with rangebreaks")
         .x_axis(
             Axis::new()
-                .range(vec!["2015-12-01", "2016-01-15"])
+                .range(vec!["2015-12-01", "2016-01-15"].into())
                 .title("Date")
                 .range_breaks(vec![
                     plotly::layout::RangeBreak::new()