Skip to content

Commit

Permalink
feat: support margin and background color for multi chart
Browse files Browse the repository at this point in the history
  • Loading branch information
@vicanso
vicanso committed Aug 20, 2023
1 parent d94ebaf commit c67ba60
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 37 deletions.
19 changes: 10 additions & 9 deletions asset/multi_chart/basic.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
132 changes: 104 additions & 28 deletions src/charts/multi_chart.rs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
use super::params::get_f32_from_value;
use substring::Substring;

use super::canvas;
use super::component::generate_svg;
use super::component::Rect;
use super::params::{get_color_from_value, get_f32_from_value, get_margin_from_value};
use super::{
canvas, component::generate_svg, BarChart, CandlestickChart, CanvasResult, HorizontalBarChart,
LineChart, PieChart, RadarChart, ScatterChart, TableChart,
BarChart, CandlestickChart, CanvasResult, HorizontalBarChart, LineChart, PieChart, RadarChart,
ScatterChart, TableChart,
};
use substring::Substring;
use super::{Box, Color};

pub enum ChildChart {
Bar(BarChart, Option<(f32, f32)>),
Expand All @@ -19,6 +24,8 @@ pub enum ChildChart {
pub struct MultiChart {
pub charts: Vec<ChildChart>,
pub gap: f32,
pub margin: Box,
pub background_color: Option<Color>,
}
struct ChildChartResult {
svg: String,
Expand All @@ -35,6 +42,12 @@ impl MultiChart {
theme = value.to_string();
}
let mut multi_chart = MultiChart::new();
if let Some(margin) = get_margin_from_value(&value, "margin") {
multi_chart.margin = margin;
}
if let Some(background_color) = get_color_from_value(&value, "background_color") {
multi_chart.background_color = Some(background_color);
}
if let Some(child_charts) = value.get("child_charts") {
if let Some(values) = child_charts.as_array() {
for item in values.iter() {
Expand Down Expand Up @@ -111,6 +124,7 @@ impl MultiChart {
MultiChart {
charts: vec![],
gap: 10.0,
..Default::default()
}
}
/// Adds a child chart to multi chart.
Expand All @@ -122,145 +136,187 @@ impl MultiChart {
let mut arr = vec![];
let mut y = 0.0;
let mut x = 0.0;
let margin_top = self.margin.top;
let margin_left = self.margin.left;
for item in self.charts.iter_mut() {
let result = match item {
ChildChart::Bar(c, postion) => {
ChildChart::Bar(c, position) => {
c.y = y;
// 指定定位的不增加gap
if let Some((x, y)) = postion {
if let Some((x, y)) = position {
c.y = y.to_owned();
c.x = x.to_owned();
} else if y > 0.0 {
} else if y == 0.0 {
c.y = margin_top;
} else {
// 非首个图，而且未设置定位
y += self.gap;
c.y = y;
}
if position.is_none() {
c.x = c.x.max(margin_left);
}

ChildChartResult {
svg: c.svg()?,
right: c.x + c.width,
bottom: c.y + c.height,
}
}
ChildChart::Candlestick(c, postion) => {
ChildChart::Candlestick(c, position) => {
c.y = y;
// 指定定位的不增加gap
if let Some((x, y)) = postion {
if let Some((x, y)) = position {
c.y = y.to_owned();
c.x = x.to_owned();
} else if y > 0.0 {
} else if y == 0.0 {
c.y = margin_top;
} else {
// 非首个图，而且未设置定位
y += self.gap;
c.y = y;
}
if position.is_none() {
c.x = c.x.max(margin_left);
}

ChildChartResult {
svg: c.svg()?,
right: c.x + c.width,
bottom: c.y + c.height,
}
}
ChildChart::HorizontalBar(c, postion) => {
ChildChart::HorizontalBar(c, position) => {
c.y = y;
// 指定定位的不增加gap
if let Some((x, y)) = postion {
if let Some((x, y)) = position {
c.y = y.to_owned();
c.x = x.to_owned();
} else if y > 0.0 {
} else if y == 0.0 {
c.y = margin_top;
} else {
// 非首个图，而且未设置定位
y += self.gap;
c.y = y;
}
if position.is_none() {
c.x = c.x.max(margin_left);
}

ChildChartResult {
svg: c.svg()?,
right: c.x + c.width,
bottom: c.y + c.height,
}
}
ChildChart::Line(c, postion) => {
ChildChart::Line(c, position) => {
c.y = y;
// 指定定位的不增加gap
if let Some((x, y)) = postion {
if let Some((x, y)) = position {
c.y = y.to_owned();
c.x = x.to_owned();
} else if y > 0.0 {
} else if y == 0.0 {
c.y = margin_top;
} else {
// 非首个图，而且未设置定位
y += self.gap;
c.y = y;
}
if position.is_none() {
c.x = c.x.max(margin_left);
}

ChildChartResult {
svg: c.svg()?,
right: c.x + c.width,
bottom: c.y + c.height,
}
}
ChildChart::Pie(c, postion) => {
ChildChart::Pie(c, position) => {
c.y = y;
// 指定定位的不增加gap
if let Some((x, y)) = postion {
if let Some((x, y)) = position {
c.y = y.to_owned();
c.x = x.to_owned();
} else if y > 0.0 {
} else if y == 0.0 {
c.y = margin_top;
} else {
// 非首个图，而且未设置定位
y += self.gap;
c.y = y;
}
if position.is_none() {
c.x = c.x.max(margin_left);
}

ChildChartResult {
svg: c.svg()?,
right: c.x + c.width,
bottom: c.y + c.height,
}
}
ChildChart::Radar(c, postion) => {
ChildChart::Radar(c, position) => {
c.y = y;
// 指定定位的不增加gap
if let Some((x, y)) = postion {
if let Some((x, y)) = position {
c.y = y.to_owned();
c.x = x.to_owned();
} else if y > 0.0 {
} else if y == 0.0 {
c.y = margin_top;
} else {
// 非首个图，而且未设置定位
y += self.gap;
c.y = y;
}
if position.is_none() {
c.x = c.x.max(margin_left);
}

ChildChartResult {
svg: c.svg()?,
right: c.x + c.width,
bottom: c.y + c.height,
}
}
ChildChart::Scatter(c, postion) => {
ChildChart::Scatter(c, position) => {
c.y = y;
// 指定定位的不增加gap
if let Some((x, y)) = postion {
if let Some((x, y)) = position {
c.y = y.to_owned();
c.x = x.to_owned();
} else if y > 0.0 {
} else if y == 0.0 {
c.y = margin_top;
} else {
// 非首个图，而且未设置定位
y += self.gap;
c.y = y;
}
if position.is_none() {
c.x = c.x.max(margin_left);
}

ChildChartResult {
svg: c.svg()?,
right: c.x + c.width,
bottom: c.y + c.height,
}
}
ChildChart::Table(c, postion) => {
ChildChart::Table(c, position) => {
c.y = y;
// 指定定位的不增加gap
if let Some((x, y)) = postion {
if let Some((x, y)) = position {
c.y = y.to_owned();
c.x = x.to_owned();
} else if y > 0.0 {
} else if y == 0.0 {
c.y = margin_top;
} else {
// 非首个图，而且未设置定位
y += self.gap;
c.y = y;
}
if position.is_none() {
c.x = c.x.max(margin_left);
}
// svg中会重新计算c.height
let svg = c.svg()?;
ChildChartResult {
Expand All @@ -278,6 +334,23 @@ impl MultiChart {
}
arr.push(result.svg);
}
x += self.margin.right;
y += self.margin.bottom;

if let Some(background_color) = self.background_color {
arr.insert(
0,
Rect {
fill: Some(background_color),
left: 0.0,
top: 0.0,
width: x,
height: y,
..Default::default()
}
.svg(),
);
}

Ok(generate_svg(x, y, 0.0, 0.0, arr.join("\n")))
}
Expand All @@ -294,6 +367,9 @@ mod tests {
#[test]
fn multi_chart() {
let mut charts = MultiChart::new();
charts.margin = (10.0).into();
charts.background_color = Some((31, 29, 29, 150).into());

let bar_chart = BarChart::new(
vec![
(
Expand Down

0 comments on commit c67ba60

Please sign in to comment.