Merge branch 's-textalign' of git://github.com/nuald/plotters into pr-87

Author: 38

src/drawing/backend_impl/cairo.rs

@@ -386,7 +386,7 @@ mod test {
     #[test]
     fn test_text_draw() {
         let buffer: Vec<u8> = vec![];
-        let (width, height) = (1000, 600);
+        let (width, height) = (1500, 800);
         let surface = cairo::PsSurface::for_stream(width.into(), height.into(), buffer);
         let cr = CairoContext::new(&surface);
         let root = CairoBackend::new(&cr, (width, height))
@@ -411,6 +411,8 @@ mod test {
             .draw()
             .unwrap();
 
+        let ((x1, y1), (x2, y2), (x3, y3)) = ((-30, 30), (0, -30), (30, 30));
+
         for (dy, trans) in [
             FontTransform::None,
             FontTransform::Rotate90,
@@ -422,13 +424,18 @@ mod test {
         {
             for (dx1, h_pos) in [HPos::Left, HPos::Right, HPos::Center].iter().enumerate() {
                 for (dx2, v_pos) in [VPos::Top, VPos::Center, VPos::Bottom].iter().enumerate() {
-                    let x = 100_i32 + (dx1 as i32 * 3 + dx2 as i32) * 100;
-                    let y = 100 + dy as i32 * 100;
-                    root.draw(&Circle::new((x, y), 3, &BLACK.mix(0.5))).unwrap();
-                    let style = TextStyle::from(("sans-serif", 20).into_font())
-                        .pos(Pos::new(*h_pos, *v_pos))
-                        .transform(trans.clone());
-                    root.draw_text("test", &style, (x, y)).unwrap();
+                    let x = 150_i32 + (dx1 as i32 * 3 + dx2 as i32) * 150;
+                    let y = 120 + dy as i32 * 150;
+                    let draw = |x, y, text| {
+                        root.draw(&Circle::new((x, y), 3, &BLACK.mix(0.5))).unwrap();
+                        let style = TextStyle::from(("sans-serif", 20).into_font())
+                            .pos(Pos::new(*h_pos, *v_pos))
+                            .transform(trans.clone());
+                        root.draw_text(text, &style, (x, y)).unwrap();
+                    };
+                    draw(x + x1, y + y1, "dood");
+                    draw(x + x2, y + y2, "dog");
+                    draw(x + x3, y + y3, "goog");
                 }
             }
         }
@@ -437,7 +444,9 @@ mod test {
         let content = String::from_utf8(buffer).unwrap();
         checked_save_file("test_text_draw", &content);
 
-        assert_eq!(content.matches("test").count(), 36);
+        assert_eq!(content.matches("dog").count(), 36);
+        assert_eq!(content.matches("dood").count(), 36);
+        assert_eq!(content.matches("goog").count(), 36);
     }
 
     #[test]
@@ -534,4 +543,25 @@ mod test {
         let content = String::from_utf8(buffer).unwrap();
         checked_save_file("test_series_labels", &content);
     }
+
+    #[test]
+    fn test_draw_pixel_alphas() {
+        let buffer: Vec<u8> = vec![];
+        let (width, height) = (100_i32, 100_i32);
+        let surface = cairo::PsSurface::for_stream(width.into(), height.into(), buffer);
+        let cr = CairoContext::new(&surface);
+        let root = CairoBackend::new(&cr, (width as u32, height as u32))
+            .unwrap()
+            .into_drawing_area();
+
+        for i in -20..20 {
+            let alpha = i as f64 * 0.1;
+            root.draw_pixel((50 + i, 50 + i), &BLACK.mix(alpha))
+                .unwrap();
+        }
+
+        let buffer = *surface.finish_output_stream().unwrap().downcast().unwrap();
+        let content = String::from_utf8(buffer).unwrap();
+        checked_save_file("test_draw_pixel_alphas", &content);
+    }
 }