merge stable version #2

Merged
doryan merged 97 commits from experimental into main 2024-08-28 18:54:00 +03:00
6 changed files with 32 additions and 17 deletions
Showing only changes of commit 4e872ddcff - Show all commits

View File

@ -2,7 +2,7 @@ use std::collections::HashMap;
use std::sync::LazyLock;
use crate::{
controller::view_utils::{hamming_code_input_utils::*, input_utils::*},
controller::view_utils::{hamming_code_utils::*, input_utils::*},
model::{models::*, Result},
};

View File

@ -0,0 +1,8 @@
use gtk4 as gtk;
use crate::{
model::{models::*, Result},
model_utils::hamming_code_seven_four::*,
};
use gtk::{prelude::*, *};

View File

@ -1,4 +1,3 @@
pub mod hamming_code_input_utils;
pub mod hamming_code_utils;
pub mod input_utils;
pub mod signal_reduce_input_utils;
pub mod signal_reduce_utils;

View File

@ -0,0 +1,14 @@
use gtk4 as gtk;
use std::str::FromStr;
use crate::{
model::{models::SignalReduce, Error, Frequency, Result},
model_utils::signal_reducer::*,
view::components::input::Input,
};
use gtk::{
prelude::{Cast, CastNone, EditableExt, ListItemExt, ObjectExt, WidgetExt},
ColumnView, Entry, Label, ListItem, SignalListItemFactory,
};

View File

@ -6,7 +6,7 @@ use crate::{
components::{info_bar::InfoBar, input::Input, wrapper::*},
properties::*,
},
view_utils::{hamming_code_input_utils::start_hamming_algorithm, input_utils::clearing},
view_utils::{hamming_code_utils::start_hamming_algorithm, input_utils::clearing},
};
use gtk::{glib::clone, prelude::*, *};

View File

@ -1,31 +1,25 @@
use std::cell::Cell;
use std::rc::Rc;
use std::{cell::Cell, rc::Rc};
use crate::{
model::{builder_traits::Product, models::SignalReduce, Frequency},
model_utils::signal_reducer::{
coef_of_signal_reduce, full_resistance_of_capacitor, reactive_resistance_of_capacitor,
voltage_from_signal_source,
},
model_utils::signal_reducer::{find_by_frequency_value, set_default_values},
view::{
components::{info_bar::InfoBar, input::Input},
properties::*,
},
view_utils::signal_reduce_input_utils::{get_error_message, parse_fields},
view_utils::signal_reduce_utils::*,
};
use glib::clone;
extern crate gio;
use gio::ListStore;
use gtk::{
prelude::{BoxExt, ButtonExt, Cast, CastNone, GridExt, ListItemExt, SorterExt},
Align, WrapMode, *,
prelude::{BoxExt, ButtonExt, Cast, GridExt, SorterExt},
Align, *,
};
use gtk4 as gtk;
use prelude::ListModelExt;
pub fn signal_reducing_page(wrapper: &Box) {
let values = Rc::new(Cell::new(SignalReduce::default()));