diff --git a/client/src/main/java/ru/trader/controllers/MainController.java b/client/src/main/java/ru/trader/controllers/MainController.java index 847c3c5..8955f83 100644 --- a/client/src/main/java/ru/trader/controllers/MainController.java +++ b/client/src/main/java/ru/trader/controllers/MainController.java @@ -56,6 +56,8 @@ public class MainController { @FXML private RouteTrackController routeController; @FXML + private PowerPlayController ppController; + @FXML private TabPane tabs; @FXML private Tab track; @@ -121,7 +123,9 @@ public class MainController { routesController.init(); searchController.init(); routeController.init(); - //TODO: add init all controllers + if (ppController != null) { + ppController.init(); + } } public void initEDCE(){ diff --git a/client/src/main/java/ru/trader/controllers/PowerPlayController.java b/client/src/main/java/ru/trader/controllers/PowerPlayController.java index e0af580..a91c5fa 100644 --- a/client/src/main/java/ru/trader/controllers/PowerPlayController.java +++ b/client/src/main/java/ru/trader/controllers/PowerPlayController.java @@ -98,8 +98,8 @@ public class PowerPlayController { } void init(){ - //TODO: add to screens reinit - + result.clear(); + detail.clear(); world = MainController.getWorld(); analyzator = world.getPowerPlayAnalyzer(); if (cbCurrentPower.getValue() != POWER.NONE && cbCurrentPower.getValue() != null){ diff --git a/client/src/main/resources/lang/locale_en_US.properties b/client/src/main/resources/lang/locale_en_US.properties index 9d0e1e0..4c94533 100644 --- a/client/src/main/resources/lang/locale_en_US.properties +++ b/client/src/main/resources/lang/locale_en_US.properties @@ -10,6 +10,7 @@ market.government=Government market.economic=Economy market.power=Power market.powerState=State +market.population=Population #Item market.item=Commodity @@ -23,6 +24,9 @@ market.group=Group #System market.system=System market.system.name=Name +market.system.income=Income +market.system.upkeep=Upkeep +market.system.controlling=Controlled #Station market.station=Station @@ -30,6 +34,7 @@ market.station.name=Name market.station.distance=Distance market.station.services=Facilities market.station.type=Station type +market.station.landpad=Landpad # Offer market.offer.buy=Buy @@ -101,6 +106,7 @@ main.menu.settings.filter=Filter main.tab.routes=Routes main.tab.search=Search main.tab.route=Current route +main.tab.powerplay=Powerplay # add item dialog dialog.item.title=Adding new commodity @@ -263,6 +269,26 @@ missions.delivery.text=Deliver %d items to %s at %s missions.courier.text=Deliver message to %s at %s missions.supply.text=Supply %d %s to %s at %s +#powerplay.fxml +powerplay.analyze.title=Analyze parameters +powerplay.analyze.intersect=Intersect search +powerplay.analyze.near=Near search without intersect +powerplay.analyze.maxIntersect=Max intersection search +powerplay.analyze.expansions=Near expansions +powerplay.analyze.controlling=Systems in controlled radius +powerplay.analyze.search=Start analyze +powerplay.label.checked=Checked system: +powerplay.label.headquarter=Headquarter: +powerplay.label.controlling=Controlled systems: +powerplay.label.power.systems=Systems of Power: +powerplay.label.power.state=State: +powerplay.label.populationSumm=Summ populations: +powerplay.result.title=Analyze result +powerplay.column.intersecting=Intersect +powerplay.column.intersectCount=Intersect count +powerplay.column.distanceHQ=Distance to HQ +powerplay.detail.title=Systems in 15 LY + #helper helper.system=System: helper.station=Station: diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties index 0c3ca8a..92ba757 100644 --- a/client/src/main/resources/lang/locale_ru_RU.properties +++ b/client/src/main/resources/lang/locale_ru_RU.properties @@ -10,6 +10,7 @@ market.government=\u0424\u043E\u0440\u043C\u0430 \u043F\u0440\u0430\u0432\u043B\ market.economic=\u042D\u043A\u043E\u043D\u043E\u043C\u0438\u043A\u0430 market.power=\u0421\u0438\u043B\u0430 market.powerState=\u0421\u0442\u0430\u0442\u0443\u0441 +market.population=\u041D\u0430\u0441\u0435\u043B\u0435\u043D\u0438\u0435 #Item market.item=\u0422\u043E\u0432\u0430\u0440 @@ -23,6 +24,9 @@ market.group=\u0413\u0440\u0443\u043F\u043F\u0430 #System market.system=\u0421\u0438\u0441\u0442\u0435\u043C\u0430 market.system.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 +market.system.income=Income +market.system.upkeep=Upkeep +market.system.controlling=\u041A\u043E\u043D\u0442\u0440\u043E\u043B\u0438\u0440\u0443\u0435\u0442\u0441\u044F #Station market.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F @@ -30,6 +34,7 @@ market.station.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 market.station.distance=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F market.station.services=\u0421\u043E\u043E\u0440\u0443\u0436\u0435\u043D\u0438\u044F market.station.type=\u0422\u0438\u043F \u0441\u0442\u0430\u043D\u0446\u0438\u0438 +market.station.landpad=\u0422\u0438\u043F \u043F\u043B\u043E\u0449\u0430\u0434\u043A\u0438 # Offer @@ -102,6 +107,7 @@ main.menu.settings.filter=\u0424\u0438\u043B\u044C\u0442\u0440 main.tab.routes=\u041C\u0430\u0440\u0448\u0440\u0443\u0442\u044B main.tab.search=\u041F\u043E\u0438\u0441\u043A main.tab.route=\u0422\u0435\u043A\u0443\u0449\u0438\u0439 \u043C\u0430\u0440\u0448\u0440\u0443\u0442 +main.tab.powerplay=\u041F\u043E\u0432\u0435\u0440\u043F\u043B\u0435\u0439 # add item dialog dialog.item.title=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u043E\u0432\u043E\u0433\u043E \u0442\u043E\u0432\u0430\u0440\u0430 @@ -263,6 +269,26 @@ missions.delivery.text=\u0414\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C %d missions.courier.text=\u0414\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u043D\u0430 %s \u0434\u043E %s missions.supply.text=\u041A\u0443\u043F\u0438\u0442\u044C \u0438 \u0434\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C %d %s \u043D\u0430 %s \u0434\u043E %s +#powerplay.fxml +powerplay.analyze.title=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0430\u043D\u0430\u043B\u0438\u0437\u0430 +powerplay.analyze.intersect=\u041F\u043E\u0438\u0441\u043A \u043F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u0439 +powerplay.analyze.near=\u041F\u043E\u0438\u0441\u043A \u0431\u043B\u0438\u0436\u0430\u0439\u0448\u0438\u0445 \u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u0439 +powerplay.analyze.maxIntersect=\u041F\u043E\u0438\u0441\u043A \u0441 \u043C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u043C \u043F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u0435\u043C +powerplay.analyze.expansions=\u0411\u043B\u0438\u0436\u0430\u0439\u0448\u0438\u0435 \u044D\u043A\u0441\u043F\u0430\u043D\u0441\u0438\u0438 +powerplay.analyze.controlling=\u0421\u0438\u0441\u0442\u0435\u043C\u044B \u0432 \u043F\u043E\u0434\u043A\u043E\u043D\u0442\u0440\u043E\u043B\u044C\u043D\u043E\u043C \u0440\u0430\u0434\u0438\u0443\u0441\u0435 +powerplay.analyze.search=\u041D\u0430\u0447\u0430\u0442\u044C \u0430\u043D\u0430\u043B\u0438\u0437 +powerplay.label.checked=\u041F\u0440\u043E\u0432\u0435\u0440\u044F\u0435\u043C\u0430\u044F \u0441\u0438\u0441\u0442\u0435\u043C\u0430: +powerplay.label.headquarter=\u0428\u0442\u0430\u0431 \u0441\u0438\u043B\u044B: +powerplay.label.controlling=\u041A\u043E\u043D\u0442\u0440\u043E\u043B\u043B\u0438\u0440\u0443\u0435\u043C\u044B\u0435 \u0441\u0438\u0441\u0442\u0435\u043C\u044B: +powerplay.label.power.systems=C\u0438\u0441\u0442\u0435\u043C\u044B \u0441\u0438\u043B\u044B: +powerplay.label.power.state=\u0421\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435: +powerplay.label.populationSumm=\u0421\u0443\u043C\u043C\u0430 \u043D\u0430\u0441\u0435\u043B\u0435\u043D\u0438\u044F: +powerplay.result.title=\u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u044B \u0430\u043D\u0430\u043B\u0438\u0437\u0430 +powerplay.column.intersecting=\u041F\u0435\u0440\u0435\u0441\u0435\u043A\u0430\u0435\u0442\u0441\u044F \u0441 +powerplay.column.intersectCount=\u041F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u0439 +powerplay.column.distanceHQ=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F \u0434\u043E HQ +powerplay.detail.title=\u0421\u0438\u0441\u0442\u0435\u043C\u044B \u0432 \u0440\u0430\u0434\u0438\u0443\u0441\u0435 15 LY + #helper helper.system=\u0421\u0438\u0441\u0442\u0435\u043C\u0430: helper.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F: diff --git a/client/src/main/resources/view/powerplay.fxml b/client/src/main/resources/view/powerplay.fxml index 3ef5522..fe38f68 100644 --- a/client/src/main/resources/view/powerplay.fxml +++ b/client/src/main/resources/view/powerplay.fxml @@ -14,10 +14,10 @@ prefHeight="500" > - + - - - - - - - + + + + + - - - @@ -89,17 +89,17 @@ - + - + - + @@ -122,23 +122,23 @@ - + - + - + - + - + - + @@ -154,12 +154,12 @@ - + - + @@ -182,17 +182,17 @@ - + - + - + - + @@ -207,7 +207,7 @@ - +