Added custom smoothness

charming/src/element/mod.rs

@@ -36,6 +36,7 @@ pub mod pointer;
 pub mod scale_limit;
 pub mod select;
 pub mod shape;
+pub mod smoothness;
 pub mod sort;
 pub mod split_area;
 pub mod split_line;

charming/src/element/smoothness.rs

@@ -0,0 +1,49 @@
+use serde::Serialize;
+
+#[derive(Debug, PartialEq, PartialOrd, Clone)]
+pub enum Smoothness {
+    Single(f64),
+    Boolean(bool),
+}
+
+impl Serialize for Smoothness {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        match self {
+            Smoothness::Single(smoothness) => serializer.serialize_f64(*smoothness),
+            Smoothness::Boolean(smoothness) => serializer.serialize_bool(*smoothness),
+        }
+    }
+}
+
+impl From<f64> for Smoothness {
+    fn from(value: f64) -> Self {
+        Smoothness::Single(value)
+    }
+}
+
+impl From<f32> for Smoothness {
+    fn from(value: f32) -> Self {
+        Smoothness::Single(value as f64)
+    }
+}
+
+impl From<i32> for Smoothness {
+    fn from(value: i32) -> Self {
+        Smoothness::Single(value as f64)
+    }
+}
+
+impl From<u32> for Smoothness {
+    fn from(value: u32) -> Self {
+        Smoothness::Single(value as f64)
+    }
+}
+
+impl From<bool> for Smoothness {
+    fn from(value: bool) -> Self {
+        Smoothness::Boolean(value)
+    }
+}

charming/src/series/line.rs

@@ -3,8 +3,8 @@ use serde::Serialize;
 use crate::{
     datatype::{DataFrame, DataPoint},
     element::{
-        AreaStyle, CoordinateSystem, DimensionEncode, Emphasis, ItemStyle, Label, LineStyle,
-        MarkArea, MarkLine, MarkPoint, Symbol,
+        smoothness::Smoothness, AreaStyle, CoordinateSystem, DimensionEncode, Emphasis, ItemStyle,
+        Label, LineStyle, MarkArea, MarkLine, MarkPoint, Symbol,
     },
 };
 
@@ -51,7 +51,7 @@ pub struct Line {
     emphasis: Option<Emphasis>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    smooth: Option<f64>,
+    smooth: Option<Smoothness>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     connect_nulls: Option<bool>,
@@ -178,7 +178,7 @@ impl Line {
     }
 
     /// Smoothness.
-    pub fn smooth<F: Into<f64>>(mut self, smooth: F) -> Self {
+    pub fn smooth<S: Into<Smoothness>>(mut self, smooth: S) -> Self {
         self.smooth = Some(smooth.into());
         self
     }

charming/src/series/parallel.rs

@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     datatype::{DataFrame, DataPoint},
-    element::{ColorBy, CoordinateSystem, Emphasis, LineStyle},
+    element::{smoothness::Smoothness, ColorBy, CoordinateSystem, Emphasis, LineStyle},
 };
 
 #[derive(Serialize)]
@@ -49,7 +49,7 @@ pub struct Parallel {
     realtime: Option<bool>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    smooth: Option<f64>,
+    smooth: Option<Smoothness>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     progressive: Option<f64>,
@@ -142,7 +142,7 @@ impl Parallel {
         self
     }
 
-    pub fn smooth<F: Into<f64>>(mut self, smooth: F) -> Self {
+    pub fn smooth<S: Into<Smoothness>>(mut self, smooth: S) -> Self {
         self.smooth = Some(smooth.into());
         self
     }

gallery/src/line/area_pieces.rs

@@ -35,7 +35,7 @@ pub fn chart() -> Chart {
         )
         .series(
             Line::new()
-                .smooth(0.6)
+                .smooth(true)
                 .symbol(Symbol::None)
                 .line_style(LineStyle::new().width(5).color("#5470C6"))
                 .area_style(AreaStyle::new())

gallery/src/line/distribution_of_electricity.rs

@@ -51,7 +51,7 @@ pub fn chart() -> Chart {
         .series(
             Line::new()
                 .name("Electricity")
-                .smooth(0.5)
+                .smooth(true)
                 .connect_nulls(true)
                 .data(vec![
                     Some(300),

gallery/src/line/gradient_stacked_area.rs

@@ -61,7 +61,7 @@ pub fn chart() -> Chart {
                         })
                         .opacity(0.8),
                 )
-                .smooth(0.5)
+                .smooth(true)
                 .data(vec![140, 232, 101, 264, 90, 340, 250]),
         )
         .series(
@@ -84,7 +84,7 @@ pub fn chart() -> Chart {
                         })
                         .opacity(0.8),
                 )
-                .smooth(0.5)
+                .smooth(true)
                 .data(vec![120, 282, 111, 234, 220, 340, 310]),
         )
         .series(
@@ -107,7 +107,7 @@ pub fn chart() -> Chart {
                         })
                         .opacity(0.8),
                 )
-                .smooth(0.5)
+                .smooth(true)
                 .data(vec![320, 132, 201, 334, 190, 130, 220]),
         )
         .series(
@@ -130,7 +130,7 @@ pub fn chart() -> Chart {
                         })
                         .opacity(0.8),
                 )
-                .smooth(0.5)
+                .smooth(true)
                 .data(vec![220, 402, 231, 134, 190, 230, 120]),
         )
         .series(
@@ -153,7 +153,7 @@ pub fn chart() -> Chart {
                         })
                         .opacity(0.8),
                 )
-                .smooth(0.5)
+                .smooth(true)
                 .data(vec![220, 302, 181, 234, 210, 290, 150]),
         )
 }

gallery/src/line/smoothed_line.rs

@@ -10,7 +10,7 @@ pub fn chart() -> Chart {
         .y_axis(Axis::new().type_(AxisType::Value))
         .series(
             Line::new()
-                .smooth(0.5)
+                .smooth(true)
                 .data(vec![820, 932, 901, 934, 1290, 1330, 1320]),
         )
 }