+4 -2

src/graphics/canvas.rs

Reviewed

··· 89 89 panic!("Layer {} already exists", name); 90 90 } 91 91 92 92 - self.layers.push(Layer::new(name)); 92 92 + let mut layer = Layer::new(name); 93 93 + layer.object_sizes = self.object_sizes; 94 94 + self.layers.push(layer); 93 95 self.layers.last_mut().unwrap() 94 96 } 95 97 ··· 208 210 object_sizes: ObjectSizes::default(), 209 211 font_options: FontOptions::default(), 210 212 colormap: ColorMapping::default(), 211 211 - layers: vec![], 213 213 + layers: vec![Layer::new("root")], 212 214 world_region: Region::new(0, 0, 3, 3).unwrap(), 213 215 background: None, 214 216 fontdb: None,

+8 -8

src/rendering/canvas.rs

Reviewed

··· 7 7 impl SVGRenderable for Canvas { 8 8 fn render_to_svg( 9 9 &self, 10 10 - _colormap: crate::ColorMapping, 11 11 - _cell_size: usize, 12 12 - _object_sizes: crate::graphics::objects::ObjectSizes, 10 10 + colormap: crate::ColorMapping, 11 11 + cell_size: usize, 12 12 + object_sizes: crate::graphics::objects::ObjectSizes, 13 13 _id: &str, 14 14 ) -> anyhow::Result<svg::node::element::Element> { 15 15 debug_time!("render_to_svg"); ··· 26 26 27 27 for layer in self.layers.iter().filter(|layer| !layer.hidden).rev() { 28 28 svg = svg.add(layer.render_to_svg( 29 29 - self.colormap.clone(), 30 30 - self.cell_size, 29 29 + colormap.clone(), 30 30 + cell_size, 31 31 layer.object_sizes, 32 32 "", 33 33 )?); ··· 36 36 let mut defs = svg::node::element::Definitions::new(); 37 37 for filter in self.unique_filters() { 38 38 defs = defs.add(filter.render_to_svg( 39 39 - self.colormap.clone(), 40 40 - self.cell_size, 41 41 - self.object_sizes, 39 39 + colormap.clone(), 40 40 + cell_size, 41 41 + object_sizes, 42 42 "", 43 43 )?); 44 44 }