Skip to content

Commit

Permalink
switch ANALOG:FORMAT to be removed from parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
cvhammond committed Jan 6, 2024
1 parent b273113 commit 5489f0b
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/analog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::ops::{Deref, DerefMut};
use crate::data::{get_analog_bytes_per_frame, get_point_bytes_per_frame, DataFormat};
use crate::parameters::{Parameter, ParameterData, Parameters};
use crate::processor::Processor;
use crate::{C3dWriteError, C3dParseError};
use crate::{C3dParseError, C3dWriteError};
use grid::Grid;

#[derive(Debug, Clone, PartialEq, Default)]
Expand All @@ -16,12 +16,14 @@ pub enum AnalogFormat {
}

impl AnalogFormat {
pub(crate) fn from_parameters(parameters: &Parameters) -> Result<AnalogFormat, C3dParseError> {
let analog_format_parameter_data = parameters.get("ANALOG", "FORMAT");
pub(crate) fn from_parameters(
parameters: &mut Parameters,
) -> Result<AnalogFormat, C3dParseError> {
let analog_format_parameter_data = parameters.remove("ANALOG", "FORMAT");
match analog_format_parameter_data {
Some(analog_format_parameter_data) => {
let analog_format_parameter_data: String =
analog_format_parameter_data.try_into()?;
analog_format_parameter_data.as_ref().try_into()?;
match analog_format_parameter_data.as_str() {
"SIGNED" => Ok(AnalogFormat::Signed),
"UNSIGNED" => Ok(AnalogFormat::Unsigned),
Expand Down

0 comments on commit 5489f0b

Please sign in to comment.