Voomra/trader
Archived
0
Fork 0
Code Activity

show system and station names in node route

Browse Source
This commit is contained in:
iMoHax
2014-11-28 20:58:54 +03:00
parent 96b9da3ebe
commit 86053d7b0c
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
client/src/main/java/ru/trader/view/support/RouteNode.java
View File

@@ -7,6 +7,7 @@ import javafx.scene.layout.VBox;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import org.controlsfx.glyphfont.Glyph; import org.controlsfx.glyphfont.Glyph;
import ru.trader.core.Order; import ru.trader.core.Order;
import ru.trader.core.Vendor;
import ru.trader.graph.PathRoute; import ru.trader.graph.PathRoute;
import ru.trader.model.PathRouteModel; import ru.trader.model.PathRouteModel;
import ru.trader.view.support.cells.DistanceCell; import ru.trader.view.support.cells.DistanceCell;
@@ -17,6 +18,9 @@ public class RouteNode {
private final static String CSS_TRACK = "path-track"; private final static String CSS_TRACK = "path-track";
private final static String CSS_TRACK_TEXT = "path-track-text"; private final static String CSS_TRACK_TEXT = "path-track-text";
private final static String CSS_SYSTEM = "path-system"; private final static String CSS_SYSTEM = "path-system";
private final static String CSS_TEXT = "path-text";
private final static String CSS_SYSTEM_TEXT = "path-system-text";
private final static String CSS_STATION_TEXT = "path-station-text";
private final PathRoute path; private final PathRoute path;
private final HBox node = new HBox(); private final HBox node = new HBox();
@@ -40,10 +44,9 @@ public class RouteNode {
PathRoute p = path.getRoot(); PathRoute p = path.getRoot();
v.getChildren().add(new Text(p.get().getName())); v.getChildren().add(buildText(p.get()));
Order cargo = null; Order cargo = null;
while (p.hasNext()){ while (p.hasNext()){
//TODO: fix icons
p = p.getNext(); p = p.getNext();
if (cargo == null && p.getBest() != null){ if (cargo == null && p.getBest() != null){
cargo = p.getBest(); cargo = p.getBest();
@@ -71,7 +74,8 @@ public class RouteNode {
icons.getStyleClass().add(CSS_ICONS); icons.getStyleClass().add(CSS_ICONS);
track.getStyleClass().add(CSS_TRACK); track.getStyleClass().add(CSS_TRACK);
v.getChildren().add(new Text(p.get().getName()));
v.getChildren().add(buildText(p.get()));
v.getChildren().add(icons); v.getChildren().add(icons);
if (cargo != null && cargo.isBuyer(p.get())){ if (cargo != null && cargo.isBuyer(p.get())){
v.getChildren().add(new Text(String.format(" (%+.0f) ", cargo.getProfit()))); v.getChildren().add(new Text(String.format(" (%+.0f) ", cargo.getProfit())));
@@ -82,6 +86,24 @@ public class RouteNode {
node.getChildren().addAll(v, icons); node.getChildren().addAll(v, icons);
} }
private VBox buildText(Vendor vendor){
Text systemText = new Text(vendor.getPlace().getName());
systemText.getStyleClass().add(CSS_SYSTEM_TEXT);
VBox text = new VBox(2);
VBox.setVgrow(text, Priority.ALWAYS);
text.getStyleClass().add(CSS_TEXT);
text.getChildren().addAll(systemText);
if (!vendor.getName().isEmpty()) {
Text stationText = new Text(vendor.getName());
stationText.getStyleClass().add(CSS_STATION_TEXT);
text.getChildren().addAll(stationText);
}
return text;
}
public Node getNode() { public Node getNode() {
return node; return node;
} }

11
client/src/main/resources/view/style.css
View File

@@ -66,6 +66,17 @@ HBox.fields-group hbox-margin{
-fx-text-alignment: left; -fx-text-alignment: left;
} }
.path-text {
-fx-alignment: center;
}
.path-system-text {
}
.path-station-text {
-fx-font-size: 8pt;
}
.path-icons { .path-icons {
-fx-alignment: center; -fx-alignment: center;
} }