Add marker size to style

Author: milliams

examples/scatter_svg.rs

@@ -14,7 +14,8 @@ fn main() {
     let s1 = plotlib::scatter::Scatter::from_vec(&data).style(
         plotlib::scatter::Style::new()
             .marker(plotlib::style::Marker::Square)
-            .colour("#DD3355"),
+            .colour("#DD3355")
+            .size(2.),
     );
     let s2 = plotlib::scatter::Scatter::from_vec(&[(-1.4, 2.5), (7.2, -0.3)])
         .style(plotlib::scatter::Style::new().colour("#35C788"));

src/scatter.rs

@@ -17,13 +17,15 @@ use style;
 pub struct Style {
     marker: Option<style::Marker>,
     colour: Option<String>,
+    size: Option<f32>,
 }
 
 impl Style {
     pub fn new() -> Self {
         Style {
             marker: None,
             colour: None,
+            size: None,
         }
     }
 
@@ -36,6 +38,10 @@ impl Style {
             Some(ref v) => self.colour = Some(v.clone()),
             None => {}
         }
+        match other.size {
+            Some(ref v) => self.size = Some(v.clone()),
+            None => {}
+        }
     }
 }
 
@@ -63,6 +69,18 @@ impl style::Point for Style {
     fn get_colour(&self) -> &Option<String> {
         &self.colour
     }
+
+    fn size<T>(&mut self, value: T) -> &mut Self
+    where
+        T: Into<f32>,
+    {
+        self.size = Some(value.into());
+        self
+    }
+
+    fn get_size(&self) -> &Option<f32> {
+        &self.size
+    }
 }
 
 /// The scatter *representation*.

src/style.rs

@@ -40,4 +40,10 @@ pub trait Point {
         T: Into<String>;
 
     fn get_colour(&self) -> &Option<String>;
+
+    fn size<T>(&mut self, value: T) -> &mut Self
+    where
+        T: Into<f32>;
+
+    fn get_size(&self) -> &Option<f32>;
 }

src/svg_render.rs

@@ -126,7 +126,7 @@ where
     for &(x, y) in &s.data {
         let x_pos = value_to_face_offset(x, x_axis, face_width);
         let y_pos = -value_to_face_offset(y, y_axis, face_height);
-        let radius = 5.;
+        let radius = style.get_size().clone().unwrap_or(5.) as f64;
         match style.get_marker().clone().unwrap_or(style::Marker::Circle) {
             style::Marker::Circle => {
                 group.append(