Store solved rotations

Cargo.toml

@@ -22,6 +22,7 @@ image = { version = "0.25", default-features = false, features = ["webp"] }
 serde = { version = "1.0.215", features = ["derive"] }
 ron = "0.8"
 log = "0.4"
+rand = "0.8.5"
 
 # workaround for https://github.com/emilk/egui/issues/5491
 # remove after updating to egui 0.30.1

src/app.rs

@@ -54,8 +54,11 @@ pub struct MacroSolverApp {
     crafter_config: CrafterConfig,
     solver_config: SolverConfig,
     macro_view_config: MacroViewConfig,
+    saved_rotations_data: SavedRotationsData,
 
     stats_edit_window_open: bool,
+    saved_rotations_window_open: bool,
+
     actions: Vec<Action>,
     solver_pending: bool,
     solver_interrupt_pending: bool,
@@ -132,8 +135,11 @@ impl MacroSolverApp {
             crafter_config: load(cc, "CRAFTER_CONFIG", Default::default()),
             solver_config: load(cc, "SOLVER_CONFIG", Default::default()),
             macro_view_config: load(cc, "MACRO_VIEW_CONFIG", Default::default()),
+            saved_rotations_data: load(cc, "SAVED_ROTATIONS", Default::default()),
 
             stats_edit_window_open: false,
+            saved_rotations_window_open: false,
+
             actions: Vec::new(),
             solver_pending: false,
             solver_interrupt_pending: false,
@@ -361,6 +367,23 @@ impl eframe::App for MacroSolverApp {
             ui.style_mut().spacing.item_spacing = egui::vec2(8.0, 3.0);
             ui.add(StatsEdit::new(self.locale, &mut self.crafter_config));
         });
+
+        egui::Window::new(
+            egui::RichText::new("Saved rotations")
+                .strong()
+                .text_style(TextStyle::Body),
+        )
+        .open(&mut self.saved_rotations_window_open)
+        .collapsible(false)
+        .default_size((400.0, 600.0))
+        .show(ctx, |ui| {
+            ui.style_mut().spacing.item_spacing = egui::vec2(8.0, 3.0);
+            ui.add(SavedRotationsWidget::new(
+                self.locale,
+                &mut self.saved_rotations_data,
+                &mut self.actions,
+            ));
+        });
     }
 
     fn save(&mut self, storage: &mut dyn eframe::Storage) {
@@ -371,6 +394,7 @@ impl eframe::App for MacroSolverApp {
         eframe::set_value(storage, "CRAFTER_CONFIG", &self.crafter_config);
         eframe::set_value(storage, "SOLVER_CONFIG", &self.solver_config);
         eframe::set_value(storage, "MACRO_VIEW_CONFIG", &self.macro_view_config);
+        eframe::set_value(storage, "SAVED_ROTATIONS", &self.saved_rotations_data);
     }
 
     fn auto_save_interval(&self) -> std::time::Duration {
@@ -387,6 +411,15 @@ impl MacroSolverApp {
                 self.actions = actions;
                 self.duration = Some(self.start_time.unwrap().elapsed());
                 self.solver_pending = false;
+                self.saved_rotations_data.add_solved_rotation(Rotation::new(
+                    game_data::get_item_name(self.recipe_config.recipe.item_id, false, self.locale),
+                    self.actions.clone(),
+                    &self.recipe_config.recipe,
+                    &self.selected_food,
+                    &self.selected_potion,
+                    &self.crafter_config,
+                    &self.solver_config,
+                ));
             }
         }
     }
