From 1c1315ad9c89e483831404e92cb7727a1571709c Mon Sep 17 00:00:00 2001 From: Mo Date: Fri, 23 Oct 2015 23:05:58 +0300 Subject: [PATCH] show time on target entry --- .../main/java/ru/trader/controllers/HelperController.java | 6 +++++- core/src/main/java/ru/trader/analysis/Route.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/ru/trader/controllers/HelperController.java b/client/src/main/java/ru/trader/controllers/HelperController.java index de66e22..e1fbdf7 100644 --- a/client/src/main/java/ru/trader/controllers/HelperController.java +++ b/client/src/main/java/ru/trader/controllers/HelperController.java @@ -196,7 +196,11 @@ public class HelperController { entry = route.get(index); station.setText(entry.getStation().getName()); system.setText(entry.getStation().getSystem().getName()); - time.setText(ViewUtils.timeToString(entry.getTime())); + if (index > 0){ + time.setText(ViewUtils.timeToString(route.get(index-1).getTime())); + } else { + time.setText(ViewUtils.timeToString(0)); + } refuel.setText(String.valueOf(entry.getRefill())); buyOrders.setItems(entry.orders()); sellOrders.setItems(entry.sellOrders()); diff --git a/core/src/main/java/ru/trader/analysis/Route.java b/core/src/main/java/ru/trader/analysis/Route.java index b1d737d..af5887d 100644 --- a/core/src/main/java/ru/trader/analysis/Route.java +++ b/core/src/main/java/ru/trader/analysis/Route.java @@ -200,11 +200,12 @@ public class Route implements Comparable { profit = 0; distance = 0; lands = 0; fuel = 0; refills = 0; time = 0; if (entries.isEmpty()) return; RouteEntry entry = entries.get(0); + time = entry.getTime(); for (int i = 1; i < entries.size(); i++) { RouteEntry next = entries.get(i); distance += entry.getVendor().getDistance(next.getVendor()); profit += entry.getProfit(); - time += entry.getFullTime(); + time += next.getTime(); fuel += entry.getFuel(); if (entry.isLand()){ lands++;