Add colour options to Function

Author: milliams

src/function.rs

@@ -7,8 +7,43 @@ use representation::Representation;
 
 use svg_render;
 
+#[derive(Debug)]
+pub struct Style {
+    colour: Option<String>,
+}
+
+impl Style {
+    pub fn new() -> Self {
+        Style {
+            colour: None,
+        }
+    }
+
+    pub fn overlay(&mut self, other: Self) {
+        match other.colour {
+            Some(v) => self.colour = Some(v),
+            None => {}
+        }
+    }
+
+    pub fn colour<T>(mut self, value: T) -> Self
+        where T: Into<String>
+    {
+        self.colour = Some(value.into());
+        self
+    }
+
+    pub fn get_colour(&self) -> String {
+        match self.colour.clone() {
+            Some(v) => v,
+            None => "".into(),
+        }
+    }
+}
+
 pub struct Function {
     pub data: Vec<(f64, f64)>,
+    style: Style,
 }
 
 impl Function {
@@ -19,9 +54,19 @@ impl Function {
         let values = samples.map(|s| (s, f(s))).collect();
         Function {
             data: values,
+            style: Style::new(),
         }
     }
 
+    pub fn style(mut self, style: Style) -> Self {
+        self.style.overlay(style);
+        self
+    }
+
+    pub fn get_style(&self) -> &Style {
+        &self.style
+    }
+
     fn x_range(&self) -> (f64, f64) {
         let mut min = f64::INFINITY;
         let mut max = f64::NEG_INFINITY;
@@ -58,7 +103,7 @@ impl Representation for Function {
               face_width: f64,
               face_height: f64)
               -> svg::node::element::Group {
-        svg_render::draw_face_line(self, x_axis, y_axis, face_width, face_height)
+        svg_render::draw_face_line(self, x_axis, y_axis, face_width, face_height, &self.style)
     }
 
     fn to_text(&self,

src/plot.rs

@@ -35,6 +35,7 @@ impl<'a> Plot<'a> {
     */
     pub fn to_svg(&self) -> svg::Document {
         let mut document = Document::new().set("viewBox", (0, 0, 600, 400));
+        // TODO put multiple views in correct places
         for &view in &self.views {
             let view_group = view.to_svg(500., 340.)
                 .set("transform", format!("translate({}, {})", 50, 360));

src/representation.rs

@@ -1,8 +1,8 @@
 use svg;
-
 use axis;
 
 pub trait Representation {
+    /// The maximum range in each dimension. Used for auto-scaling axes
     fn range(&self, dim: u32) -> (f64, f64);
 
     fn to_svg(&self,
@@ -11,6 +11,7 @@ pub trait Representation {
               face_width: f64,
               face_height: f64)
               -> svg::node::element::Group;
+
     fn to_text(&self,
                x_axis: &axis::Axis,
                y_axis: &axis::Axis,

src/svg_render.rs

@@ -185,7 +185,8 @@ pub fn draw_face_line(s: &function::Function,
                         x_axis: &axis::Axis,
                         y_axis: &axis::Axis,
                         face_width: f64,
-                        face_height: f64)
+                        face_height: f64,
+                        style: &function::Style)
                         -> node::element::Group {
     let mut group = node::element::Group::new();
 
@@ -204,7 +205,7 @@ pub fn draw_face_line(s: &function::Function,
 
     group.append(node::element::Path::new()
         .set("fill", "none")
-        .set("stroke", "black")
+        .set("stroke", style.get_colour())
         .set("stroke-width", 2)
         .set("d", path));