Merge branch 'Ploppz-plot'

Author: milliams

CHANGELOG

@@ -9,6 +9,7 @@
 - Group all representations under a `repr` module.
 - Add `linejoin` option to line style.
 - More Box and less & in the interface
+- Replace Line, Scatter and Function with Plot
 
 ## 0.4.0 - 2019-03-02
 ### Added

examples/barchart_svg.rs

@@ -7,7 +7,7 @@ fn main() {
     let b1 = BarChart::new(5.3).label("1");
     let b2 = BarChart::new(2.6)
         .label("2")
-        .style(BoxStyle::new().fill("darkolivegreen"));
+        .style(&BoxStyle::new().fill("darkolivegreen"));
 
     let v = CategoricalView::new()
         .add(b1)

examples/boxplot_svg.rs

@@ -7,7 +7,7 @@ fn main() {
     let b1 = BoxPlot::from_slice(&[1.0, 4.0, 2.0, 3.5, 6.4, 2.5, 7.5, 1.8, 9.6]).label("1");
     let b2 = BoxPlot::from_slice(&[3.0, 4.3, 2.0, 3.5, 6.9, 4.5, 7.5, 1.8, 10.6])
         .label("2")
-        .style(BoxStyle::new().fill("darkolivegreen"));
+        .style(&BoxStyle::new().fill("darkolivegreen"));
 
     let v = CategoricalView::new()
         .add(b1)

examples/function_svg.rs

@@ -1,14 +1,14 @@
-use plotlib::repr::Function;
 use plotlib::page::Page;
+use plotlib::repr::Plot;
 use plotlib::style::LineStyle;
 use plotlib::view::ContinuousView;
 
 fn main() {
-    let f1 = Function::new(|x| x * 5., 0., 10.).style(LineStyle::new().colour("burlywood"));
-    let f2 = Function::new(|x| x.powi(2), 0., 10.)
-        .style(LineStyle::new().colour("darkolivegreen").width(2.));
-    let f3 = Function::new(|x| x.sqrt() * 20., 0., 10.)
-        .style(LineStyle::new().colour("brown").width(1.));
+    let f1 = Plot::from_function(|x| x * 5., 0., 10.).line_style(LineStyle::new().colour("burlywood"));
+    let f2 = Plot::from_function(|x| x.powi(2), 0., 10.)
+        .line_style(LineStyle::new().colour("darkolivegreen").width(2.));
+    let f3 = Plot::from_function(|x| x.sqrt() * 20., 0., 10.)
+        .line_style(LineStyle::new().colour("brown").width(1.));
 
     let v = ContinuousView::new().add(f1).add(f2).add(f3);
 

examples/histogram_svg.rs

@@ -6,7 +6,7 @@ use plotlib::view::ContinuousView;
 fn main() {
     let data = [0.3, 0.5, 6.4, 5.3, 3.6, 3.6, 3.5, 7.5, 4.0];
     let h = Histogram::from_slice(&data, HistogramBins::Count(10))
-        .style(BoxStyle::new().fill("burlywood"));
+        .style(&BoxStyle::new().fill("burlywood"));
 
     let v = ContinuousView::new().add(h);
 

examples/line_and_point_svg.rs

@@ -0,0 +1,13 @@
+use plotlib::page::Page;
+use plotlib::repr::Plot;
+use plotlib::style::*;
+use plotlib::view::ContinuousView;
+
+fn main() {
+    let l1 = Plot::new(vec![(0., 1.), (2., 1.5), (3., 1.2), (4., 1.1)])
+        .line_style(LineStyle::new().colour("burlywood").linejoin(LineJoin::Round))
+        .point_style(PointStyle::new());
+        
+    let v = ContinuousView::new().add(l1);
+    Page::single(&v).save("line_and_point.svg").expect("saving svg");
+}

examples/line_svg.rs

@@ -1,10 +1,10 @@
 use plotlib::page::Page;
-use plotlib::repr::Line;
+use plotlib::repr::Plot;
 use plotlib::style::{LineJoin, LineStyle};
 use plotlib::view::ContinuousView;
 
 fn main() {
-    let l1 = Line::new(vec![(0., 1.), (2., 1.5), (3., 1.2), (4., 1.1)]).style(
+    let l1 = Plot::new(vec![(0., 1.), (2., 1.5), (3., 1.2), (4., 1.1)]).line_style(
         LineStyle::new()
             .colour("burlywood")
             .linejoin(LineJoin::Round),

examples/scatter_svg.rs

@@ -1,25 +1,25 @@
 use plotlib::page::Page;
-use plotlib::repr::Scatter;
+use plotlib::repr::Plot;
 use plotlib::style::{PointMarker, PointStyle};
 use plotlib::view::ContinuousView;
 
 fn main() {
-    let data = [
+    let data = vec![
         (-3.0, 2.3),
         (-1.6, 5.3),
         (0.3, 0.7),
         (4.3, -1.4),
         (6.4, 4.3),
         (8.5, 3.7),
     ];
-    let s1 = Scatter::from_slice(&data).style(
+    let s1 = Plot::new(data).point_style(
         PointStyle::new()
             .marker(PointMarker::Square)
             .colour("burlywood")
             .size(2.),
     );
-    let s2 = Scatter::from_slice(&[(-1.4, 2.5), (7.2, -0.3)])
-        .style(PointStyle::new().colour("darkseagreen"));
+    let s2 = Plot::new(vec![(-1.4, 2.5), (7.2, -0.3)])
+        .point_style(PointStyle::new().colour("darkseagreen"));
 
     let v = ContinuousView::new()
         .add(s1)

examples/scatter_text.rs

@@ -1,20 +1,20 @@
 use plotlib::page::Page;
-use plotlib::repr::Scatter;
+use plotlib::repr::Plot;
 use plotlib::style::{PointMarker, PointStyle};
 use plotlib::view::ContinuousView;
 
 fn main() {
-    let data = [
+    let data = vec![
         (-3.0, 2.3),
         (-1.6, 5.3),
         (0.3, 0.7),
         (4.3, -1.4),
         (6.4, 4.3),
         (8.5, 3.7),
     ];
-    let s1 = Scatter::from_slice(&data);
-    let s2 = Scatter::from_slice(&[(-1.4, 2.5), (7.2, -0.3)])
-        .style(PointStyle::new().marker(PointMarker::Square));
+    let s1 = Plot::new(data);
+    let s2 = Plot::new(vec![(-1.4, 2.5), (7.2, -0.3)])
+        .point_style(PointStyle::new().marker(PointMarker::Square));
 
     let v = ContinuousView::new()
         .add(s1)

examples/with_grid.rs

@@ -1,4 +1,4 @@
-use plotlib::repr::{BarChart, Line};
+use plotlib::repr::{BarChart, Plot};
 use plotlib::grid::Grid;
 use plotlib::page::Page;
 use plotlib::style::{BoxStyle, LineStyle};
@@ -13,8 +13,8 @@ fn render_line_chart<S>(filename: S)
 where
     S: AsRef<str>,
 {
-    let l1 = Line::new(vec![(0., 1.), (2., 1.5), (3., 1.2), (4., 1.1)])
-        .style(LineStyle::new().colour("burlywood"));
+    let l1 = Plot::new(vec![(0., 1.), (2., 1.5), (3., 1.2), (4., 1.1)])
+        .line_style(LineStyle::new().colour("burlywood"));
     let mut v = ContinuousView::new().add(l1);
     v.add_grid(Grid::new(3, 8));
     Page::single(&v)
@@ -29,7 +29,7 @@ where
     let b1 = BarChart::new(5.3).label("1");
     let b2 = BarChart::new(2.6)
         .label("2")
-        .style(BoxStyle::new().fill("darkolivegreen"));
+        .style(&BoxStyle::new().fill("darkolivegreen"));
     let mut v = CategoricalView::new()
         .add(b1)
         .add(b2)