Simply the surface

38 · 38 · commit 3213bc28af0e · 2020-09-07T17:56:36.000-06:00
diff --git a/examples/gtk-demo/Cargo.toml b/examples/gtk-demo/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 plotters = {path = "../.."}
-plotters-cairo = "0.3.*"
-cairo-rs = "0.8.*"
-gtk = "0.8.*"
-gio = "0.8.*"
+plotters-cairo = "0.3.1"
+cairo-rs = "^0.9"
+gtk = "^0.9"
+gio = "^0.9"
diff --git a/examples/gtk-demo/src/main.rs b/examples/gtk-demo/src/main.rs
@@ -13,18 +13,31 @@ fn build_ui(app: &gtk::Application) {
         let root = CairoBackend::new(cr, (500, 500)).unwrap().into_drawing_area();
 
         root.fill(&WHITE).unwrap();
+        let root = root.margin(25, 25, 25, 25);
+
 
         let mut chart = ChartBuilder::on(&root)
             .caption("This is a test", ("sans-serif", 20))
-            .x_label_area_size(40)
-            .y_label_area_size(40)
-            .build_cartesian_2d(0..100, 0..100)
+            .build_cartesian_3d(0.0..100.0, 0.0..100.0, 0.0..100.0)
             .unwrap();
 
-        chart.configure_mesh()
+        chart.with_projection(|mut p| { 
+            p.scale = 0.9;
+            p.into_matrix()
+        });
+        
+        chart.configure_axes()
             .draw()
             .unwrap();
 
+        chart.draw_series(
+            SurfaceSeries::xoz(
+                (0..100).map(|n| n as f64),
+                (0..100).map(|n| n as f64),
+                |x,z| ((x - z) / 10.0).sin() * 20.0 + 50.0,
+            )
+        ).unwrap();
+
         Inhibit(false)
     })
 }
diff --git a/examples/tick_control.rs b/examples/tick_control.rs
@@ -3,12 +3,16 @@ use plotters::prelude::*;
 use std::fs::File;
 use std::io::BufReader;
 
+use chrono::NaiveDate;
+use std::str::FromStr;
+
 #[derive(serde_derive::Deserialize)]
 struct DailyData {
+    date: String,
     #[serde(default)]
-    new_cases: f64,
+    new_cases_smoothed_per_million: f64,
     #[serde(default)]
-    total_cases: f64,
+    total_cases_per_million: f64,
 }
 
 #[derive(serde_derive::Deserialize)]
@@ -18,65 +22,68 @@ struct CountryData {
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root =
-        SVGBackend::new("plotters-doc-data/tick_control.svg", (1024, 768)).into_drawing_area();
+        BitMapBackend::gif("/tmp/tick_control.gif", (800, 600), 100)?.into_drawing_area();
 
-    root.fill(&WHITE)?;
+    for a in 0..200 {
 
-    let (upper, lower) = root.split_vertically(750);
+        root.fill(&WHITE)?;
 
-    lower.titled(
-        "Data Source: https://covid.ourworldindata.org/data/owid-covid-data.json",
-        ("sans-serif", 10).into_font().color(&BLACK.mix(0.5)),
-    )?;
 
-    let mut chart = ChartBuilder::on(&upper)
-        .caption("World COVID-19 Cases", ("sans-serif", (5).percent_height()))
-        .set_label_area_size(LabelAreaPosition::Left, (8).percent())
-        .set_label_area_size(LabelAreaPosition::Bottom, (4).percent())
-        .margin((1).percent())
-        .build_cartesian_2d(
-            (20u32..5000_0000u32)
-                .log_scale()
-                .with_key_points(vec![50, 100, 1000, 10000, 100000, 1000000, 10000000]),
-            (0u32..50_0000u32)
-                .log_scale()
-                .with_key_points(vec![10, 50, 100, 1000, 10000, 100000, 200000]),
-        )?;
+        let mut chart = ChartBuilder::on(&root)
+            .set_label_area_size(LabelAreaPosition::Left, (8).percent())
+            .set_label_area_size(LabelAreaPosition::Bottom, (6).percent())
+            .margin((1).percent())
+            .build_cartesian_3d(
+                (20u32..10_0000u32)
+                    .log_scale()
+                    .with_key_points(vec![50, 100, 200, 500, 1000, 10000]),
+                (0u32..1000u32)
+                    .log_scale()
+                    .with_key_points(vec![2, 5, 10, 20, 50, 100, 200]),
+                NaiveDate::from_ymd(2020, 1, 1)..NaiveDate::from_ymd(2020, 9, 5),
+            )?;
+
+        chart.with_projection(|mut pb| {
+            pb.yaw = (1.57 - a as f64 / 100.0 * 1.57).abs();
+            pb.into_matrix()
+        });
+
+        chart
+            .configure_axes()
+            .draw()?;
 
-    chart
-        .configure_mesh()
-        .x_desc("Total Cases")
-        .y_desc("New Cases")
-        .draw()?;
+        let data: std::collections::HashMap<String, CountryData> = serde_json::from_reader(
+            BufReader::new(File::open("plotters-doc-data/covid-data.json")?),
+        )?;
 
-    let data: std::collections::HashMap<String, CountryData> = serde_json::from_reader(
-        BufReader::new(File::open("plotters-doc-data/covid-data.json")?),
-    )?;
+        for (idx, &series) in ["USA", "CHN"]
+            .iter()
+            .enumerate()
+        {
+            let color = Palette99::pick(idx).mix(1.0);
+            chart
+                .draw_series(LineSeries::new(
+                    data[series].data.iter().map(
+                        |DailyData {
+                             date,
+                             new_cases_smoothed_per_million,
+                             total_cases_per_million,
+                             ..
+                         }| (*total_cases_per_million as u32, *new_cases_smoothed_per_million as u32, chrono::NaiveDate::from_str(date).unwrap(),),
+                    ),
+                    color.stroke_width(1),
+                ))?
+                .label(series)
+                .legend(move |(x, y)| Rectangle::new([(x, y - 5), (x + 10, y + 5)], color.filled()));
+        }
 
-    for (idx, &series) in ["CHN", "USA", "RUS", "JPN", "DEU", "IND", "OWID_WRL"]
-        .iter()
-        .enumerate()
-    {
-        let color = Palette99::pick(idx).mix(0.9);
         chart
-            .draw_series(LineSeries::new(
-                data[series].data.iter().map(
-                    |&DailyData {
-                         new_cases,
-                         total_cases,
-                         ..
-                     }| (total_cases as u32, new_cases as u32),
-                ),
-                color.stroke_width(3),
-            ))?
-            .label(series)
-            .legend(move |(x, y)| Rectangle::new([(x, y - 5), (x + 10, y + 5)], color.filled()));
-    }
+            .configure_series_labels()
+            .border_style(&BLACK)
+            .draw()?;
 
-    chart
-        .configure_series_labels()
-        .border_style(&BLACK)
-        .draw()?;
+        root.present()?;
+    }
 
     Ok(())
 }
