From 41f6233fad7df6db384880798c8b518a3d0d9577 Mon Sep 17 00:00:00 2001 From: Luca Della Vedova Date: Mon, 5 Aug 2024 13:44:41 +0800 Subject: [PATCH] Rename WorkspaceLoadingParams to WorkspaceLoader Signed-off-by: Luca Della Vedova --- rmf_site_editor/src/keyboard.rs | 6 +++--- rmf_site_editor/src/main_menu.rs | 14 +++++++------- rmf_site_editor/src/site/sdf_exporter.rs | 6 +++--- rmf_site_editor/src/widgets/menu_bar.rs | 8 +++----- rmf_site_editor/src/workspace.rs | 4 ++-- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/rmf_site_editor/src/keyboard.rs b/rmf_site_editor/src/keyboard.rs index ad9eba7c..bf6629c3 100644 --- a/rmf_site_editor/src/keyboard.rs +++ b/rmf_site_editor/src/keyboard.rs @@ -18,7 +18,7 @@ use crate::{ interaction::{ChangeMode, ChangeProjectionMode, InteractionMode, Selection}, site::{AlignSiteDrawings, Delete}, - CreateNewWorkspace, CurrentWorkspace, SaveWorkspace, WorkspaceLoadingParams, + CreateNewWorkspace, CurrentWorkspace, SaveWorkspace, WorkspaceLoader, }; use bevy::{prelude::*, window::PrimaryWindow}; use bevy_egui::EguiContexts; @@ -55,7 +55,7 @@ fn handle_keyboard_input( mut align_site: EventWriter, current_workspace: Res, primary_windows: Query>, - mut load_workspace: WorkspaceLoadingParams, + mut workspace_loader: WorkspaceLoader, ) { let Some(egui_context) = primary_windows .get_single() @@ -122,7 +122,7 @@ fn handle_keyboard_input( } if keyboard_input.just_pressed(KeyCode::O) { - load_workspace.load_from_dialog(); + workspace_loader.load_from_dialog(); } } } diff --git a/rmf_site_editor/src/main_menu.rs b/rmf_site_editor/src/main_menu.rs index 580b73f3..abc8502b 100644 --- a/rmf_site_editor/src/main_menu.rs +++ b/rmf_site_editor/src/main_menu.rs @@ -16,14 +16,14 @@ */ use super::demo_world::*; -use crate::{AppState, Autoload, WorkspaceData, WorkspaceLoadingParams}; +use crate::{AppState, Autoload, WorkspaceData, WorkspaceLoader}; use bevy::{app::AppExit, prelude::*, window::PrimaryWindow}; use bevy_egui::{egui, EguiContexts}; fn egui_ui( mut egui_context: EguiContexts, mut _exit: EventWriter, - mut load_workspace: WorkspaceLoadingParams, + mut workspace_loader: WorkspaceLoader, mut _app_state: ResMut>, autoload: Option>, primary_windows: Query>, @@ -32,7 +32,7 @@ fn egui_ui( #[cfg(not(target_arch = "wasm32"))] { if let Some(filename) = autoload.filename.take() { - load_workspace.load_from_path(filename); + workspace_loader.load_from_path(filename); } } return; @@ -57,21 +57,21 @@ fn egui_ui( ui.horizontal(|ui| { if ui.button("View demo map").clicked() { - load_workspace.load_from_data(WorkspaceData::LegacyBuilding(demo_office())); + workspace_loader.load_from_data(WorkspaceData::LegacyBuilding(demo_office())); } if ui.button("Open a file").clicked() { - load_workspace.load_from_dialog(); + workspace_loader.load_from_dialog(); } if ui.button("Create new file").clicked() { - load_workspace.create_empty_from_dialog(); + workspace_loader.create_empty_from_dialog(); } // TODO(@mxgrey): Bring this back when we have finished developing // the key features for workcell editing. // if ui.button("Workcell Editor").clicked() { - // load_workspace.send(LoadWorkspace::Data(WorkspaceData::Workcell( + // workspace_loader.send(LoadWorkspace::Data(WorkspaceData::Workcell( // demo_workcell(), // ))); // } diff --git a/rmf_site_editor/src/site/sdf_exporter.rs b/rmf_site_editor/src/site/sdf_exporter.rs index ac6872f8..728a13ec 100644 --- a/rmf_site_editor/src/site/sdf_exporter.rs +++ b/rmf_site_editor/src/site/sdf_exporter.rs @@ -11,7 +11,7 @@ use crate::{ ChildLiftCabinGroup, CollisionMeshMarker, DoorSegments, DrawingMarker, FloorSegments, LiftDoormat, ModelSceneRoot, TentativeModelFormat, VisualMeshMarker, }, - Autoload, WorkspaceLoadingParams, + Autoload, WorkspaceLoader, }; use rmf_site_format::{ IsStatic, LevelElevation, LiftCabin, ModelMarker, NameInSite, NameOfSite, SiteID, WallMarker, @@ -51,11 +51,11 @@ pub fn headless_sdf_export( sites: Query<(Entity, &NameOfSite)>, drawings: Query>, autoload: Option>, - mut load_workspace: WorkspaceLoadingParams, + mut workspace_loader: WorkspaceLoader, ) { if let Some(mut autoload) = autoload { if let Some(filename) = autoload.filename.take() { - load_workspace.load_from_path(filename); + workspace_loader.load_from_path(filename); } } else { error!("Cannot perform a headless export since no site file was specified for loading"); diff --git a/rmf_site_editor/src/widgets/menu_bar.rs b/rmf_site_editor/src/widgets/menu_bar.rs index 4e93287a..1b077418 100644 --- a/rmf_site_editor/src/widgets/menu_bar.rs +++ b/rmf_site_editor/src/widgets/menu_bar.rs @@ -15,9 +15,7 @@ * */ -use crate::{ - widgets::prelude::*, AppState, CreateNewWorkspace, SaveWorkspace, WorkspaceLoadingParams, -}; +use crate::{widgets::prelude::*, AppState, CreateNewWorkspace, SaveWorkspace, WorkspaceLoader}; use bevy::ecs::query::Has; use bevy::prelude::*; @@ -279,7 +277,7 @@ fn top_menu_bar( In(input): In, mut new_workspace: EventWriter, mut save: EventWriter, - mut load_workspace: WorkspaceLoadingParams, + mut workspace_loader: WorkspaceLoader, file_menu: Res, top_level_components: Query<(), Without>, children: Query<&Children>, @@ -310,7 +308,7 @@ fn top_menu_bar( .add(Button::new("Open").shortcut_text("Ctrl+O")) .clicked() { - load_workspace.load_from_dialog(); + workspace_loader.load_from_dialog(); } render_sub_menu( diff --git a/rmf_site_editor/src/workspace.rs b/rmf_site_editor/src/workspace.rs index 3a10ea5c..d89a1499 100644 --- a/rmf_site_editor/src/workspace.rs +++ b/rmf_site_editor/src/workspace.rs @@ -468,7 +468,7 @@ impl FromWorld for WorkspaceLoadingServices { } } -impl<'w, 's> WorkspaceLoadingParams<'w, 's> { +impl<'w, 's> WorkspaceLoader<'w, 's> { /// Request to spawn a dialog and load a workspace pub fn load_from_dialog(&mut self) { self.commands @@ -503,7 +503,7 @@ impl<'w, 's> WorkspaceLoadingParams<'w, 's> { /// `SystemParam` used to request for workspace loading operations #[derive(SystemParam)] -pub struct WorkspaceLoadingParams<'w, 's> { +pub struct WorkspaceLoader<'w, 's> { workspace_loading: Res<'w, WorkspaceLoadingServices>, commands: Commands<'w, 's>, }