Rename MeshStyle::line_style_1 to MeshStyle::bold_line_style and line_style_2 to light_line_style + make datetime coordinate follows the extra key points input feeded by hint

Author: 38

examples/boxplot.rs

@@ -80,7 +80,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .x_desc("Ping, ms")
         .y_desc("Host")
         .y_labels(host_list.len())
-        .line_style_2(&WHITE)
+        .light_line_style(&WHITE)
         .draw()?;
 
     for (label, (values, style, offset)) in &series {
@@ -128,7 +128,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             values_range.start - 10.0..values_range.end + 10.0,
         )?;
 
-    chart.configure_mesh().line_style_2(&WHITE).draw()?;
+    chart.configure_mesh().light_line_style(&WHITE).draw()?;
     chart.draw_series(vec![
         Boxplot::new_vertical(SegmentValue::CenterOf(&"a"), &quartiles_a),
         Boxplot::new_vertical(SegmentValue::CenterOf(&"b"), &quartiles_b),
@@ -140,7 +140,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .caption("Horizontal Boxplot", ("sans-serif", 20).into_font())
         .build_ranged(-30f32..90f32, 0..3)?;
 
-    chart.configure_mesh().line_style_2(&WHITE).draw()?;
+    chart.configure_mesh().light_line_style(&WHITE).draw()?;
     chart.draw_series(vec![
         Boxplot::new_horizontal(1, &quartiles_a),
         Boxplot::new_horizontal(2, &Quartiles::new(&[30])),

examples/histogram.rs

@@ -15,7 +15,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     chart
         .configure_mesh()
         .disable_x_mesh()
-        .line_style_1(&WHITE.mix(0.3))
+        .bold_line_style(&WHITE.mix(0.3))
         .y_desc("Count")
         .x_desc("Bucket")
         .axis_desc_style(("sans-serif", 15).into_font())

examples/stock.rs

@@ -23,7 +23,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .caption("MSFT Stock Price", ("sans-serif", 50.0).into_font())
         .build_ranged(from_date..to_date, 110f32..135f32)?;
 
-    chart.configure_mesh().line_style_2(&WHITE).draw()?;
+    chart.configure_mesh().light_line_style(&WHITE).draw()?;
 
     chart.draw_series(
         data.iter()

src/chart/context.rs

@@ -248,8 +248,8 @@ impl<
             draw_y_axis: true,
             n_x_labels: 10,
             n_y_labels: 10,
-            line_style_1: None,
-            line_style_2: None,
+            bold_line_style: None,
+            light_line_style: None,
             x_label_style: None,
             y_label_style: None,
             format_x: &X::format,

src/chart/mesh.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use super::builder::LabelAreaPosition;
 use super::context::ChartContext;
-use crate::coord::{BoldPoints, MeshLine, Ranged, RangedCoord, ValueFormatter};
+use crate::coord::{BoldPoints, LightPoints, MeshLine, Ranged, RangedCoord, ValueFormatter};
 use crate::drawing::DrawingAreaErrorKind;
 use crate::style::{
     AsRelative, Color, FontDesc, FontFamily, FontStyle, IntoTextStyle, RGBColor, ShapeStyle,
@@ -156,8 +156,8 @@ where
     pub(super) axis_desc_style: Option<TextStyle<'b>>,
     pub(super) x_desc: Option<String>,
     pub(super) y_desc: Option<String>,
-    pub(super) line_style_1: Option<ShapeStyle>,
-    pub(super) line_style_2: Option<ShapeStyle>,
+    pub(super) bold_line_style: Option<ShapeStyle>,
+    pub(super) light_line_style: Option<ShapeStyle>,
     pub(super) axis_style: Option<ShapeStyle>,
     pub(super) x_label_style: Option<TextStyle<'b>>,
     pub(super) y_label_style: Option<TextStyle<'b>>,
@@ -277,15 +277,15 @@ where
 
     /// Set the style for the coarse grind grid
     /// - `style`: This is the coarse grind grid style
-    pub fn line_style_1<T: Into<ShapeStyle>>(&mut self, style: T) -> &mut Self {
-        self.line_style_1 = Some(style.into());
+    pub fn bold_line_style<T: Into<ShapeStyle>>(&mut self, style: T) -> &mut Self {
+        self.bold_line_style = Some(style.into());
         self
     }
 
     /// Set the style for the fine grind grid
     /// - `style`: The fine grind grid style
-    pub fn line_style_2<T: Into<ShapeStyle>>(&mut self, style: T) -> &mut Self {
-        self.line_style_2 = Some(style.into());
+    pub fn light_line_style<T: Into<ShapeStyle>>(&mut self, style: T) -> &mut Self {
+        self.light_line_style = Some(style.into());
         self
     }
 
@@ -362,12 +362,12 @@ where
             FontStyle::Normal,
         );
 
-        let mesh_style_1 = self
-            .line_style_1
+        let bold_style = self
+            .bold_line_style
             .clone()
             .unwrap_or_else(|| (&default_mesh_color_1).into());
-        let mesh_style_2 = self
-            .line_style_2
+        let light_style = self
+            .light_line_style
             .clone()
             .unwrap_or_else(|| (&default_mesh_color_2).into());
         let axis_style = self
@@ -391,8 +391,11 @@ where
             .unwrap_or_else(|| x_label_style.clone());
 
         target.draw_mesh(
-            (self.n_y_labels * 10, self.n_x_labels * 10),
-            &mesh_style_2,
+            (
+                LightPoints::new(self.n_y_labels, self.n_y_labels * 10),
+                LightPoints::new(self.n_x_labels, self.n_x_labels * 10),
+            ),
+            &light_style,
             &x_label_style,
             &y_label_style,
             |_| None,
@@ -412,7 +415,7 @@ where
 
         target.draw_mesh(
             (BoldPoints(self.n_y_labels), BoldPoints(self.n_x_labels)),
-            &mesh_style_1,
+            &bold_style,
             &x_label_style,
             &y_label_style,
             |m| match m {

src/coord/datetime.rs

@@ -252,19 +252,8 @@ impl<T: TimeValue + Datelike + Clone> ValueFormatter<T> for Monthly<T> {
     }
 }
 
-impl<T: TimeValue + Clone> Ranged for Monthly<T> {
-    type FormatOption = crate::coord::ranged::NoDefaultFormatting;
-    type ValueType = T;
-
-    fn range(&self) -> Range<T> {
-        self.0.start.clone()..self.0.end.clone()
-    }
-
-    fn map(&self, value: &Self::ValueType, limit: (i32, i32)) -> i32 {
-        T::map_coord(value, &self.0.start, &self.0.end, limit)
-    }
-
-    fn key_points<HintType: KeyPointHint>(&self, hint: HintType) -> Vec<Self::ValueType> {
+impl<T: TimeValue + Clone> Monthly<T> {
+    fn bold_key_points<H: KeyPointHint>(&self, hint: &H) -> Vec<T> {
         let max_points = hint.max_num_points();
         let start_date = self.0.start.date_ceil();
         let end_date = self.0.end.date_floor();
@@ -356,7 +345,35 @@ impl<T: TimeValue + Clone> Ranged for Monthly<T> {
     }
 }
 
-impl<T: TimeValue + Clone> DiscreteRanged for Monthly<T> {
+impl<T: TimeValue + Clone> Ranged for Monthly<T>
+where
+    Range<T>: AsRangedCoord<Value = T>,
+{
+    type FormatOption = crate::coord::ranged::NoDefaultFormatting;
+    type ValueType = T;
+
+    fn range(&self) -> Range<T> {
+        self.0.start.clone()..self.0.end.clone()
+    }
+
+    fn map(&self, value: &Self::ValueType, limit: (i32, i32)) -> i32 {
+        T::map_coord(value, &self.0.start, &self.0.end, limit)
+    }
+
+    fn key_points<HintType: KeyPointHint>(&self, hint: HintType) -> Vec<Self::ValueType> {
+        if hint.weight().allow_light_points() && self.size() <= hint.bold_points() * 2 {
+            let coord: <Range<T> as AsRangedCoord>::CoordDescType = self.0.clone().into();
+            let normal = coord.key_points(hint.max_num_points());
+            return normal;
+        }
+        self.bold_key_points(&hint)
+    }
+}
+
+impl<T: TimeValue + Clone> DiscreteRanged for Monthly<T>
+where
+    Range<T>: AsRangedCoord<Value = T>,
+{
     fn size(&self) -> usize {
         let (start_year, start_month) = {
             let ceil = self.0.start.date_ceil();
@@ -455,7 +472,10 @@ impl<T: TimeValue + Datelike + Clone> ValueFormatter<T> for Yearly<T> {
     }
 }
 
-impl<T: TimeValue + Clone> Ranged for Yearly<T> {
+impl<T: TimeValue + Clone> Ranged for Yearly<T>
+where
+    Range<T>: AsRangedCoord<Value = T>,
+{
     type FormatOption = crate::coord::ranged::NoDefaultFormatting;
     type ValueType = T;
 
@@ -468,6 +488,9 @@ impl<T: TimeValue + Clone> Ranged for Yearly<T> {
     }
 
     fn key_points<HintType: KeyPointHint>(&self, hint: HintType) -> Vec<Self::ValueType> {
+        if hint.weight().allow_light_points() && self.size() <= hint.bold_points() * 2 {
+            return Monthly(self.0.clone()).key_points(hint);
+        }
         let max_points = hint.max_num_points();
         let start_date = self.0.start.date_ceil();
         let end_date = self.0.end.date_floor();
@@ -498,7 +521,10 @@ impl<T: TimeValue + Clone> Ranged for Yearly<T> {
     }
 }
 
-impl<T: TimeValue + Clone> DiscreteRanged for Yearly<T> {
+impl<T: TimeValue + Clone> DiscreteRanged for Yearly<T>
+where
+    Range<T>: AsRangedCoord<Value = T>,
+{
     fn size(&self) -> usize {
         let year_start = self.0.start.date_ceil().year();
         let year_end = self.0.end.date_floor().year();
@@ -883,6 +909,7 @@ mod test {
 
     #[test]
     fn test_yearly_date_range() {
+        use crate::coord::BoldPoints;
         let range = Utc.ymd(1000, 8, 5)..Utc.ymd(2999, 1, 1);
         let ranged_coord = range.yearly();
 
@@ -910,7 +937,7 @@ mod test {
 
         let range = Utc.ymd(2019, 8, 5)..Utc.ymd(2020, 1, 1);
         let ranged_coord = range.yearly();
-        let kps = ranged_coord.key_points(23);
+        let kps = ranged_coord.key_points(BoldPoints(23));
         assert!(kps.len() == 1);
     }
 
@@ -919,13 +946,15 @@ mod test {
         let range = Utc.ymd(2019, 8, 5)..Utc.ymd(2020, 9, 1);
         let ranged_coord = range.monthly();
 
-        let kps = ranged_coord.key_points(15);
+        use crate::coord::BoldPoints;
+
+        let kps = ranged_coord.key_points(BoldPoints(15));
 
         assert!(kps.len() <= 15);
         assert!(kps.iter().all(|x| x.day() == 1));
         assert!(kps.into_iter().any(|x| x.month() != 9));
 
-        let kps = ranged_coord.key_points(5);
+        let kps = ranged_coord.key_points(BoldPoints(5));
         assert!(kps.len() <= 5);
         assert!(kps.iter().all(|x| x.day() == 1));
         let kps: Vec<_> = kps.into_iter().map(|x| x.month()).collect();

src/coord/mod.rs

@@ -44,8 +44,8 @@ pub use numeric::{
     RangedCoordu128, RangedCoordu32, RangedCoordu64,
 };
 pub use ranged::{
-    AsRangedCoord, BoldPoints, DefaultFormatting, KeyPointHint, KeyPointWeight, MeshLine,
-    NoDefaultFormatting, Ranged, RangedCoord, ReversibleRanged, ValueFormatter,
+    AsRangedCoord, BoldPoints, DefaultFormatting, KeyPointHint, KeyPointWeight, LightPoints,
+    MeshLine, NoDefaultFormatting, Ranged, RangedCoord, ReversibleRanged, ValueFormatter,
 };
 
 pub use partial_axis::{make_partial_axis, IntoPartialAxis};

src/coord/ranged.rs

@@ -42,9 +42,21 @@ pub enum KeyPointWeight {
     Any,
 }
 
+impl KeyPointWeight {
+    pub fn allow_light_points(&self) -> bool {
+        match self {
+            Self::Bold => false,
+            Self::Any => true,
+        }
+    }
+}
+
 pub trait KeyPointHint {
     fn max_num_points(&self) -> usize;
     fn weight(&self) -> KeyPointWeight;
+    fn bold_points(&self) -> usize {
+        self.max_num_points()
+    }
 }
 
 impl KeyPointHint for usize {
@@ -69,6 +81,34 @@ impl KeyPointHint for BoldPoints {
     }
 }
 
+pub struct LightPoints {
+    bold_points_num: usize,
+    light_limit: usize,
+}
+
+impl LightPoints {
+    pub fn new(bold_count: usize, requested: usize) -> Self {
+        Self {
+            bold_points_num: bold_count,
+            light_limit: requested,
+        }
+    }
+}
+
+impl KeyPointHint for LightPoints {
+    fn max_num_points(&self) -> usize {
+        self.light_limit
+    }
+
+    fn bold_points(&self) -> usize {
+        self.bold_points_num
+    }
+
+    fn weight(&self) -> KeyPointWeight {
+        KeyPointWeight::Any
+    }
+}
+
 /// The trait that indicates we have a ordered and ranged value
 /// Which is used to describe the axis
 pub trait Ranged {