Voomra/trader
Archived
0
Fork 0
Code Activity

show time on target entry

Browse Source
This commit is contained in:
Mo
2015-10-23 23:05:58 +03:00
parent b2b068011c
commit 1c1315ad9c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/main/java/ru/trader/controllers/HelperController.java
View File

@@ -196,7 +196,11 @@ public class HelperController {
entry = route.get(index); entry = route.get(index);
station.setText(entry.getStation().getName()); station.setText(entry.getStation().getName());
system.setText(entry.getStation().getSystem().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())); refuel.setText(String.valueOf(entry.getRefill()));
buyOrders.setItems(entry.orders()); buyOrders.setItems(entry.orders());
sellOrders.setItems(entry.sellOrders()); sellOrders.setItems(entry.sellOrders());

3
core/src/main/java/ru/trader/analysis/Route.java
View File

@@ -200,11 +200,12 @@ public class Route implements Comparable<Route> {
profit = 0; distance = 0; lands = 0; fuel = 0; refills = 0; time = 0; profit = 0; distance = 0; lands = 0; fuel = 0; refills = 0; time = 0;
if (entries.isEmpty()) return; if (entries.isEmpty()) return;
RouteEntry entry = entries.get(0); RouteEntry entry = entries.get(0);
time = entry.getTime();
for (int i = 1; i < entries.size(); i++) { for (int i = 1; i < entries.size(); i++) {
RouteEntry next = entries.get(i); RouteEntry next = entries.get(i);
distance += entry.getVendor().getDistance(next.getVendor()); distance += entry.getVendor().getDistance(next.getVendor());
profit += entry.getProfit(); profit += entry.getProfit();
time += entry.getFullTime(); time += next.getTime();
fuel += entry.getFuel(); fuel += entry.getFuel();
if (entry.isLand()){ if (entry.isLand()){
lands++; lands++;