From 1aa4c1b7bb0697a92b0e36403626f14ffa142dd1 Mon Sep 17 00:00:00 2001 From: Emilia Date: Tue, 13 Feb 2024 19:58:14 -0500 Subject: [PATCH] web: use new utility function in callback --- .../callbacks/import_csv_callbacks.rs | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/plate-tool-web/src/components/callbacks/import_csv_callbacks.rs b/plate-tool-web/src/components/callbacks/import_csv_callbacks.rs index 270d45b..6d6a08c 100644 --- a/plate-tool-web/src/components/callbacks/import_csv_callbacks.rs +++ b/plate-tool-web/src/components/callbacks/import_csv_callbacks.rs @@ -16,7 +16,7 @@ use plate_tool_lib::util::letters_to_num; use plate_tool_lib::transfer::Transfer; use plate_tool_lib::transfer_region::{Region, TransferRegion}; -use plate_tool_lib::csv::TransferRecord; +use plate_tool_lib::csv::{TransferRecord, string_well_to_pt}; use super::main_window_callbacks::create_close_button; @@ -229,28 +229,14 @@ pub fn import_transfer_csv_submit_callback( let from_dest = from_dest.value(); let to_dest = to_dest.value(); - lazy_static! { - static ref REGEX: Regex = Regex::new(r"([A-Z,a-z]+)(\d+)").unwrap(); - } let records: Vec<((u8, u8), (u8, u8))> = records .iter() .filter(|record| record.source_plate == from_source) .filter(|record| record.destination_plate == from_dest) .map(|record| { - let c1 = REGEX.captures(&record.source_well).unwrap(); - let c2 = REGEX.captures(&record.destination_well).unwrap(); - log::debug!("{} {}", &record.source_well, &record.destination_well); - log::debug!("{},{} {},{}", &c1[1], &c1[2], &c2[1], &c2[2]); - ( - ( - letters_to_num(&c1[1]).unwrap(), - c1[2].parse::().unwrap(), - ), - ( - letters_to_num(&c2[1]).unwrap(), - c2[2].parse::().unwrap(), - ), + string_well_to_pt(&record.source_well).unwrap(), + string_well_to_pt(&record.destination_well).unwrap() ) }) .collect();