From: Ben Pfaff Date: Fri, 2 Jan 2026 04:31:15 +0000 (-0800) Subject: cleanup X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aba9b4a535ca9dce55ae45fcbd2817b19fdd2bb;p=pspp cleanup --- diff --git a/rust/pspp/src/spv/read/legacy_xml.rs b/rust/pspp/src/spv/read/legacy_xml.rs index e45dd21c88..28a3274df6 100644 --- a/rust/pspp/src/spv/read/legacy_xml.rs +++ b/rust/pspp/src/spv/read/legacy_xml.rs @@ -371,8 +371,7 @@ impl Visualization { axes: &HashMap, styles: &HashMap<&str, &Style>, a: Axis3, - rotate_inner_column_labels: &mut bool, - rotate_outer_row_labels: &mut bool, + footnotes: &pivot::Footnotes, dims: &mut Vec>, ) { @@ -397,16 +396,6 @@ impl Visualization { (false, None, None, None) }; - if let Some(axis) = axes.get(&base_level) - && axis.major_ticks.label_angle == -90.0 - { - if a == Axis3::X { - *rotate_inner_column_labels = true; - } else { - *rotate_outer_row_labels = true; - } - } - let hide_all_labels = if let Some(axis) = axes.get(&base_level) && let Some(style) = axis.major_ticks.style.get(styles) && style.visible == Some(false) @@ -534,8 +523,6 @@ impl Visualization { axes: &HashMap, styles: &HashMap<&str, &Style>, a: Axis3, - rotate_inner_column_labels: &mut bool, - rotate_outer_row_labels: &mut bool, footnotes: &pivot::Footnotes, level_ofs: usize, dims: &mut Vec>, @@ -557,31 +544,13 @@ impl Visualization { dim_vars.push((var, level)); } else if !dim_vars.is_empty() { categorical_vars.push(dim_vars[0].0); - decode_dimension( - &dim_vars, - axes, - styles, - a, - rotate_inner_column_labels, - rotate_outer_row_labels, - footnotes, - dims, - ); + decode_dimension(&dim_vars, axes, styles, a, footnotes, dims); dim_vars.clear(); } } if !dim_vars.is_empty() { categorical_vars.push(&dim_vars[0].0); - decode_dimension( - &dim_vars, - axes, - styles, - a, - rotate_inner_column_labels, - rotate_outer_row_labels, - footnotes, - dims, - ); + decode_dimension(&dim_vars, axes, styles, a, footnotes, dims); } categorical_vars } @@ -592,8 +561,6 @@ impl Visualization { coordinate: &'a Series, } - let mut rotate_inner_column_labels = false; - let mut rotate_outer_row_labels = false; let cross = &graph.faceting.cross(); let columns = cross .first() @@ -606,8 +573,6 @@ impl Visualization { &axes, &styles, Axis3::X, - &mut rotate_inner_column_labels, - &mut rotate_outer_row_labels, &footnotes, 1, &mut dims, @@ -622,8 +587,6 @@ impl Visualization { &axes, &styles, Axis3::Y, - &mut rotate_inner_column_labels, - &mut rotate_outer_row_labels, &footnotes, 1 + columns.len(), &mut dims, @@ -635,8 +598,6 @@ impl Visualization { &axes, &styles, Axis3::Z, - &mut rotate_inner_column_labels, - &mut rotate_outer_row_labels, &footnotes, columns.len() + rows.len() + 1, &mut dims, @@ -2145,9 +2106,6 @@ struct Axis { #[derive(Deserialize, Debug)] #[serde(rename_all = "camelCase")] struct MajorTicks { - #[serde(rename = "@labelAngle")] - label_angle: f64, - #[serde(rename = "@style")] style: Ref