From 11ba24d7ed6552ae2b0cf697fed0704e8337d27a Mon Sep 17 00:00:00 2001 From: doryan Date: Thu, 15 Aug 2024 23:23:12 +0400 Subject: [PATCH] refactor(parse_field): rewrite fields parser util Field parser has been rewritten as the signal reduce page uses a Entry inputs instead TextView. --- .../view_utils/signal_reduce_input_utils.rs | 28 ------------------- .../view_utils/signal_reduce_utils.rs | 19 +++++++++++++ 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/src/controller/view_utils/signal_reduce_input_utils.rs b/src/controller/view_utils/signal_reduce_input_utils.rs index 6ace985..e69de29 100644 --- a/src/controller/view_utils/signal_reduce_input_utils.rs +++ b/src/controller/view_utils/signal_reduce_input_utils.rs @@ -1,28 +0,0 @@ - -pub fn parse_fields(all_inputs: Vec) -> Result { - let mut values: [f64; 6] = [0.0; 6]; - - for (i, input) in all_inputs.iter().enumerate() { - let input_text_buffer: TextBuffer = input.clone().get_input().buffer(); - let extracted_value = f64::from_str( - input_text_buffer - .text( - &input_text_buffer.start_iter(), - &input_text_buffer.end_iter(), - false, - ) - .as_str() - .trim(), - )?; - values[i] = extracted_value; - } - - Ok(SignalReduce { - length: values[0], - wire_resistance: values[1], - wire_capacity: values[2], - source_resistance: values[3], - source_voltage: values[4], - frequency: values[5], - }) -} diff --git a/src/controller/view_utils/signal_reduce_utils.rs b/src/controller/view_utils/signal_reduce_utils.rs index 7c9c02b..dfe91c1 100644 --- a/src/controller/view_utils/signal_reduce_utils.rs +++ b/src/controller/view_utils/signal_reduce_utils.rs @@ -21,3 +21,22 @@ pub fn get_error_message(error: Error) -> Option<&'static str> { } } +pub fn parse_fields(all_inputs: Vec>) -> Result { + let mut values: [f64; 6] = [0.0; 6]; + + for (i, input) in all_inputs.iter().enumerate() { + let input_text_buffer = input.get_input(); + let extracted_value = f64::from_str(input_text_buffer.text().as_str().trim())?; + values[i] = extracted_value; + } + + Ok(SignalReduce { + length: values[0], + wire_resistance: values[1], + wire_capacity: values[2], + source_resistance: values[3], + source_voltage: values[4], + frequency: values[5], + }) +} +