Voomra/trader
Archived
0
Fork 0
Code Activity

add paths layout

Browse Source
This commit is contained in:
iMoHax
2014-08-17 22:49:37 +04:00
committed by iMoHax
parent b4baf8512e
commit 2604939f96
12 changed files with 364 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/resources/view/orders.fxml
View File

@@ -21,7 +21,7 @@
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="count" minWidth="60.0" text="Кол-во">
<TableColumn fx:id="count" minWidth="60.0" prefWidth="60.0" text="Кол-во">
<cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="160.0" text="Покупатель">
@@ -34,7 +34,7 @@
<TableColumn resizable="false" text="Максимум">
<columns>
<TableColumn fx:id="maxCount" minWidth="60.0" text="Кол-во">
<TableColumn fx:id="maxCount" minWidth="60.0" prefWidth="60.0" text="Кол-во">
<cellValueFactory><PropertyValueFactory property="max"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="bestProfit" minWidth="80.0" text="Прибыль" sortType="DESCENDING">

45
client/src/main/resources/view/paths.fxml Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.*?>
<?import ru.trader.view.support.cells.DoubleCell?>
<?import ru.trader.view.support.cells.OfferCellValueImpl?>
<?import ru.trader.view.support.cells.OfferTableCell?>
<?import ru.trader.view.support.cells.PathRouteCell?>
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.PathsController" styleClass="dialog"
prefWidth="900">
<TableView fx:id="tblPaths" editable="true">
<columns>
<TableColumn minWidth="640.0" text="Путь">
<cellFactory><PathRouteCell /></cellFactory>
</TableColumn>
<TableColumn minWidth="60.0" text="Заправок">
<cellValueFactory><PropertyValueFactory property="refuels"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="60.0" text="Прыжков">
<cellValueFactory><PropertyValueFactory property="jumps"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="60.0" text="Дистанция">
<cellFactory><DoubleCell format="\%.2f LY"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="distance"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="profit" minWidth="80.0" text="Прибыль" sortType="DESCENDING">
<cellValueFactory><PropertyValueFactory property="totalProfit"/></cellValueFactory>
</TableColumn>
</columns>
<columnResizePolicy>
<TableView fx:constant="UNCONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy>
<sortOrder>
<fx:reference source="profit"/>
</sortOrder>
</TableView>
</HBox>

40
client/src/main/resources/view/routers.fxml
View File

@@ -12,21 +12,38 @@
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.RoutersController">
<fx:define><Insets fx:id="fields_group_margin" left="2" right="10"/></fx:define>
<fx:define><Insets fx:id="separator_margin" top="20" bottom="20"/></fx:define>
<fx:define><Insets fx:id="separator_margin" top="10" bottom="10"/></fx:define>
<VBox minWidth="260">
<TitledPane text="Параметры" minHeight="400" collapsible="false">
<VBox minWidth="250">
<TitledPane text="Параметры корабля" minHeight="160" collapsible="false">
<GridPane vgap="4">
<columnConstraints>
<ColumnConstraints minWidth="140" />
<ColumnConstraints minWidth="90" maxWidth="90"/>
</columnConstraints>
<Label text="Баланс:"/>
<NumberField fx:id="balance" value="1000" GridPane.columnIndex="1" />
<Label text="Трюм:" GridPane.rowIndex="1" />
<NumberField fx:id="cargo" value="4" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="Запас топлива(LY):" GridPane.rowIndex="2" />
<NumberField fx:id="tank" value="30" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="Дистанция прыжка(LY):" GridPane.rowIndex="3" />
<NumberField fx:id="distance" value="7" GridPane.columnIndex="1" GridPane.rowIndex="3" />
</GridPane>
</TitledPane>
<TitledPane text="Параметры маршрута" minHeight="250" collapsible="false">
<GridPane vgap="4">
<columnConstraints>
<ColumnConstraints minWidth="70"/>
<ColumnConstraints minWidth="160"/>
<ColumnConstraints minWidth="160" maxWidth="160"/>
</columnConstraints>
<Label text="Баланс:"/>
<NumberField fx:id="balance" prefWidth="100" value="1000" GridPane.columnIndex="1" />
<Label text="Трюм:" GridPane.rowIndex="1" />
<NumberField fx:id="cargo" prefWidth="50" value="4" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="Станция:" GridPane.rowIndex="2"/>
<ComboBox fx:id="vendors" prefWidth="160" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
<Label text="От:" />
<ComboBox fx:id="source" prefWidth="160" GridPane.columnIndex="1" />
<Label text="До:" GridPane.rowIndex="1"/>
<ComboBox fx:id="target" prefWidth="160" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
<Label text="Прыжков:" GridPane.rowIndex="2" />
<NumberField fx:id="jumps" value="4" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Separator GridPane.columnSpan="2" GridPane.rowIndex="3" GridPane.margin="$separator_margin"/>
<VBox GridPane.columnSpan="2" GridPane.rowIndex="4" spacing="20">
<HBox alignment="CENTER" spacing="5">
@@ -36,6 +53,7 @@
</HBox>
<HBox alignment="CENTER" spacing="5">
<Button text="TOP 100" onAction="#showTopOrders" />
<Button text="Маршруты" onAction="#showRoutes" />
</HBox>
</VBox>
</GridPane>
@@ -56,7 +74,7 @@
</VBox>
<TableView fx:id="tblOrders" HBox.hgrow="ALWAYS">
<columns>
<TableColumn minWidth="200.0" text="Продавец">
<TableColumn minWidth="210.0" text="Продавец">
<cellValueFactory><PropertyValueFactory property="vendor"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="180.0" text="Товар">