Cleanup the color trait requirements

Author: 38

Cargo.toml

@@ -15,7 +15,7 @@ exclude = ["doc-template/*"]
 [dependencies]
 num-traits = "0.2.11"
 chrono = { version = "0.4.11", optional = true }
-plotters-backend = { git = "https://github.com/chrisduerr/plotters-backend", rev = "529f08f3aa5ede8e71950c1a5d3be4683330f549" }
+plotters-backend = "^0.3"
 plotters-svg = {version = "^0.3.*", optional = true}
 
 [dependencies.plotters-bitmap]

src/drawing/area.rs

@@ -286,7 +286,7 @@ impl<DB: DrawingBackend, CT: CoordTranslate> DrawingArea<DB, CT> {
             backend.draw_rect(
                 (self.rect.x0, self.rect.y0),
                 (self.rect.x1 - 1, self.rect.y1 - 1),
-                color,
+                &color.to_backend_color(),
                 true,
             )
         })
@@ -299,7 +299,7 @@ impl<DB: DrawingBackend, CT: CoordTranslate> DrawingArea<DB, CT> {
         color: &ColorType,
     ) -> Result<(), DrawingAreaError<DB>> {
         let pos = self.coord.translate(&pos);
-        self.backend_ops(|b| b.draw_pixel(pos, color.color()))
+        self.backend_ops(|b| b.draw_pixel(pos, color.to_backend_color()))
     }
 
     /// Present all the pending changes to the backend

src/element/basic_shapes.rs

@@ -1,6 +1,6 @@
 use super::{Drawable, PointCollection};
-use crate::style::{ShapeStyle, SizeDesc};
-use plotters_backend::{BackendCoord, BackendStyle, DrawingBackend, DrawingErrorKind};
+use crate::style::{Color, ShapeStyle, SizeDesc};
+use plotters_backend::{BackendCoord, DrawingBackend, DrawingErrorKind};
 
 /// An element of a single pixel
 pub struct Pixel<Coord> {
@@ -33,7 +33,7 @@ impl<Coord, DB: DrawingBackend> Drawable<DB> for Pixel<Coord> {
         _: (u32, u32),
     ) -> Result<(), DrawingErrorKind<DB::ErrorType>> {
         if let Some((x, y)) = points.next() {
-            return backend.draw_pixel((x, y), self.style.color());
+            return backend.draw_pixel((x, y), self.style.color.to_backend_color());
         }
         Ok(())
     }
@@ -320,7 +320,7 @@ impl<Coord, DB: DrawingBackend> Drawable<DB> for Polygon<Coord> {
         backend: &mut DB,
         _: (u32, u32),
     ) -> Result<(), DrawingErrorKind<DB::ErrorType>> {
-        backend.fill_polygon(points, &self.style.color)
+        backend.fill_polygon(points, &self.style.color.to_backend_color())
     }
 }
 

src/element/boxplot.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use crate::data::Quartiles;
 use crate::element::{Drawable, PointCollection};
-use crate::style::{ShapeStyle, BLACK};
+use crate::style::{Color, ShapeStyle, BLACK};
 use plotters_backend::{BackendCoord, DrawingBackend, DrawingErrorKind};
 
 /// The boxplot orientation trait
@@ -218,7 +218,12 @@ impl<K, DB: DrawingBackend, O: BoxplotOrient<K, f32>> Drawable<DB> for Boxplot<K
 
             // |---[   |  ]----|
             // _^^^_____________
-            backend.draw_line(moved(points[0]), moved(points[1]), &self.style.color)?;
+
+            backend.draw_line(
+                moved(points[0]),
+                moved(points[1]),
+                &self.style.color.to_backend_color(),
+            )?;
 
             // |---[   |  ]----|
             // ____^______^_____

src/element/points.rs

@@ -1,6 +1,6 @@
 use super::*;
 use super::{Drawable, PointCollection};
-use crate::style::{ShapeStyle, SizeDesc};
+use crate::style::{Color, ShapeStyle, SizeDesc};
 use plotters_backend::{BackendCoord, DrawingBackend, DrawingErrorKind};
 
 /// The element that used to describe a point
@@ -94,7 +94,7 @@ impl<Coord, DB: DrawingBackend, Size: SizeDesc> Drawable<DB> for TriangleMarker<
                         (rad.sin() * f64::from(size) + f64::from(y)).ceil() as i32,
                     )
                 });
-            backend.fill_polygon(points, &self.style.color)?;
+            backend.fill_polygon(points, &self.style.color.to_backend_color())?;
         }
         Ok(())
     }

src/style/color.rs

@@ -6,17 +6,20 @@ use plotters_backend::{BackendColor, BackendStyle};
 use std::marker::PhantomData;
 
 /// Any color representation
