Merge branch 'master' into pr-185

Author: 38

Cargo.toml

@@ -24,8 +24,9 @@ optional = true
 default_features = false
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rusttype = { version = "0.8.2", optional = true }
+ttf-parser = { version = "0.8.2", optional = true }
 lazy_static = { version = "1.4.0", optional = true }
+pathfinder_geometry = { version = "0.5.1", optional = true }
 font-kit = { version = "0.7.0", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.image]
@@ -81,7 +82,7 @@ point_series = []
 surface_series = []
 
 # Font implemnetation
-ttf = ["font-kit", "rusttype", "lazy_static"]
+ttf = ["font-kit", "ttf-parser", "lazy_static", "pathfinder_geometry"]
 
 # Misc
 datetime = ["chrono"]

examples/3d-plot.rs

@@ -47,3 +47,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .draw()?;
     Ok(())
 }
+#[test]
+fn entry_point() {
+    main().unwrap()
+}

examples/3d-plot2.rs

@@ -42,3 +42,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
+#[test]
+fn entry_point() {
+    main().unwrap()
+}

examples/tick_control.rs

@@ -3,16 +3,12 @@ use plotters::prelude::*;
 use std::fs::File;
 use std::io::BufReader;
 
-use chrono::NaiveDate;
-use std::str::FromStr;
-
 #[derive(serde_derive::Deserialize)]
 struct DailyData {
-    date: String,
     #[serde(default)]
-    new_cases_smoothed_per_million: f64,
+    new_cases: f64,
     #[serde(default)]
-    total_cases_per_million: f64,
+    total_cases: f64,
 }
 
 #[derive(serde_derive::Deserialize)]
@@ -22,68 +18,68 @@ struct CountryData {
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root =
-        BitMapBackend::gif("/tmp/tick_control.gif", (800, 600), 100)?.into_drawing_area();
-
-    for a in 0..200 {
-
-        root.fill(&WHITE)?;
-
-
-        let mut chart = ChartBuilder::on(&root)
-            .set_label_area_size(LabelAreaPosition::Left, (8).percent())
-            .set_label_area_size(LabelAreaPosition::Bottom, (6).percent())
-            .margin((1).percent())
-            .build_cartesian_3d(
-                (20u32..10_0000u32)
-                    .log_scale()
-                    .with_key_points(vec![50, 100, 200, 500, 1000, 10000]),
-                (0u32..1000u32)
-                    .log_scale()
-                    .with_key_points(vec![2, 5, 10, 20, 50, 100, 200]),
-                NaiveDate::from_ymd(2020, 1, 1)..NaiveDate::from_ymd(2020, 9, 5),
-            )?;
+        SVGBackend::new("plotters-doc-data/tick_control.svg", (1024, 768)).into_drawing_area();
+    root.fill(&WHITE)?;
 
-        chart.with_projection(|mut pb| {
-            pb.yaw = (1.57 - a as f64 / 100.0 * 1.57).abs();
-            pb.into_matrix()
-        });
+    let (upper, lower) = root.split_vertically(750);
 
-        chart
-            .configure_axes()
-            .draw()?;
+    lower.titled(
+        "Data Source: https://covid.ourworldindata.org/data/owid-covid-data.json",
+        ("sans-serif", 10).into_font().color(&BLACK.mix(0.5)),
+    )?;
 
-        let data: std::collections::HashMap<String, CountryData> = serde_json::from_reader(
-            BufReader::new(File::open("plotters-doc-data/covid-data.json")?),
+    let mut chart = ChartBuilder::on(&upper)
+        .caption("World COVID-19 Cases", ("sans-serif", (5).percent_height()))
+        .set_label_area_size(LabelAreaPosition::Left, (8).percent())
+        .set_label_area_size(LabelAreaPosition::Bottom, (4).percent())
+        .margin((1).percent())
+        .build_cartesian_2d(
+            (20u32..5000_0000u32)
+                .log_scale()
+                .with_key_points(vec![50, 100, 1000, 10000, 100000, 1000000, 10000000]),
+            (0u32..50_0000u32)
+                .log_scale()
+                .with_key_points(vec![10, 50, 100, 1000, 10000, 100000, 200000]),
         )?;
 
-        for (idx, &series) in ["USA", "CHN"]
-            .iter()
-            .enumerate()
-        {
-            let color = Palette99::pick(idx).mix(1.0);
-            chart
-                .draw_series(LineSeries::new(
-                    data[series].data.iter().map(
-                        |DailyData {
-                             date,
-                             new_cases_smoothed_per_million,
-                             total_cases_per_million,
-                             ..
-                         }| (*total_cases_per_million as u32, *new_cases_smoothed_per_million as u32, chrono::NaiveDate::from_str(date).unwrap(),),
-                    ),
-                    color.stroke_width(1),
-                ))?
-                .label(series)
-                .legend(move |(x, y)| Rectangle::new([(x, y - 5), (x + 10, y + 5)], color.filled()));
-        }
+    chart
+        .configure_mesh()
+        .x_desc("Total Cases")
+        .y_desc("New Cases")
+        .draw()?;
 
-        chart
-            .configure_series_labels()
-            .border_style(&BLACK)
-            .draw()?;
+    let data: std::collections::HashMap<String, CountryData> = serde_json::from_reader(
+        BufReader::new(File::open("plotters-doc-data/covid-data.json")?),
+    )?;
 
-        root.present()?;
+    for (idx, &series) in ["CHN", "USA", "RUS", "JPN", "DEU", "IND", "OWID_WRL"]
+        .iter()
+        .enumerate()
+    {
+        let color = Palette99::pick(idx).mix(0.9);
+        chart
+            .draw_series(LineSeries::new(
+                data[series].data.iter().map(
+                    |&DailyData {
+                         new_cases,
+                         total_cases,
+                         ..
+                     }| (total_cases as u32, new_cases as u32),
+                ),
+                color.stroke_width(3),
+            ))?
+            .label(series)
+            .legend(move |(x, y)| Rectangle::new([(x, y - 5), (x + 10, y + 5)], color.filled()));
     }
 
+    chart
+        .configure_series_labels()
+        .border_style(&BLACK)
+        .draw()?;
+
     Ok(())
 }
+#[test]
+fn entry_point() {
+    main().unwrap()
+}

examples/two-scales.rs

@@ -11,7 +11,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .right_y_label_area_size(40)
         .margin(5)
         .caption("Dual Y-Axis Example", ("sans-serif", 50.0).into_font())
-        .build_cartesian_2d(0f32..10f32, LogRange(0.1f32..1e10f32))?
+        .build_cartesian_2d(0f32..10f32, (0.1f32..1e10f32).log_scale())?
         .set_secondary_coord(0f32..10f32, -1.0f32..1.0f32);
 
     chart

src/chart/context.rs

@@ -302,11 +302,10 @@ impl<'a, DB: DrawingBackend, X: Ranged, Y: Ranged> ChartContext<'a, DB, Cartesia
             .iter()
             .map(|(_, text)| {
                 if orientation.0 > 0 && orientation.1 == 0 && tick_size >= 0 {
-                    let ((x0, _), (x1, _)) = label_style
-                        .font
-                        .layout_box(text)
-                        .unwrap_or(((0, 0), (0, 0)));
-                    x1 - x0
+                    self.drawing_area
+                        .estimate_text_size(text, &label_style)
+                        .map(|(w, _)| w)
+                        .unwrap_or(0) as i32
                 } else {
                     // Don't ever do the layout estimationfor the drawing area that is either not
                     // the right one or the tick mark is inward.