aleleba/gridcraft
1
0
Fork 0
mirror of https://github.com/storytold/gridcraft.git synced 2026-11-02 16:30:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #158 from nihilist-narwhal/fix-chart-kinds-combo-stock

Browse Source 
Charts: combo and stock charts keep their kind in XLSX
This commit is contained in:
Brandon Thomas
2026-10-10 15:47:11 -04:00
parent 1e5edbd43c 925bf22e24
commit 84a414a705
2 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/tests.rs
+41
View File
@@ -959,6 +959,47 @@ fn every_command_survives_empty_params() {
}
}
fn reopen(s: &mut Session) {
let r = s.execute("file.saveBytes", json!({"format": "xlsx"})).unwrap();
let b64 = r["base64"].as_str().unwrap().to_string();
s.execute("file.open", json!({"name": "x.xlsx", "base64": b64})).unwrap();
}
fn chart_data(s: &mut Session) {
s.execute(
"range.setValues",
json!({"range": "A1", "values": [["", "Open", "High", "Low", "Close"], ["Mon", 10, 14, 9, 12], ["Tue", 12, 15, 11, 14], ["Wed", 14, 16, 10, 11], ["Thu", 11, 13, 8, 9], ["Fri", 9, 12, 7, 11], ["Sat", 11, 15, 10, 14]]}),
)
.unwrap();
}
#[test]
fn every_chart_kind_survives_xlsx() {
use gridcraft_model::ChartKind;
let kinds = [
("combo", ChartKind::Combo),
("stock", ChartKind::Stock),
("column", ChartKind::ColumnClustered),
("line", ChartKind::Line),
("scatter", ChartKind::Scatter),
];
for (t, kind) in kinds {
let mut s = s();
chart_data(&mut s);
s.execute("insert.chart", json!({"type": t, "range": "A1:E7", "title": "Week"})).unwrap();
let before = s.doc().unwrap().wb.active().unwrap().charts[0].clone();
assert_eq!(before.kind, kind);
reopen(&mut s);
let after = &s.doc().unwrap().wb.active().unwrap().charts[0];
assert_eq!(after.kind, kind, "{t}");
assert_eq!(after.title.as_deref(), Some("Week"), "{t}");
assert_eq!(after.series.len(), before.series.len(), "{t}");
for (a, b) in after.series.iter().zip(&before.series) {
assert_eq!((&a.name, &a.categories, &a.values), (&b.name, &b.categories, &b.values), "{t}");
}
}
}
#[test]
fn whole_sheet_selection_stays_within_the_data() {
// On an empty sheet with everything selected these filled or scanned every cell of the
crates/xlsx/src/chart.rs
+16 -7
View File
@@ -199,6 +199,7 @@ enum G {
Scatter { lines: bool },
Bubble,
Radar,
Stock,
}
fn group_for(k: ChartKind) -> G {
@@ -219,7 +220,8 @@ fn group_for(k: ChartKind) -> G {
ChartKind::ScatterLines => G::Scatter { lines: true },
ChartKind::Bubble => G::Bubble,
ChartKind::Radar => G::Radar,
// Kinds without a classic chart element are written as clustered columns.
ChartKind::Stock => G::Stock,
// Combo charts start from clustered columns; chartex kinds have their own part.
_ => G::Bar { bar: false, grouping: "clustered" },
}
}
@@ -227,7 +229,7 @@ fn group_for(k: ChartKind) -> G {
const MAX_CACHE: u64 = 100_000;
/// Values of a same-workbook reference (`Sheet1!$B$2:$B$9`), row-major.
fn ref_values(wb: &Workbook, sheet_idx: usize, f: &str) -> Option<Vec<Value>> {
pub(crate) fn ref_values(wb: &Workbook, sheet_idx: usize, f: &str) -> Option<Vec<Value>> {
let e = gridcraft_formula::parse(f).ok()?;
let Expr::Ref(r) = e else { return None };
let si = match &r.sheet {
@@ -331,12 +333,12 @@ fn series_xml(s: &Series, idx: usize, g: G, wb: &Workbook, si: usize) -> String
(Some(c), false) => {
let _ = write!(x, "<c:spPr><a:solidFill>{c}</a:solidFill></c:spPr>");
}
(None, _) if g == (G::Scatter { lines: false }) => x.push_str("<c:spPr><a:ln w=\"19050\"><a:noFill/></a:ln></c:spPr>"),
(None, _) if g == (G::Scatter { lines: false }) || g == G::Stock => x.push_str("<c:spPr><a:ln w=\"19050\"><a:noFill/></a:ln></c:spPr>"),
_ => {}
}
match g {
G::Bar { .. } => x.push_str("<c:invertIfNegative val=\"0\"/>"),
G::Line { markers: false, .. } | G::Scatter { lines: true } => x.push_str("<c:marker><c:symbol val=\"none\"/></c:marker>"),
G::Line { markers: false, .. } | G::Scatter { lines: true } | G::Stock => x.push_str("<c:marker><c:symbol val=\"none\"/></c:marker>"),
G::Bubble => x.push_str("<c:invertIfNegative val=\"0\"/>"),
_ => {}
}
@@ -403,6 +405,7 @@ fn group_xml(g: G, series: &[(usize, &Series)], ch: &Chart, axes: (u32, u32), wb
format!("<c:bubbleChart><c:varyColors val=\"0\"/>{sers}{dl}<c:bubbleScale val=\"100\"/><c:showNegBubbles val=\"0\"/>{ax}</c:bubbleChart>")
}
G::Radar => format!("<c:radarChart><c:radarStyle val=\"marker\"/><c:varyColors val=\"0\"/>{sers}{dl}{ax}</c:radarChart>"),
G::Stock => format!("<c:stockChart>{sers}{dl}<c:hiLowLines/>{ax}</c:stockChart>"),
}
}
@@ -475,9 +478,11 @@ pub fn write_chart(wb: &Workbook, si: usize, ch: &Chart) -> String {
let primary_g;
let mut secondary: Option<G> = None;
if ch.kind == ChartKind::Combo {
// Series without a kind of their own: the first is a column, the others lines (as drawn).
let kind = |i: usize, x: &Series| x.kind.filter(|k| *k != ChartKind::Combo).or((i > 0).then_some(ChartKind::Line));
let is_line = |k: Option<ChartKind>| matches!(k.map(group_for), Some(G::Line { .. } | G::Area { .. } | G::Radar | G::Scatter { .. }));
let bars: Vec<(usize, &Series)> = all.iter().filter(|(_, x)| !x.secondary && !is_line(x.kind)).copied().collect();
let lines: Vec<(usize, &Series)> = all.iter().filter(|(_, x)| !x.secondary && is_line(x.kind)).copied().collect();
let bars: Vec<(usize, &Series)> = all.iter().filter(|(i, x)| !x.secondary && !is_line(kind(*i, x))).copied().collect();
let lines: Vec<(usize, &Series)> = all.iter().filter(|(i, x)| !x.secondary && is_line(kind(*i, x))).copied().collect();
let sec: Vec<(usize, &Series)> = all.iter().filter(|(_, x)| x.secondary).copied().collect();
primary_g = G::Bar { bar: false, grouping: "clustered" };
if !bars.is_empty() || (lines.is_empty() && sec.is_empty()) {
@@ -495,7 +500,11 @@ pub fn write_chart(wb: &Workbook, si: usize, ch: &Chart) -> String {
secondary = Some(g);
}
} else {
primary_g = group_for(ch.kind);
primary_g = match group_for(ch.kind) {
// A stock chart has 3 or 4 series (high-low-close, open-high-low-close).
G::Stock if !(3..=4).contains(&ch.series.len()) => G::Line { stacked: false, markers: false },
g => g,
};
s.push_str(&group_xml(primary_g, &all, ch, (1, 2), wb, si));
}
match primary_g {