-pub trait Color: BackendStyle {
+pub trait Color {
+    /// Normalize this color representation to the backend color
+    fn to_backend_color(&self) -> BackendColor;
+
     /// Convert the RGB representation to the standard RGB tuple
     #[inline(always)]
     fn rgb(&self) -> (u8, u8, u8) {
-        self.color().rgb
+        self.to_backend_color().rgb
     }
 
     /// Get the alpha channel of the color
     #[inline(always)]
     fn alpha(&self) -> f64 {
-        self.color().alpha
+        self.to_backend_color().alpha
     }
 
     /// Mix the color with given opacity
@@ -50,23 +53,26 @@ pub trait Color: BackendStyle {
     }
 }
 
-impl<T: Color> Color for &'_ T {}
+impl<T: Color> Color for &'_ T {
+    fn to_backend_color(&self) -> BackendColor {
+        <T as Color>::to_backend_color(*self)
+    }
+}
 
 /// The RGBA representation of the color, Plotters use RGBA as the internal representation
 /// of color
 #[derive(Copy, Clone, PartialEq, Debug)]
 pub struct RGBAColor(pub(crate) u8, pub(crate) u8, pub(crate) u8, pub(crate) f64);
 
-impl BackendStyle for RGBAColor {
+impl Color for RGBAColor {
     #[inline(always)]
-    fn color(&self) -> BackendColor {
+    fn to_backend_color(&self) -> BackendColor {
         BackendColor {
             rgb: (self.0, self.1, self.2),
             alpha: self.3,
         }
     }
 }
-impl Color for RGBAColor {}
 
 /// A color in the given palette
 pub struct PaletteColor<P: Palette>(usize, PhantomData<P>);
@@ -78,41 +84,48 @@ impl<P: Palette> PaletteColor<P> {
     }
 }
 
-impl<P: Palette> BackendStyle for PaletteColor<P> {
+impl<P: Palette> Color for PaletteColor<P> {
     #[inline(always)]
-    fn color(&self) -> BackendColor {
+    fn to_backend_color(&self) -> BackendColor {
         BackendColor {
             rgb: P::COLORS[self.0],
             alpha: 1.0,
         }
     }
 }
 
-impl<P: Palette> Color for PaletteColor<P> {}
-
 /// The color described by its RGB value
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
 pub struct RGBColor(pub u8, pub u8, pub u8);
 
-impl BackendStyle for RGBColor {
-    #[inline(always)]
+impl BackendStyle for RGBAColor {
     fn color(&self) -> BackendColor {
+        self.to_backend_color()
+    }
+}
+
+impl Color for RGBColor {
+    #[inline(always)]
+    fn to_backend_color(&self) -> BackendColor {
         BackendColor {
             rgb: (self.0, self.1, self.2),
             alpha: 1.0,
         }
     }
 }
-
-impl Color for RGBColor {}
+impl BackendStyle for RGBColor {
+    fn color(&self) -> BackendColor {
+        self.to_backend_color()
+    }
+}
 
 /// The color described by HSL color space
 pub struct HSLColor(pub f64, pub f64, pub f64);
 
-impl BackendStyle for HSLColor {
+impl Color for HSLColor {
     #[inline(always)]
     #[allow(clippy::many_single_char_names)]
-    fn color(&self) -> BackendColor {
+    fn to_backend_color(&self) -> BackendColor {
         let (h, s, l) = (
             self.0.min(1.0).max(0.0),
             self.1.min(1.0).max(0.0),
@@ -159,5 +172,3 @@ impl BackendStyle for HSLColor {
         }
     }
 }
-
-impl Color for HSLColor {}

src/style/font/font_desc.rs

@@ -138,7 +138,7 @@ impl<'a> FontDesc<'a> {
     pub fn color<C: Color>(&self, color: &C) -> TextStyle<'a> {
         TextStyle {
             font: self.clone(),
-            color: color.color(),
+            color: color.to_backend_color(),
             pos: Pos::default(),
         }
     }

src/style/shape.rs

@@ -40,7 +40,7 @@ impl<T: Color> From<T> for ShapeStyle {
 
 impl BackendStyle for ShapeStyle {
     fn color(&self) -> BackendColor {
-        self.color.color()
+        self.color.to_backend_color()
     }
     fn stroke_width(&self) -> u32 {
         self.stroke_width

src/style/text.rs

@@ -76,7 +76,7 @@ impl<'a> TextStyle<'a> {
     pub fn color<C: Color>(&self, color: &'a C) -> Self {
         Self {
             font: self.font.clone(),
-            color: color.color(),
+            color: color.to_backend_color(),
             pos: self.pos,
         }
     }
@@ -131,7 +131,7 @@ impl<'a, T: Into<FontDesc<'a>>> From<T> for TextStyle<'a> {
     fn from(font: T) -> Self {
         Self {
             font: font.into(),
-            color: BLACK.color(),
+            color: BLACK.to_backend_color(),
             pos: text_anchor::Pos::default(),
         }
     }