Skip to content

Commit

Permalink
Format according to uncrustify
Browse files Browse the repository at this point in the history
Signed-off-by: tanjunkiat <tanjunkiat@outlook.sg>
  • Loading branch information
TanJunKiat committed Sep 18, 2024
1 parent 7a55fbd commit 85bb592
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
14 changes: 8 additions & 6 deletions rmf_traffic_editor/gui/level.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -503,12 +503,13 @@ bool Level::delete_lift_vertex(std::string lift_name)
int selected_vertex_idx = -1;
for (int i = 0; i < static_cast<int>(vertices.size()); i++)
{
if (vertices[i].params.count("lift_cabin")){
if (vertices[i].params.count("lift_cabin"))
{
if (vertices[i].params["lift_cabin"].value_string == lift_name)
{
selected_vertex_idx = i;
break;
}
}
}
}

Expand All @@ -520,14 +521,16 @@ bool Level::delete_lift_vertex(std::string lift_name)
edges.end(),
[selected_vertex_idx](const Edge& edge)
{
if (edge.start_idx == selected_vertex_idx || edge.end_idx == selected_vertex_idx){
if (edge.start_idx == selected_vertex_idx ||
edge.end_idx == selected_vertex_idx)
{
return true;
}
else
return false;
}),
edges.end());
edges.end());

for (Edge& edge : edges)
{
if (edge.start_idx > selected_vertex_idx)
Expand All @@ -538,7 +541,6 @@ bool Level::delete_lift_vertex(std::string lift_name)

vertices.erase(vertices.begin() + selected_vertex_idx);
}

return true;
}

Expand Down
6 changes: 4 additions & 2 deletions rmf_traffic_editor/gui/lift_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ void LiftTable::update(Building& building)
{
for (size_t j = 0; j < building.lifts.size(); j++)
{
if(j==i){
if (j == i)
{
auto lift_name = building.lifts[j].name;
for (auto& level : building.levels){
for (auto& level : building.levels)
{
level.delete_lift_vertex(lift_name);
}
building.lifts.erase(building.lifts.begin() + i);
Expand Down

0 comments on commit 85bb592

Please sign in to comment.