Skip to content

Commit

Permalink
Allow to define outer radius
Browse files Browse the repository at this point in the history 
So we can create radial charts
  • Loading branch information
@aleics
aleics committed Sep 19, 2024
1 parent 08847ae commit ab2df9d
Show file tree
Hide file tree
Showing 9 changed files with 315 additions and 60 deletions.
27 changes: 20 additions & 7 deletions bruc-core/examples/svg-pie-chart.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,40 @@ async fn main() {
let specification = serde_json::from_str(
r#"{
"dimensions": {
"width": 500,
"height": 500
"width": 300,
"height": 300
},
"data": [
{
"name": "primary",
"values": [
{ "x": 0, "y": 10 },
{ "x": 1, "y": 50 },
{ "x": 2, "y": 15 },
{ "x": 3, "y": 30 }
{ "x": 0, "y": 10, "z": 30 },
{ "x": 1, "y": 50, "z": 10 },
{ "x": 2, "y": 15, "z": 18 },
{ "x": 3, "y": 30, "z": 20 }
],
"transform": [
{ "type": "map", "fn": "y * 10", "output": "value" }
]
}
],
"scales": [
{
"type": "linear",
"name": "outer",
"domain": { "data": "primary", "field": "z" },
"range": [60, 110]
}
],
"visual": {
"shapes": [
{
"from": "primary",
"type": "pie",
"properties": {
"value": { "field": "y" }
"value": { "field": "value" },
"innerRadius": 20,
"outerRadius": { "field": "z", "scale": "outer" }
}
}
]
Expand Down
174 changes: 147 additions & 27 deletions bruc-core/src/graph/node/shape.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,18 @@ impl Evaluation for BarOperator {
}

pub(crate) const PIE_VALUE_FIELD_NAME: &str = "__pie_value";
pub(crate) const PIE_OUTER_RADIUS_FIELD_NAME: &str = "__pie_outer_radius";

struct ArcDataValue {
value: f32,
outer_radius: Option<f32>,
}

struct ArcPosition {
start: f32,
end: f32,
outer_radius: Option<f32>,
}

#[derive(Debug, PartialEq)]
pub struct PieOperator {
Expand All @@ -183,53 +195,72 @@ impl PieOperator {
return Vec::new();
};

let angles = self.calculate_angles(values);
self.create_arcs(angles)
let positions = self.calculate_arc_positions(values);
self.create_arcs(positions)
}

fn calculate_angles(&self, values: &[DataValue]) -> Vec<(f32, f32)> {
let values: Vec<f32> = values
fn calculate_arc_positions(&self, values: &[DataValue]) -> Vec<ArcPosition> {
let arc_values: Vec<ArcDataValue> = values
.iter()
.filter_map(|value| value.get_number(&self.field).copied())
.filter_map(|value| {
let outer_radius = value.get_number(PIE_OUTER_RADIUS_FIELD_NAME).copied();

value
.get_number(&self.field)
.copied()
.map(|value| ArcDataValue {
value,
outer_radius,
})
})
.collect();

let total: f32 = values.iter().sum();
let total: f32 = arc_values.iter().map(|arc_value| arc_value.value).sum();

let mut angles: Vec<(f32, f32)> = Vec::with_capacity(values.len());
let mut angles: Vec<ArcPosition> = Vec::with_capacity(values.len());
let mut previous = 0.0;

let pad_angle = radians_to_degrees(self.shape.props.pad_angle);

for value in values {
let degree = (value / total) * 360.0;
for arc_value in arc_values {
let degree = (arc_value.value / total) * 360.0;

if degree > 0.0 {
let start = previous;
let end = start + degree;

angles.push((start + pad_angle, end - pad_angle));
angles.push(ArcPosition {
start: start + pad_angle,
end: end - pad_angle,
outer_radius: arc_value.outer_radius,
});
previous = end;
} else {
angles.push((previous, previous));
angles.push(ArcPosition {
start: previous,
end: previous,
outer_radius: arc_value.outer_radius,
});
}
}

angles
}

fn create_arcs(&self, angles: Vec<(f32, f32)>) -> Vec<SceneItem> {
fn create_arcs(&self, positions: Vec<ArcPosition>) -> Vec<SceneItem> {
let radius = self.window.width / 2.0;
let colors = super::color::generate_colors(angles.len());
let colors = super::color::generate_colors(positions.len());

angles
positions
.into_iter()
.enumerate()
.map(|(i, (start, end))| {
.map(|(i, position)| {
SceneItem::arc(
start,
end,
self.shape.props.inner_radius,
position.start,
position.end,
radius,
self.shape.props.inner_radius,
position.outer_radius,
colors[i].to_string(),
)
})
Expand All @@ -250,7 +281,9 @@ impl Evaluation for PieOperator {
#[cfg(test)]
mod tests {
use crate::data::DataValue;
use crate::graph::node::shape::{BarOperator, LineOperator, PieOperator, SceneWindow};
use crate::graph::node::shape::{
BarOperator, LineOperator, PieOperator, SceneWindow, PIE_OUTER_RADIUS_FIELD_NAME,
};
use crate::graph::{Evaluation, Pulse, SinglePulse};
use crate::scene::SceneItem;
use crate::spec::shape::bar::{BarPropertiesBuilder, BarShape};
Expand Down Expand Up @@ -358,10 +391,10 @@ mod tests {
assert_eq!(
result,
Pulse::shapes(vec![
SceneItem::arc(0.0, 0.0, 0.0, 10.0, "#1F77B4".to_string()),
SceneItem::arc(0.0, 36.0, 0.0, 10.0, "#FF7F0E".to_string()),
SceneItem::arc(36.0, 252.00002, 0.0, 10.0, "#2CA02C".to_string()),
SceneItem::arc(252.00002, 360.00003, 0.0, 10.0, "#D62728".to_string()),
SceneItem::arc(0.0, 0.0, 10.0, 0.0, None, "#1F77B4".to_string()),
SceneItem::arc(0.0, 36.0, 10.0, 0.0, None, "#FF7F0E".to_string()),
SceneItem::arc(36.0, 252.00002, 10.0, 0.0, None, "#2CA02C".to_string()),
SceneItem::arc(252.00002, 360.00003, 10.0, 0.0, None, "#D62728".to_string()),
])
)
}
Expand Down Expand Up @@ -390,10 +423,97 @@ mod tests {
assert_eq!(
result,
Pulse::shapes(vec![
SceneItem::arc(0.0, 0.0, 0.0, 10.0, "#1F77B4".to_string()),
SceneItem::arc(10.0, 26.0, 0.0, 10.0, "#FF7F0E".to_string()),
SceneItem::arc(46.0, 242.00002, 0.0, 10.0, "#2CA02C".to_string()),
SceneItem::arc(262.0, 350.00003, 0.0, 10.0, "#D62728".to_string()),
SceneItem::arc(0.0, 0.0, 10.0, 0.0, None, "#1F77B4".to_string()),
SceneItem::arc(10.0, 26.0, 10.0, 0.0, None, "#FF7F0E".to_string()),
SceneItem::arc(46.0, 242.00002, 10.0, 0.0, None, "#2CA02C".to_string()),
SceneItem::arc(262.0, 350.00003, 10.0, 0.0, None, "#D62728".to_string()),
])
)
}

#[tokio::test]
async fn computes_pie_with_inner_radius() {
let pulse = SinglePulse::Data(vec![
DataValue::from_pairs(vec![("x", 0.0.into()), ("y", 0.0.into())]),
DataValue::from_pairs(vec![("x", 1.0.into()), ("y", 1.0.into())]),
DataValue::from_pairs(vec![("x", 2.0.into()), ("y", 6.0.into())]),
DataValue::from_pairs(vec![("x", 3.0.into()), ("y", 3.0.into())]),
]);

let operator = PieOperator::new(
PieShape::new(
PiePropertiesBuilder::new(DataSource::field("y", None))
.with_inner_radius(2.0)
.build(),
),
"y",
SceneWindow::new(20, 2),
);

let result = operator.evaluate(Pulse::Single(pulse)).await;

assert_eq!(
result,
Pulse::shapes(vec![
SceneItem::arc(0.0, 0.0, 10.0, 2.0, None, "#1F77B4".to_string()),
SceneItem::arc(0.0, 36.0, 10.0, 2.0, None, "#FF7F0E".to_string()),
SceneItem::arc(36.0, 252.00002, 10.0, 2.0, None, "#2CA02C".to_string()),
SceneItem::arc(252.00002, 360.00003, 10.0, 2.0, None, "#D62728".to_string()),
])
)
}

#[tokio::test]
async fn computes_pie_with_outer_radius() {
let pulse = SinglePulse::Data(vec![
DataValue::from_pairs(vec![
("x", 0.0.into()),
("y", 0.0.into()),
(PIE_OUTER_RADIUS_FIELD_NAME, 2.0.into()),
]),
DataValue::from_pairs(vec![
("x", 1.0.into()),
("y", 1.0.into()),
(PIE_OUTER_RADIUS_FIELD_NAME, 2.0.into()),
]),
DataValue::from_pairs(vec![
("x", 2.0.into()),
("y", 6.0.into()),
(PIE_OUTER_RADIUS_FIELD_NAME, 2.0.into()),
]),
DataValue::from_pairs(vec![
("x", 3.0.into()),
("y", 3.0.into()),
(PIE_OUTER_RADIUS_FIELD_NAME, 2.0.into()),
]),
]);

let operator = PieOperator::new(
PieShape::new(
PiePropertiesBuilder::new(DataSource::field("y", None))
.with_outer_radius(DataSource::field("z", None))
.build(),
),
"y",
SceneWindow::new(20, 2),
);

let result = operator.evaluate(Pulse::Single(pulse)).await;

assert_eq!(
result,
Pulse::shapes(vec![
SceneItem::arc(0.0, 0.0, 10.0, 0.0, Some(2.0), "#1F77B4".to_string()),
SceneItem::arc(0.0, 36.0, 10.0, 0.0, Some(2.0), "#FF7F0E".to_string()),
SceneItem::arc(36.0, 252.00002, 10.0, 0.0, Some(2.0), "#2CA02C".to_string()),
SceneItem::arc(
252.00002,
360.00003,
10.0,
0.0,
Some(2.0),
"#D62728".to_string()
),
])
)
}
Expand Down
2 changes: 1 addition & 1 deletion bruc-core/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ mod tests {
// then
assert_eq!(
content.unwrap(),
"Scenegraph { root: SceneRoot { items: [Group(SceneGroup { items: [Arc(SceneArc { start_angle: 5.729578, end_angle: 152.67041, outer_radius: 750.0, inner_radius: 50.0, fill: \"#1F77B4\" }), Arc(SceneArc { start_angle: 164.12958, end_angle: 224.67041, outer_radius: 750.0, inner_radius: 50.0, fill: \"#FF7F0E\" }), Arc(SceneArc { start_angle: 236.12958, end_angle: 325.47043, outer_radius: 750.0, inner_radius: 50.0, fill: \"#2CA02C\" }), Arc(SceneArc { start_angle: 336.9296, end_angle: 354.27042, outer_radius: 750.0, inner_radius: 50.0, fill: \"#D62728\" })] })], dimensions: SceneDimensions { width: 1500, height: 300 } } }"
"Scenegraph { root: SceneRoot { items: [Group(SceneGroup { items: [Arc(SceneArc { start_angle: 5.729578, end_angle: 152.67041, radius: 750.0, outer_radius: None, inner_radius: 50.0, fill: \"#1F77B4\" }), Arc(SceneArc { start_angle: 164.12958, end_angle: 224.67041, radius: 750.0, outer_radius: None, inner_radius: 50.0, fill: \"#FF7F0E\" }), Arc(SceneArc { start_angle: 236.12958, end_angle: 325.47043, radius: 750.0, outer_radius: None, inner_radius: 50.0, fill: \"#2CA02C\" }), Arc(SceneArc { start_angle: 336.9296, end_angle: 354.27042, radius: 750.0, outer_radius: None, inner_radius: 50.0, fill: \"#D62728\" })] })], dimensions: SceneDimensions { width: 1500, height: 300 } } }"
)
}

Expand Down
17 changes: 16 additions & 1 deletion bruc-core/src/parser/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::collections::HashMap;
use bruc_expression::data::DataItem;

use crate::data::DataValue;
use crate::graph::node::shape::{SceneWindow, PIE_VALUE_FIELD_NAME};
use crate::graph::node::shape::{SceneWindow, PIE_OUTER_RADIUS_FIELD_NAME, PIE_VALUE_FIELD_NAME};
use crate::spec::axis::Axis;
use crate::spec::scale::band::BandScale;
use crate::spec::scale::linear::LinearScale;
Expand Down Expand Up @@ -173,6 +173,17 @@ impl Visitor {
DataSource::ValueSource(value) => self.visit_value_source(&field, value, data_node, result),
};

let mut scale_nodes = Vec::new();

if let Some(outer_radius) = pie.props.outer_radius.as_ref() {
scale_nodes.push(self.visit_data_source(
outer_radius,
PIE_OUTER_RADIUS_FIELD_NAME,
data_node,
result,
));
};

let node = result.graph.add_node(Operator::pie(
pie,
&field,
Expand All @@ -181,6 +192,10 @@ impl Visitor {

result.collection.shapes.push(node);
result.graph.add_edge(data_node, node);

for scale_node in scale_nodes {
result.graph.add_edge(scale_node, node);
}
}

fn visit_shape_props(
Expand Down
Loading

0 comments on commit ab2df9d

Please sign in to comment.