diff --git a/src/series/surface.rs b/src/series/surface.rs
@@ -61,7 +61,6 @@ where
     free_var_2: Vec<D::Input2Type>,
     surface_f: SurfaceFunc,
     style: StyleConfig<'a, D::OutputType>,
-    adv: bool,
     vidx_1: usize,
     vidx_2: usize,
     _phantom: PhantomData<(X, Y, Z, D)>,
@@ -82,7 +81,6 @@ where
             free_var_2: second_iter.collect(),
             surface_f: func,
             style: StyleConfig::Fixed(BLUE.mix(0.4).filled()),
-            adv: true,
             vidx_1: 0,
             vidx_2: 0,
             _phantom: PhantomData,
@@ -99,31 +97,6 @@ where
         self
     }
 
-    fn get_next_free_value_2(&mut self) -> Option<[D::Input2Type; 2]>
-    where
-        D::Input2Type: Clone,
-    {
-        if self.adv {
-            if self.vidx_2 + 1 < self.free_var_2.len() {
-                self.vidx_2 += 1;
-                return Some([
-                    self.free_var_2[self.vidx_2 - 1].clone(),
-                    self.free_var_2[self.vidx_2].clone(),
-                ]);
-            }
-            self.vidx_2 += 1;
-        } else {
-            if self.vidx_2 > 1 {
-                self.vidx_2 -= 1;
-                return Some([
-                    self.free_var_2[self.vidx_2 - 1].clone(),
-                    self.free_var_2[self.vidx_2].clone(),
-                ]);
-            }
-            self.vidx_2 = self.vidx_2.max(1) - 1;
-        }
-        None
-    }
 }
 
 macro_rules! impl_constructor {
@@ -158,18 +131,19 @@ where
 {
     type Item = Polygon<(X, Y, Z)>;
     fn next(&mut self) -> Option<Self::Item> {
-        let (b0, b1) = if let Some([b0, b1]) = self.get_next_free_value_2() {
+        let (b0, b1) = if let (Some(b0), Some(b1)) = (self.free_var_2.get(self.vidx_2), self.free_var_2.get(self.vidx_2 + 1)) {
+            self.vidx_2 += 1;
             (b0, b1)
         } else {
             self.vidx_1 += 1;
-            self.adv = !self.adv;
-            if let Some([b0, b1]) = self.get_next_free_value_2() {
+            self.vidx_2 = 1;
+            if let (Some(b0), Some(b1)) = (self.free_var_2.get(0), self.free_var_2.get(1)) {
                 (b0, b1)
             } else {
                 return None;
             }
         };
-
+        
         match (
             self.free_var_1.get(self.vidx_1),
             self.free_var_1.get(self.vidx_1 + 1),
