diff --git a/client/src/main/java/ru/trader/controllers/RouteTrackController.java b/client/src/main/java/ru/trader/controllers/RouteTrackController.java index 532d447..e3e00f3 100644 --- a/client/src/main/java/ru/trader/controllers/RouteTrackController.java +++ b/client/src/main/java/ru/trader/controllers/RouteTrackController.java @@ -291,6 +291,13 @@ public class RouteTrackController { } } + @FXML + private void removeLast(){ + if (route != null && route.getJumps() > 0){ + updateRoute(route.dropLast()); + } + } + @FXML private void addOrder(){ if (route != null){ diff --git a/client/src/main/java/ru/trader/model/RouteModel.java b/client/src/main/java/ru/trader/model/RouteModel.java index 16fb997..d854635 100644 --- a/client/src/main/java/ru/trader/model/RouteModel.java +++ b/client/src/main/java/ru/trader/model/RouteModel.java @@ -204,6 +204,12 @@ public class RouteModel { return copyFill(res, offset); } + public RouteModel dropLast(){ + Route res = Route.clone(_route); + res.dropTo(entries.size()-2); + return copyFill(res, entries.size()-2); + } + public RouteModel remove(OrderModel order) { Route res = Route.clone(_route); res.dropTo(ModelFabric.get(order.getStation())); diff --git a/client/src/main/resources/view/routeTrack.fxml b/client/src/main/resources/view/routeTrack.fxml index 39efc0b..6f57613 100644 --- a/client/src/main/resources/view/routeTrack.fxml +++ b/client/src/main/resources/view/routeTrack.fxml @@ -65,14 +65,15 @@ - - + + - - - - - + + + + + +