Fix bug #93 and add test cases

Author: 38

Cargo.toml

@@ -12,21 +12,21 @@ readme = "README.md"
 exclude = ["doc-template/*"]
 
 [dependencies]
-num-traits = "^0.2"
-chrono = { version = "0.4.9", optional = true }
-gif = { version = "^0.10.3", optional = true }
+num-traits = "0.2.10"
+chrono = { version = "0.4.10", optional = true }
+gif = { version = "0.10.3", optional = true }
 
 [dependencies.palette]
-version = "^0.5"
+version = "0.5.0"
 default-features = false
 optional = true
 features = ["std"]
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rusttype = {version = "0.8.1", optional = true}
-lazy_static = {version = "^1.2", optional = true }
-font-kit = {version = "0.5.0", optional = true }
-piston_window = {version = "0.105.0", optional = true}
+rusttype = { version = "0.8.2", optional = true }
+lazy_static = { version = "1.4.0", optional = true }
+font-kit = { version = "0.5.0", optional = true }
+piston_window = { version = "0.105.0", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.image]
 version = "0.22.3"
@@ -40,11 +40,11 @@ optional = true
 features = ["ps"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys= "0.3.29"
-wasm-bindgen = "0.2.52"
+js-sys= "0.3.32"
+wasm-bindgen = "0.2.55"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
-version = "0.3.29"
+version = "0.3.32"
 features = ['Document', 'DomRect', 'Element', 'HtmlElement', 'Node', 'Window', 'HtmlCanvasElement', 'CanvasRenderingContext2d']
 
 [features]
@@ -73,15 +73,15 @@ point_series = []
 
 
 [dev-dependencies]
-rand = "^0.7.2"
-itertools = "^0.8.0"
+rand = "0.7.2"
+itertools = "0.8.2"
 rand_distr = "0.2.2"
 criterion = "0.3.0"
-rayon = "1.2.0"
+rayon = "1.2.1"
 rand_xorshift = "0.2.0"
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-wasm-bindgen-test = "0.3.4"
+wasm-bindgen-test = "0.3.5"
 
 [[bench]]
 name = "benchmark"

src/drawing/backend_impl/bitmap.rs

@@ -912,7 +912,7 @@ impl<'a, P: PixelFormat> DrawingBackend for BitMapBackend<'a, P> {
         let alpha = style.as_color().alpha();
         let (r, g, b) = style.as_color().rgb();
 
-        if from.0 == to.0 || from.1 == to.1 {
+        if (from.0 == to.0 || from.1 == to.1) && style.stroke_width() == 1 {
             if alpha >= 1.0 {
                 if from.1 == to.1 {
                     P::fill_rect_fast(self, from, to, r, g, b);
@@ -1317,6 +1317,22 @@ fn test_bitmap_bgrx_pixel_format() {
         }
     }
 }
+#[cfg(test)]
+#[test]
+fn test_draw_simple_lines() {
+    use crate::prelude::*;
+    let mut buffer = vec![0; 1000 * 1000 * 3];
+
+    {
+        let mut back = BitMapBackend::with_buffer(&mut buffer, (1000, 1000));
+        back.draw_line((500, 0), (500, 1000), &WHITE.filled().stroke_width(5))
+            .unwrap();
+    }
+
+    let nz_count = buffer.into_iter().filter(|x| *x != 0).count();
+
+    assert_eq!(nz_count, 6 * 1000 * 3);
+}
 
 #[cfg(test)]
 #[test]

src/element/errorbar.rs

@@ -117,20 +117,31 @@ impl<K, V, O: ErrorBarOrient<K, V>, DB: DrawingBackend> Drawable<DB> for ErrorBa
         let points: Vec<_> = points.take(3).collect();
 
         let (from, to) = O::ending_coord(points[0], self.width);
-        backend.draw_line(from, to, &self.style.color)?;
+        backend.draw_line(from, to, &self.style)?;
 
         let (from, to) = O::ending_coord(points[2], self.width);
-        backend.draw_line(from, to, &self.style.color)?;
+        backend.draw_line(from, to, &self.style)?;
 
-        backend.draw_line(points[0], points[2], &self.style.color)?;
+        backend.draw_line(points[0], points[2], &self.style)?;
 
-        backend.draw_circle(
-            points[1],
-            self.width / 2,
-            &self.style.color,
-            self.style.filled,
-        )?;
+        backend.draw_circle(points[1], self.width / 2, &self.style, self.style.filled)?;
 
         Ok(())
     }
 }
+
+#[cfg(test)]
+#[test]
+fn test_preserve_stroke_width() {
+    let v = ErrorBar::new_vertical(100, 20, 50, 70, WHITE.filled().stroke_width(5), 3);
+    let h = ErrorBar::new_horizontal(100, 20, 50, 70, WHITE.filled().stroke_width(5), 3);
+
+    use crate::prelude::*;
+    let da = crate::create_mocked_drawing_area(300, 300, |m| {
+        m.check_draw_line(|_, w, _, _| {
+            assert_eq!(w, 5);
+        });
+    });
+    da.draw(&h).expect("Drawing Failure");
+    da.draw(&v).expect("Drawing Failure");
+}