Merge the log scale change

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"]

README.md

@@ -171,7 +171,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .margin(5)
         .x_label_area_size(30)
         .y_label_area_size(30)
-        .build_ranged(-1f32..1f32, -0.1f32..1f32)?;
+        .build_cartesian_2d(-1f32..1f32, -0.1f32..1f32)?;
 
     chart.configure_mesh().draw()?;
 
@@ -215,7 +215,7 @@ let figure = evcxr_figure((640, 480), |root| {
         .margin(5)
         .x_label_area_size(30)
         .y_label_area_size(30)
-        .build_ranged(-1f32..1f32, -0.1f32..1f32)?;
+        .build_cartesian_2d(-1f32..1f32, -0.1f32..1f32)?;
 
     chart.configure_mesh().draw()?;
 

doc-template/examples/quick_start.rs

@@ -7,7 +7,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .margin(5)
         .x_label_area_size(30)
         .y_label_area_size(30)
-        .build_ranged(-1f32..1f32, -0.1f32..1f32)?;
+        .build_cartesian_2d(-1f32..1f32, -0.1f32..1f32)?;
 
     chart.configure_mesh().draw()?;
 

doc-template/readme.template.md

@@ -68,7 +68,7 @@ let figure = evcxr_figure((640, 480), |root| {
         .margin(5)
         .x_label_area_size(30)
         .y_label_area_size(30)
-        .build_ranged(-1f32..1f32, -0.1f32..1f32)?;
+        .build_cartesian_2d(-1f32..1f32, -0.1f32..1f32)?;
 
     chart.configure_mesh().draw()?;
 

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

@@ -19,7 +19,6 @@ struct CountryData {
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root =
         SVGBackend::new("plotters-doc-data/tick_control.svg", (1024, 768)).into_drawing_area();
-
     root.fill(&WHITE)?;
 
     let (upper, lower) = root.split_vertically(750);
@@ -80,3 +79,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
+#[test]
+fn entry_point() {
+    main().unwrap()
+}

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.

src/chart/state.rs

@@ -21,7 +21,7 @@ use plotters_backend::DrawingBackend;
 ///    let chart = ChartBuilder::on(&area[0])
 ///        .caption("Incremental Example", ("sans-serif", 20))
 ///        .set_all_label_area_size(30)
-///        .build_ranged(0..10, 0..10)
+///        .build_cartesian_2d(0..10, 0..10)
 ///        .expect("Unable to build ChartContext");
 ///    // Draw the first frame at this point
 ///    area[0].present().expect("Present");

src/coord/ranged1d/combinators/ckps.rs

@@ -103,7 +103,7 @@ where
     ///let mut buffer = vec![0;1024*768*3];
     /// let root = BitMapBackend::with_buffer(&mut buffer, (1024, 768)).into_drawing_area();
     /// let mut chart = ChartBuilder::on(&root)
-    ///    .build_ranged(
+    ///    .build_cartesian_2d(
     ///        (0..100).with_key_points(vec![1,20,50,90]),   // <= This line will make the plot shows 4 tick marks at 1, 20, 50, 90
     ///        0..10
     /// ).unwrap();
@@ -143,7 +143,7 @@ where
     ///let mut buffer = vec![0;1024*768*3];
     /// let root = BitMapBackend::with_buffer(&mut buffer, (1024, 768)).into_drawing_area();
     /// let mut chart = ChartBuilder::on(&root)
-    ///    .build_ranged(
+    ///    .build_cartesian_2d(
     ///        (0..100).with_key_point_func(|n| (0..100 / n as i32).map(|x| x * 100 / n as i32).collect()),
     ///        0..10
     /// ).unwrap();