Merge pull request #561 from NorbertGarfield/issue-532

Clamp infinite values in logarithmic coordinate system
plotters-rs · Mar 28, 2024 · 8f14c1e · 8f14c1e
2 parents af0b63c + c621f5a
commit 8f14c1e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/plotters/src/chart/builder.rs b/plotters/src/chart/builder.rs
@@ -565,4 +565,27 @@ mod test {
         chart.caption("This is a test case", ("serif", 10));
         assert_eq!(chart.title.as_ref().unwrap().1.font.get_name(), "serif");
     }
+
+    #[test]
+    fn test_zero_limit_with_log_scale() {
+        let drawing_area = create_mocked_drawing_area(640, 480, |_| {});
+
+        let mut chart = ChartBuilder::on(&drawing_area)
+            .build_cartesian_2d(0f32..10f32, (1e-6f32..1f32).log_scale())
+            .unwrap();
+
+        let data = vec![
+            (2f32, 1e-4f32),
+            (4f32, 1e-3f32),
+            (6f32, 1e-2f32),
+            (8f32, 1e-1f32),
+        ];
+
+        chart
+            .draw_series(
+                data.iter()
+                    .map(|&(x, y)| Rectangle::new([(x - 0.5, 0.0), (x + 0.5, y)], RED.filled())),
+            )
+            .unwrap();
+    }
 }
diff --git a/plotters/src/coord/ranged1d/types/numeric.rs b/plotters/src/coord/ranged1d/types/numeric.rs
@@ -87,6 +87,14 @@ macro_rules! make_numeric_coord {
                     return limit.1;
                 }
 
+                if logic_length.is_infinite() {
+                    if logic_length.is_sign_positive() {
+                        return limit.1;
+                    } else {
+                        return limit.0;
+                    }
+                }
+
                 if actual_length > 0 {
                     return limit.0 + (actual_length as f64 * logic_length + 1e-3).floor() as i32;
                 } else {