Merge branch 'main' into table-pr

Author: naijim

examples/subplots/src/main.rs

@@ -1,9 +1,11 @@
 #![allow(dead_code)]
 
-use plotly::common::{AxisSide, Font, Title};
-use plotly::layout::{Axis, GridPattern, Layout, LayoutGrid, Legend, RowOrder, TraceOrder};
+use plotly::common::{Anchor, AxisSide, Font, Title};
+use plotly::layout::{
+    Annotation, Axis, GridPattern, Layout, LayoutGrid, Legend, RowOrder, TraceOrder,
+};
+use plotly::Configuration;
 use plotly::{color::Rgb, Plot, Scatter};
-
 // Subplots
 fn simple_subplot() {
     let trace1 = Scatter::new(vec![1, 2, 3], vec![4, 5, 6]).name("trace1");
@@ -242,6 +244,46 @@ fn multiple_axes() {
     plot.show();
 }
 
+fn many_subplots_with_titles() {
+    let trace1 = Scatter::new(vec![1, 2], vec![4, 5]);
+
+    let number_of_plots = 10;
+
+    let mut plot = Plot::new();
+    let mut layout = Layout::new()
+        .grid(
+            LayoutGrid::new()
+                .rows(number_of_plots / 2)
+                .columns(2)
+                .pattern(GridPattern::Independent),
+        )
+        .height(number_of_plots * 200);
+
+    for i in 1..number_of_plots + 1 {
+        plot.add_trace(
+            trace1
+                .clone()
+                .y_axis(format!("y{}", i))
+                .x_axis(format!("x{}", i)),
+        );
+        layout.add_annotation(
+            Annotation::new()
+                .y_ref(format!("y{} domain", i))
+                .y_anchor(Anchor::Bottom)
+                .y(1)
+                .text(format!("Title {}", i))
+                .x_ref(format!("x{} domain", i))
+                .x_anchor(Anchor::Center)
+                .x(0.5)
+                .show_arrow(false),
+        )
+    }
+
+    plot.set_layout(layout);
+    plot.set_configuration(Configuration::new().responsive(true));
+    plot.show();
+}
+
 fn main() {
     // Uncomment any of these lines to display the example.
 
@@ -252,6 +294,7 @@ fn main() {
     // stacked_subplots();
     // stacked_subplots_with_shared_x_axis();
     // multiple_custom_sized_subplots();
+    // many_subplots_with_titles();
 
     // Multiple Axes
     // two_y_axes();

plotly/src/layout/mod.rs

@@ -441,6 +441,9 @@ pub struct Axis {
     #[serde(rename = "nticks")]
     n_ticks: Option<usize>,
 
+    #[serde(rename = "scaleanchor")]
+    scale_anchor: Option<String>,
+
     tick0: Option<f64>,
     dtick: Option<f64>,
 

plotly_kaleido/src/lib.rs

@@ -138,14 +138,15 @@ impl Kaleido {
         let p = p.to_str().unwrap();
         let p = String::from(p);
 
-        let process = Command::new(p.as_str())
+        let mut process = Command::new(p.as_str())
             .current_dir(self.cmd_path.parent().unwrap())
             .args([
                 "plotly",
                 "--disable-gpu",
                 "--allow-file-access-from-files",
                 "--disable-breakpad",
                 "--disable-dev-shm-usage",
+                "--disable-software-rasterizer",
                 "--single-process",
             ])
             .stdin(Stdio::piped())
@@ -156,14 +157,14 @@ impl Kaleido {
 
         {
             let plot_data = PlotData::new(plotly_data, format, width, height, scale).to_json();
-            let mut process_stdin = process.stdin.unwrap();
+            let mut process_stdin = process.stdin.take().unwrap();
             process_stdin
                 .write_all(plot_data.as_bytes())
                 .expect("couldn't write to Kaleido stdin");
             process_stdin.flush()?;
         }
 
-        let output_lines = BufReader::new(process.stdout.unwrap()).lines();
+        let output_lines = BufReader::new(process.stdout.take().unwrap()).lines();
         for line in output_lines.map_while(Result::ok) {
             let res = KaleidoResult::from(line.as_str());
             if let Some(image_data) = res.result {