Minor fixes

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>
open-rmf · Sep 12, 2024 · d7be917 · d7be917
1 parent 3496425
commit d7be917
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/rmf_site_editor/examples/extending_menu.rs b/rmf_site_editor/examples/extending_menu.rs
@@ -15,9 +15,7 @@ impl FromWorld for MyMenuHandler {
         // This is all it takes to register a new menu item
         // We need to keep track of the entity in order to make
         // sure that we can check the callback
-        let unique_export = world
-            .spawn(MenuItem::Text("My unique export".to_string()))
-            .id();
+        let unique_export = world.spawn(MenuItem::Text("My unique export".into())).id();
 
         // Make it a child of the "File Menu"
         let file_header = world.resource::<FileMenu>().get();
@@ -37,9 +35,7 @@ impl FromWorld for MyMenuHandler {
         world.entity_mut(menu).push_children(&[sub_menu]);
 
         // Finally we can create a custom action
-        let custom_nested_menu = world
-            .spawn(MenuItem::Text("My Awesome Action".to_string()))
-            .id();
+        let custom_nested_menu = world.spawn(MenuItem::Text("My Awesome Action".into())).id();
         world
             .entity_mut(sub_menu)
             .push_children(&[custom_nested_menu]);
@@ -56,7 +52,7 @@ impl FromWorld for MyMenuHandler {
 /// an event that is of the same type as the one we are supposed to
 /// handle.
 fn watch_unique_export_click(mut reader: EventReader<MenuEvent>, menu_handle: Res<MyMenuHandler>) {
-    for event in reader.iter() {
+    for event in reader.read() {
         if event.clicked() && event.source() == menu_handle.unique_export {
             println!("Doing our epic export");
         }
@@ -67,7 +63,7 @@ fn watch_unique_export_click(mut reader: EventReader<MenuEvent>, menu_handle: Re
 /// an event that is of the same type as the one we are supposed to
 /// handle.
 fn watch_submenu_click(mut reader: EventReader<MenuEvent>, menu_handle: Res<MyMenuHandler>) {
-    for event in reader.iter() {
+    for event in reader.read() {
         if event.clicked() && event.source() == menu_handle.custom_nested_menu {
             println!("Submenu clicked");
         }

diff --git a/rmf_site_editor/src/widgets/inspector/inspect_asset_source.rs b/rmf_site_editor/src/widgets/inspector/inspect_asset_source.rs
@@ -144,6 +144,7 @@ impl<'a> InspectAssetSourceComponent<'a> {
                     // Button to load from file, disabled for wasm since there are no local files
                     #[cfg(not(target_arch = "wasm32"))]
                     if ui.button("Browse").clicked() {
+                        // TODO(luca) change this to use FileDialogServices and be async
                         if let Some(file) = FileDialog::new().pick_file() {
                             if let Some(src) = file.to_str() {
                                 if let (Some(default_file), true) = (self.default_file, is_relative)

diff --git a/rmf_site_editor/src/widgets/inspector/mod.rs b/rmf_site_editor/src/widgets/inspector/mod.rs
@@ -106,7 +106,6 @@ use crate::{
     interaction::Selection,
     site::{Category, SiteID},
     widgets::prelude::*,
-    AppState,
 };
 use bevy::{
     ecs::system::{SystemParam, SystemState},

diff --git a/rmf_site_editor/src/widgets/view_lights.rs b/rmf_site_editor/src/widgets/view_lights.rs
@@ -108,6 +108,7 @@ impl<'w, 's> ViewLights<'w, 's> {
                         }
                         None => {
                             let future = AsyncComputeTaskPool::get().spawn(async move {
+                                // TODO(luca) change this to use FileDialogServices
                                 let file = match AsyncFileDialog::new().save_file().await {
                                     Some(file) => file,
                                     None => return None,

diff --git a/rmf_site_editor/src/widgets/view_nav_graphs.rs b/rmf_site_editor/src/widgets/view_nav_graphs.rs
@@ -215,6 +215,7 @@ impl<'w, 's> ViewNavGraphs<'w, 's> {
                         }
                         None => {
                             let future = AsyncComputeTaskPool::get().spawn(async move {
+                                // TODO(luca) change this to use FileDialogServices
                                 let file = match AsyncFileDialog::new().pick_file().await {
                                     Some(file) => file,
                                     None => return None,