First pass at builder pattern for scatter style

Author: milliams

src/scatter.rs

@@ -7,20 +7,37 @@ use svg_render;
 use text_render;
 use representation::Representation;
 
-#[derive(Debug)]
+#[derive(Debug,Clone)]
 pub enum Marker {
     Circle,
     Square,
 }
 
-#[derive(Debug)]
+#[derive(Debug,Clone)]
 pub struct Style {
-    pub marker: Marker,
+    pub marker: Option<Marker>,
+    pub colour: Option<String>,
 }
 
 impl Style {
-    fn defaults() -> Self {
-        Style { marker: Marker::Circle }
+    pub fn new() -> Self {
+        Style {
+            marker: None,
+            colour: None,
+        }
+    }
+
+    pub fn fill_defaults(&self) -> Self {
+        Style {
+            marker: match self.marker {
+                Some(ref m) => Some(m.clone()),
+                None => Some(Marker::Circle),
+            },
+            colour: match self.colour {
+                Some(ref c) => Some(c.clone()),
+                None => Some("".into()),
+            }
+        }
     }
 }
 
@@ -29,7 +46,7 @@ impl Style {
 #[derive(Debug)]
 pub struct Scatter {
     pub data: Vec<(f64, f64)>,
-    pub style: Style,
+    style: Style,
 }
 
 impl Scatter {
@@ -41,7 +58,7 @@ impl Scatter {
 
         Scatter {
             data: data,
-            style: Style::defaults(),
+            style: Style::new(),
         }
     }
 
@@ -50,6 +67,10 @@ impl Scatter {
         self
     }
 
+    pub fn get_style(&self) -> Style {
+        self.style.clone()
+    }
+
     fn x_range(&self) -> (f64, f64) {
         let mut min = f64::INFINITY;
         let mut max = f64::NEG_INFINITY;
@@ -86,7 +107,7 @@ impl Representation for Scatter {
               face_width: f64,
               face_height: f64)
               -> svg::node::element::Group {
-        svg_render::draw_face_points(self, &x_axis, &y_axis, face_width, face_height, &self.style)
+        svg_render::draw_face_points(self, &x_axis, &y_axis, face_width, face_height, &self.style.fill_defaults())
     }
 
     fn to_text(&self,
@@ -95,6 +116,6 @@ impl Representation for Scatter {
                face_width: u32,
                face_height: u32)
                -> String {
-        text_render::render_face_points(self, &x_axis, &y_axis, face_width, face_height, &self.style)
+        text_render::render_face_points(self, &x_axis, &y_axis, face_width, face_height, &self.style.fill_defaults())
     }
 }

src/svg_render.rs

@@ -109,14 +109,14 @@ pub fn draw_face_points(s: &scatter::Scatter,
         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.;
-        match style.marker {
-            scatter::Marker::Circle => {
+        match style.marker.as_ref().unwrap() {
+            &scatter::Marker::Circle => {
                 group.append(node::element::Circle::new()
                     .set("cx", x_pos)
                     .set("cy", y_pos)
                     .set("r", radius));
             },
-            scatter::Marker::Square => {
+            &scatter::Marker::Square => {
                 group.append(node::element::Rectangle::new()
                     .set("x", x_pos - radius)
                     .set("y", y_pos - radius)

src/text_render.rs

@@ -331,9 +331,9 @@ pub fn render_face_points(s: &scatter::Scatter,
         })
         .collect();
 
-    let marker = match style.marker {
-        scatter::Marker::Circle => '●',
-        scatter::Marker::Square => '■',
+    let marker = match style.marker.as_ref().unwrap() {
+        &scatter::Marker::Circle => '●',
+        &scatter::Marker::Square => '■',
     };
 
     let mut face_strings: Vec<String> = vec![];
@@ -557,9 +557,7 @@ mod tests {
         let s = scatter::Scatter::from_vec(&data);
         let x_axis = axis::Axis::new(-3.575, 9.075);
         let y_axis = axis::Axis::new(-1.735, 5.635);
-        let style = scatter::Style {
-            marker: scatter::Marker::Circle,
-        };
+        let style = scatter::Style::new().fill_defaults();
         let strings = render_face_points(&s, &x_axis, &y_axis, 20, 10, &style);
         assert_eq!(strings.lines().count(), 10);
         assert!(strings.lines().all(|s| s.chars().count() == 20));