From 688080723da6be2decc6c72db513851644136e4a Mon Sep 17 00:00:00 2001 From: Alan Race Date: Wed, 16 Nov 2022 17:28:16 +0100 Subject: [PATCH] Re-added ability to generate channel image --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/imc.rs | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91c61b0..18011fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -843,7 +843,7 @@ dependencies = [ [[package]] name = "biquinho" -version = "0.2.3" +version = "0.2.4" dependencies = [ "bevy", "bevy_egui", diff --git a/Cargo.toml b/Cargo.toml index a6c4f9e..0294dab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "biquinho" -version = "0.2.3" +version = "0.2.4" edition = "2021" description = "" diff --git a/src/imc.rs b/src/imc.rs index 72f06cc..17d6795 100644 --- a/src/imc.rs +++ b/src/imc.rs @@ -1191,8 +1191,16 @@ impl IMCDataset { let mut image_map = HashMap::new(); for acquisition in self.mcd.acquisitions() { - let data = acquisition.channel_image(identifier, None)?; - image_map.insert(acquisition.id(), ChannelImage(data)); + match acquisition.channel_image(identifier, None) { + Ok(data) => { + image_map.insert(acquisition.id(), ChannelImage(data)); + } + Err(MCDError::InvalidChannel { channel: _ }) => { + // This channel doesn't exist for this acquisition (can happen sometimes if the panel was changed), + // so we just ignore this error + } + Err(error) => return Err(error), + } } Ok(image_map)