Skip to content

Improve tasks UI #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiyuoh wants to merge 27 commits into
base: main
Choose a base branch
from
Open

Improve tasks UI #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ac3333c
Reorg fleet name param
xiyuoh Jul 15, 2025
7daa517
In-place task edit
xiyuoh Jul 16, 2025
c4f8099
Move Create New Task to center window
xiyuoh Jul 16, 2025
3989422
Move task panel to the left
xiyuoh Jul 22, 2025
0a97f7a
Children widget in dialog if create new task
xiyuoh Jul 23, 2025
a4fb9c3
Optional serializing for some items
xiyuoh Jul 23, 2025
dfd30f6
Infer fleet from robot
xiyuoh Jul 23, 2025
45c9a19
Merge remote-tracking branch 'origin/main' into xiyu/improve_tasks
xiyuoh Jul 23, 2025
a0f9023
Remove Grid to prevent glitch
xiyuoh Jul 29, 2025
e45e884
Merge branch 'main' into xiyu/improve_tasks
xiyuoh Aug 25, 2025
4975976
Update test site
xiyuoh Aug 25, 2025
c6211d4
Merge branch 'main' into xiyu/improve_tasks
luca-della-vedova Aug 29, 2025
c23dffa
Check if TaskKind is valid
xiyuoh Sep 1, 2025
f129a4a
In-place editing for task kind
xiyuoh Sep 1, 2025
a2390aa
Implement time sorting for tasks
xiyuoh Sep 2, 2025
73dc9a3
Fix pending tasks TaskParams not saved
xiyuoh Sep 2, 2025
8c278e2
Use Point<Entity> instead of String for GoToPlace locations
xiyuoh Sep 2, 2025
be19460
Merge remote-tracking branch 'origin/main' into xiyu/improve_tasks
xiyuoh Sep 2, 2025
4946083
Task-based visual cue for GoToPlace
xiyuoh Sep 3, 2025
f67cc3b
Use entities instead of name for Robot
xiyuoh Sep 3, 2025
ec9443d
Use timestamp as task id and fix saving
xiyuoh Sep 3, 2025
3c43a73
Fix saving location in tasks
xiyuoh Sep 4, 2025
f79bb7d
Insert valid task location
xiyuoh Sep 4, 2025
5de4cb7
Merge remote-tracking branch 'origin/main' into xiyu/improve_tasks
xiyuoh Sep 5, 2025
7de9d83
Do not allow editing fleet name via task widget
xiyuoh Sep 9, 2025
a92bf8a
Merge remote-tracking branch 'origin/main' into xiyu/improve_tasks
xiyuoh Oct 15, 2025
dec22ac
TODO: check why negotiation loops when goal changes
xiyuoh Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ron = "0.10"
thiserror = "*"
glam = { version = "0.29" } # Ensure that this match's bevy_math's glam before updating.
uuid = { version = "1.13"}
chrono = "*"
sdformat_rs = { git = "https://github.com/open-rmf/sdf_rust_experimental", rev = "514949e" }
urdf-rs = { version = "0.7.3"}
once_cell = "1"
Expand Down
68 changes: 64 additions & 4 deletions assets/demo_maps/test.site.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,8 @@
}
}
},
"inclusion": "Included"
"inclusion": "Included",
"on_level": 22
},
"62": {
"pose": {
Expand All @@ -879,7 +880,8 @@
]
}
},
"inclusion": "Included"
"inclusion": "Included",
"on_level": 22
},
"63": {
"pose": {
Expand All @@ -894,7 +896,8 @@
}
}
},
"inclusion": "Included"
"inclusion": "Included",
"on_level": 22
},
"122": {
"pose": {
Expand Down Expand Up @@ -994,6 +997,32 @@
}
},
"inclusion": "Included"
},
"138": {
"inclusion": "Included"
},
"139": {
"inclusion": "Included"
}
},
"tasks": {
"138": {
"inclusion": "Included",
"params": {
"unix_millis_earliest_start_time": null,
"unix_millis_request_time": null,
"priority": null,
"labels": []
}
},
"139": {
"inclusion": "Included",
"params": {
"unix_millis_earliest_start_time": null,
"unix_millis_request_time": null,
"priority": null,
"labels": []
}
}
},
"name": "Default Scenario",
Expand All @@ -1016,6 +1045,7 @@
},
"robots": {
"52": {
"fleet": "HospitalRobot",
Copy link
Member

@luca-della-vedova luca-della-vedova Aug 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add tasks to this file so we make it part of our CI pipeline? It can be done in a followup if you prefer

"properties": {
"Collision": {
"config": {
Expand Down Expand Up @@ -1053,7 +1083,7 @@
},
"model_instances": {
"53": {
"parent": 1,
"parent": 22,
"name": "L1_robot",
"pose": {
"trans": [
Expand Down Expand Up @@ -1222,5 +1252,35 @@
},
"description": 129
}
},
"tasks": {
"138": {
"Dispatch": {
"request": {
"id": "task-20250904-030419",
"category": "Go To Place",
"description": {
"location": 121
},
"description_display": "A",
"created_time": 1756955059673
}
}
},
"139": {
"Direct": {
"robot": 53,
"fleet": "HospitalRobot",
"request": {
"id": "task-20250904-030447",
"category": "Wait For",
"description": {
"duration": 30.0
},
"description_display": "30 seconds",
"created_time": 1756955087335
}
}
}
}
}
1 change: 0 additions & 1 deletion crates/rmf_site_editor/src/interaction/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,5 @@ pub fn update_model_instance_visual_cues(
}
}
}
// TODO(@xiyuoh) support task-based visual cues
}
}
Loading
Loading