[app, complex] Подписался на изменения состояние шага мельницы

И пока что шаг только отображается в статусной строке.
alex13sh · Oct 22, 2021 · e481486 · e481486
1 parent 15b65ef
commit e481486
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/meln_logic/src/structs_2/meln.rs b/meln_logic/src/structs_2/meln.rs
@@ -98,6 +98,7 @@ pub mod watcher {
                 }
             };
             let f_step = async {
+                self.step.send(self.step.get());
                 loop {
                     let next_step = self.step.get()
                         .check_next_step(self).await;

diff --git a/meln_logic/src/structs_2/mod.rs b/meln_logic/src/structs_2/mod.rs
@@ -58,7 +58,7 @@ pub mod values {
 
 pub mod watcher {
     use super::*;
-    pub use meln::watcher::Meln;
+    pub use meln::watcher::{Meln, MelnStep};
     pub use half_meln::watcher::HalfMeln;
     pub use dozator::watcher::Dozator;
     pub use oil_station::watcher::OilStation;

diff --git a/src/app_complex_simple_ui.rs b/src/app_complex_simple_ui.rs
@@ -73,7 +73,7 @@ pub enum MessageMudbusUpdate {
 #[derive(Debug, Clone)]
 pub enum MelnMessage {
     IsStartedChanged(bool),
-
+    NextStep(meln_logic::watcher::MelnStep),
 }
 
 impl Application for App {
@@ -153,6 +153,10 @@ impl Application for App {
             Subscription::from_recipe(
                 PropertyAnimation::new("IsStarted", props.is_started.subscribe())
             ).map(|enb| Message::MelnMessage(MelnMessage::IsStartedChanged(enb))),
+            Subscription::from_recipe(
+                PropertyAnimation::new("Steps", props.step.subscribe())
+            ).map(|step| Message::MelnMessage(MelnMessage::NextStep(step))),
+
             self.dozator.subscription(&props.material.dozator).map(Message::DozatorUI),
             self.klapans.subscription(&props.klapans).map(Message::KlapansUI),
         ])
@@ -232,7 +236,7 @@ impl Application for App {
                 .style(ui::style::Button::Exit));
 //         col.into()
 
-        let txt_status = Text::new(format!("Status: {}", self.txt_status));
+        let txt_status = Text::new(format!("Step: {}", self.txt_status));
         let row_exit = Row::new()
             .push(txt_status)
             .push(Space::with_width(Length::Fill))
@@ -334,6 +338,9 @@ impl App {
                 self.log_save();
             }
         }
+        NextStep(step) => {
+            self.txt_status = format!("{:?}",step);
+        }
         }
     }
 
@@ -354,7 +361,7 @@ impl App {
         let warn = values.iter().map(|(_,v)| v)
             .map(|v| v.is_error())
             .any(|err| err);
-        self.txt_status = if warn {"Ошибка значений"} else {""}.into();
+//         self.txt_status = if warn {"Ошибка значений"} else {""}.into();
     }
 
     fn log_save(&mut self) {