merge stable version #2

Merged
doryan merged 97 commits from experimental into main 2024-08-28 18:54:00 +03:00
Showing only changes of commit ddff777d58 - Show all commits

View File

@ -124,18 +124,20 @@ pub fn signal_reducing_page(wrapper: &Box) {
result_table, result_table,
move |_| match parse_fields(all_inputs.clone()) { move |_| match parse_fields(all_inputs.clone()) {
Ok(results) => { Ok(results) => {
if values.get() == results {
info_bar.set_text_label(Some("Эти данные уже были введены."));
info_bar.show_infobar(5u64);
} else {
values.set(results); values.set(results);
let new_elem = Frequency::new(values.get().frequency); let new_elem = Frequency::new(values.get().frequency);
let exist_elem_pos = find_by_frequency_value(&model, &new_elem); let exist_elem_pos = find_by_frequency_value(&model, &new_elem);
if exist_elem_pos.is_some() { if exist_elem_pos.is_none() {
info_bar.set_text_label(Some("Данная частота уже была задана."));
info_bar.show_infobar(5u64);
} else {
model.append(&new_elem); model.append(&new_elem);
update_column_view(&result_table) }
update_column_view(&result_table);
} }
} }
Err(error) => { Err(error) => {