changed inputs for second section and implemented Clone and Copy traits for Alignment data structure

This commit is contained in:
2024-04-14 20:13:15 +04:00
parent 5687d6773a
commit 48057646a8
11 changed files with 399 additions and 433 deletions

View File

@@ -1,29 +1,18 @@
use gtk4 as gtk;
use crate::{
model::model::*,
view::{
properties::*,
components::{
*,
switch::*,
wrapper::*,
}
},
controller::{
controller::*,
event_handlers::{button_event_handlers::*, switch_event_handlers::*},
view_utils::input_utils::*,
event_handlers::{
button_event_handlers::*,
switch_event_handlers::*,
},
}
},
model::model::*,
view::{components::wrapper::*, properties::*},
};
use gtk::{*, prelude::*};
pub fn hamming_code_page(wrapper: &Box) -> (){
use gtk::{prelude::*, *};
pub fn hamming_code_page(wrapper: &Box) -> () {
// input
let hamming_text_view_input_label = Label::builder()
@@ -67,11 +56,10 @@ pub fn hamming_code_page(wrapper: &Box) -> (){
// interactive panel
let clear_input_button =
Button::builder()
.set_align(Alignment::new(Align::Fill, Align::Fill))
.label("Очистка полей")
.build();
let clear_input_button = Button::builder()
.set_align(Alignment::new(Align::Fill, Align::Fill))
.label("Очистка полей")
.build();
let hamming_crypt_button = Button::builder()
.set_align(Alignment::new(Align::Fill, Align::Fill))
@@ -80,9 +68,7 @@ pub fn hamming_code_page(wrapper: &Box) -> (){
let crypt_mode_switch = Switch::new();
let crypt_mode_label = Label::builder()
.label("Режим: кодирование")
.build();
let crypt_mode_label = Label::builder().label("Режим: кодирование").build();
// references for binding actions
@@ -99,28 +85,27 @@ pub fn hamming_code_page(wrapper: &Box) -> (){
// actions
EventHandler::new(
clear_input_button_to_handle,
move |_| {
clearing(&text_view_input_for_clearing, &text_view_output_for_clearing);
}
).on_click();
EventHandler::new(clear_input_button_to_handle, move |_| {
clearing(
&text_view_input_for_clearing,
&text_view_output_for_clearing,
);
})
.on_click();
EventHandler::new(
hamming_crypt_button.clone(),
move |button: &Button| {
parse_input(
&text_view_input_for_parse,
&text_view_output_for_output,
crypt_mode_switch_to_handle.state()
)
}).on_click();
EventHandler::new(hamming_crypt_button.clone(), move |_button: &Button| {
parse_input(
&text_view_input_for_parse,
&text_view_output_for_output,
crypt_mode_switch_to_handle.state(),
)
})
.on_click();
EventHandler::new(
crypt_mode_switch.clone(),
move |s : &Switch| {
state_controller(s, &crypt_mode_label_to_handle);
}).on_toggle();
EventHandler::new(crypt_mode_switch.clone(), move |s: &Switch| {
state_controller(s, &crypt_mode_label_to_handle);
})
.on_toggle();
// wrappers
@@ -148,5 +133,4 @@ pub fn hamming_code_page(wrapper: &Box) -> (){
wrapper.append(&interactive_components_wrapper);
wrapper.append(&hamming_text_view_output_label);
wrapper.append(&hamming_text_view_output_frame);
}
}

View File

@@ -1,78 +1,107 @@
use gtk4 as gtk;
use gtk::{*, prelude::*};
use crate::model::builder_traits::Product;
use crate::view::{
properties::*,
components::{
wrapper::*,
input::Input,
use crate::{
model::builder_traits::Product,
view::{
components::{input::Input, wrapper::Wrapper},
properties::*,
},
};
use gtk::{prelude::*, Align, WrapMode, *};
pub fn signal_reducing_page(wrapper: &Box) {
let (input_height, monospace, input_alignment, input_wrapping): (i32, bool, Align, WrapMode) =
(24, true, Align::Fill, WrapMode::Word);
let inputs_first_line = Box::new(Orientation::Horizontal, 5);
inputs_first_line.set_valign(Align::Fill);
let input_height : i32 = 20;
let input_label_alignment = Alignment {
horizontal: Align::Start,
vertical: Align::Fill,
};
let wire_length_input = Input::builder()
.set_label("Длина провода (L = [м]):")
.set_align(Align::Fill)
.set_label("l, м:")
.set_margins(MarginData::EqualsMargin(5))
.build(true, WrapMode::Word, input_height)
.set_align(input_label_alignment)
.build(monospace, input_wrapping, input_height)
.get();
let resistance_input = Input::builder()
.set_label("Сопротивление (Rм = [Ом * м]):")
.set_align(Align::Fill)
wire_length_input.set_halign(input_alignment);
wire_length_input.set_hexpand(true);
let resistance_per_meter_input = Input::builder()
.set_label("Rм, Ом:")
.set_margins(MarginData::EqualsMargin(5))
.build(true, WrapMode::Word, input_height)
.set_align(input_label_alignment)
.build(monospace, input_wrapping, input_height)
.get();
let capacity_input = Input::builder()
.set_label("Ёмкость (Cм = [пФ * м]):")
.set_align(Align::Fill)
resistance_per_meter_input.set_halign(input_alignment);
resistance_per_meter_input.set_hexpand(true);
let capacity_per_meter_input = Input::builder()
.set_label("Cм, пФ:")
.set_margins(MarginData::EqualsMargin(5))
.build(true, WrapMode::Word, input_height)
.set_align(input_label_alignment)
.build(monospace, input_wrapping, input_height)
.get();
let inputs_second_line = Box::new(Orientation::Horizontal, 5);
capacity_per_meter_input.set_halign(input_alignment);
capacity_per_meter_input.set_hexpand(true);
inputs_second_line.set_valign(Align::Fill);
let wrapper_first_row = Wrapper::col_builder()
.halign(Align::Fill)
.hexpand(true)
.spacing(5)
.build();
let voltage_input = Input::builder()
.set_label("Напряжение (Vи = [мВ]):")
.set_align(Align::Fill)
wrapper_first_row.append(&wire_length_input);
wrapper_first_row.append(&resistance_per_meter_input);
wrapper_first_row.append(&capacity_per_meter_input);
let info_signal_voltage_input = Input::builder()
.set_label("Vи, мВ:")
.set_margins(MarginData::EqualsMargin(5))
.build(true, WrapMode::Word, input_height)
.set_align(input_label_alignment)
.build(monospace, input_wrapping, input_height)
.get();
let source_implicit_resistance_input = Input::builder()
.set_label("Сопротивление источника (R = [Ом]):")
.set_align(Align::Fill)
info_signal_voltage_input.set_halign(input_alignment);
info_signal_voltage_input.set_hexpand(true);
let resistance_of_info_voltage_source_input = Input::builder()
.set_label("Rи, Ом:")
.set_margins(MarginData::EqualsMargin(5))
.build(true, WrapMode::Word, input_height)
.set_align(input_label_alignment)
.build(monospace, input_wrapping, input_height)
.get();
let freq_input = Input::builder()
.set_label("Частота (f = [МГц]):")
.set_align(Align::Fill)
resistance_of_info_voltage_source_input.set_halign(input_alignment);
resistance_of_info_voltage_source_input.set_hexpand(true);
let info_voltage_source_frequency_input = Input::builder()
.set_label("f, мГц:")
.set_margins(MarginData::EqualsMargin(5))
.build(true, WrapMode::Word, input_height)
.set_align(input_label_alignment)
.build(monospace, input_wrapping, input_height)
.get();
info_voltage_source_frequency_input.set_halign(input_alignment);
info_voltage_source_frequency_input.set_hexpand(true);
inputs_first_line.append(&wire_length_input);
inputs_first_line.append(&resistance_input);
inputs_first_line.append(&capacity_input);
inputs_second_line.append(&voltage_input);
inputs_second_line.append(&source_implicit_resistance_input);
inputs_second_line.append(&freq_input);
let wrapper_second_row = Wrapper::col_builder()
.halign(Align::Fill)
.hexpand(true)
.spacing(5)
.build();
wrapper.append(&inputs_first_line);
wrapper.append(&inputs_second_line);
wrapper_second_row.append(&info_signal_voltage_input);
wrapper_second_row.append(&resistance_of_info_voltage_source_input);
wrapper_second_row.append(&info_voltage_source_frequency_input);
}
let main_wpapper = Wrapper::row_builder().spacing(5).build();
main_wpapper.append(&wrapper_first_row);
main_wpapper.append(&wrapper_second_row);
wrapper.append(&main_wpapper);
}