aleleba/deckcraft
1
0
Fork 0
mirror of https://github.com/storytold/deckcraft.git synced 2026-10-30 21:47:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1469

Browse Source 
Charts: hidden axis labels and unfilled gridlines are read from the chart XML (refs #1366)
This commit is contained in:
Brandon Thomas
2026-10-30 15:48:45 -04:00
parent 2153f8ac4d 5896859440
commit e713bccefd
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/pptx/src/read/chart.rs
+27 -3
View File
@@ -360,7 +360,11 @@ fn read_axes<'a>(c: &mut Chart, pa: &'a El, primary_val: &Option<String>) -> (Op
Some(n) if n.attr("sourceLinked") != Some("1") => n.attr("formatCode").map(str::to_string),
n => source_format(a).or_else(|| n.and_then(|n| n.attr("formatCode")).map(str::to_string)),
};
let deleted = |a: &El| a.child("delete").and_then(|d| d.bool("val")) == Some(true);
// `c:tickLblPos val="none"` hides the labels just as `c:delete` does.
let deleted = |a: &El| a.child("delete").and_then(|d| d.bool("val")) == Some(true) || a.child_val("tickLblPos") == Some("none");
// A gridline whose `c:spPr/a:ln` has `a:noFill` is not drawn, though the element is there.
let grid =
|a: &El, k: &str| a.child(k).is_some_and(|g| !g.child("spPr").and_then(|p| p.child("ln")).is_some_and(|l| l.child("noFill").is_some()));
if c.kind == ChartType::Combo && c.series.iter().any(|s| s.secondary_axis) {
let primary_id = val_ax.and_then(|a| a.child_val("axId"));
// The other vertical value axis is the secondary one.
@@ -375,8 +379,8 @@ fn read_axes<'a>(c: &mut Chart, pa: &'a El, primary_val: &Option<String>) -> (Op
}
let cat_ax = pa.child("catAx").or_else(|| pa.child("dateAx")).or_else(|| pa.children_named("valAx").find(|a| !vertical(a)));
if let Some(v) = val_ax {
c.gridlines = v.child("majorGridlines").is_some();
c.minor_gridlines = v.child("minorGridlines").is_some();
c.gridlines = grid(v, "majorGridlines");
c.minor_gridlines = grid(v, "minorGridlines");
let sc = v.child("scaling");
c.y_min = sc.and_then(|s| s.child_val("min")).and_then(|v| v.parse().ok()).filter(|v: &f64| v.is_finite());
c.y_max = sc.and_then(|s| s.child_val("max")).and_then(|v| v.parse().ok()).filter(|v: &f64| v.is_finite());
@@ -769,6 +773,26 @@ mod tests {
assert_eq!(read_chart_xml(xml.as_bytes()).unwrap().text_size, None, "no sizes: the renderer picks one");
}
#[test]
fn hidden_labels_and_unfilled_gridlines_are_read() {
let xml = |ax: &str| {
format!(
r#"<c:chartSpace xmlns:c="{NS_C}" xmlns:a="{NS_A}"><c:chart><c:plotArea><c:barChart><c:barDir val="col"/><c:axId val="1"/><c:axId val="2"/></c:barChart><c:catAx><c:axId val="1"/></c:catAx><c:valAx><c:axId val="2"/>{ax}</c:valAx></c:plotArea></c:chart></c:chartSpace>"#
)
};
let no_fill = r#"<c:spPr><a:ln w="9525"><a:noFill/></a:ln></c:spPr>"#;
let c = read_chart_xml(xml(r#"<c:majorGridlines/><c:minorGridlines/><c:tickLblPos val="nextTo"/>"#).as_bytes()).unwrap();
assert!(c.gridlines && c.minor_gridlines && !c.y_hidden);
let c = read_chart_xml(
xml(&format!(
r#"<c:majorGridlines>{no_fill}</c:majorGridlines><c:minorGridlines>{no_fill}</c:minorGridlines><c:tickLblPos val="none"/>"#
))
.as_bytes(),
)
.unwrap();
assert!(!c.gridlines && !c.minor_gridlines && c.y_hidden);
}
#[test]
fn trendlines_are_read() {
let xml = br#"<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart><c:plotArea><c:lineChart><c:grouping val="standard"/><c:ser><c:idx val="0"/><c:tx><c:v>Spend</c:v></c:tx>