@@ -473,10 +506,16 @@ impl MacroSolverApp {
             ui.vertical(|ui| {
                 self.draw_configuration_widget(ui);
                 ui.separator();
-                ui.vertical_centered_justified(|ui| {
-                    if ui.button("Solve").clicked() {
-                        self.on_solve_button_clicked(ui.ctx());
+                ui.with_layout(egui::Layout::right_to_left(egui::Align::TOP), |ui| {
+                    if ui.button("History").clicked() {
+                        self.saved_rotations_window_open = true;
                     }
+                    ui.add_space(-5.0);
+                    ui.vertical_centered_justified(|ui| {
+                        if ui.button("Solve").clicked() {
+                            self.on_solve_button_clicked(ui.ctx());
+                        }
+                    });
                 });
                 ui.with_layout(Layout::right_to_left(Align::TOP), |ui| {
                     ui.label(format!(

src/widgets/analysis.rs

@@ -40,7 +40,7 @@ impl egui::Widget for SolutionAnalysis<'_> {
             ui.set_width(ui.available_width());
             ui.style_mut().spacing.item_spacing = egui::vec2(8.0, 3.0);
 
-            let mut collapsed = false;
+            let mut collapsed = true;
             let distribution = simulator::quality_probability_distribution(
                 self.settings,
                 self.actions,
@@ -49,7 +49,11 @@ impl egui::Widget for SolutionAnalysis<'_> {
 
             ui.vertical(|ui| {
                 ui.horizontal(|ui| {
-                    collapsed = util::collapse_button(ui, egui::Id::new("analysis_collapsed"));
+                    util::collapse_persisted(
+                        ui,
+                        egui::Id::new("analysis_collapsed"),
+                        &mut collapsed,
+                    );
                     ui.label(egui::RichText::new("Analysis").strong());
                     if self.is_expert {
                         ui.label("N/A (Expert recipes not supported)");

src/widgets/food_select.rs

@@ -46,7 +46,7 @@ impl Widget for FoodSelect<'_> {
                 let mut collapsed = false;
 
                 ui.horizontal(|ui| {
-                    collapsed = util::collapse_button(ui, Id::new("FOOD_SEARCH_COLLAPSED"));
+                    util::collapse_persisted(ui, Id::new("FOOD_SEARCH_COLLAPSED"), &mut collapsed);
                     ui.label(egui::RichText::new("Food").strong());
                     match self.selected_consumable {
                         None => ui.label("None"),

src/widgets/macro_view.rs

@@ -131,7 +131,7 @@ impl Widget for MacroView<'_> {
                             .map(|action| action.time_cost())
                             .sum::<i16>();
                         ui.label(format!(
-                            "{} steps | {} seconds",
+                            "{} steps, {} seconds",
                             self.actions.len(),
                             duration
                         ));

src/widgets/mod.rs

@@ -25,4 +25,7 @@ pub use item_name_label::ItemNameLabel;
 mod analysis;
 pub use analysis::SolutionAnalysis;
 
+mod saved_rotations;
+pub use saved_rotations::{Rotation, SavedRotationsData, SavedRotationsWidget};
+
 mod util;

src/widgets/potion_select.rs

@@ -45,7 +45,11 @@ impl Widget for PotionSelect<'_> {
             ui.vertical(|ui| {
                 let mut collapsed = false;
                 ui.horizontal(|ui| {
-                    collapsed = util::collapse_button(ui, Id::new("POTION_SEARCH_COLLAPSED"));
+                    util::collapse_persisted(
+                        ui,
+                        Id::new("POTION_SEARCH_COLLAPSED"),
+                        &mut collapsed,
+                    );
                     ui.label(egui::RichText::new("Potion").strong());
                     match self.selected_consumable {
                         None => ui.label("None"),

src/widgets/recipe_select.rs

@@ -217,7 +217,11 @@ impl Widget for RecipeSelect<'_> {
                 let mut collapsed = false;
 
                 ui.horizontal(|ui| {
-                    collapsed = util::collapse_button(ui, Id::new("RECIPE_SEARCH_COLLAPSED"));
+                    util::collapse_persisted(
+                        ui,
+                        Id::new("RECIPE_SEARCH_COLLAPSED"),
+                        &mut collapsed,
+                    );
                     ui.label(egui::RichText::new("Recipe").strong());
                     ui.add(ItemNameLabel::new(
                         self.recipe_config.recipe.item_id,