From 3dec44ada139584e31c5cbbfbc085c82524ffc9c Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Wed, 27 Mar 2019 13:10:21 +0100 Subject: [PATCH] EDIT::Finished Travel GUI section of calculator --- .../controller/CalculatorController.java | 45 +++++++--- .../src/main/resources/fxml/calculator.fxml | 90 ++++++++++++++++++- .../resources/stylesheets/calculatorStyle.css | 6 ++ 3 files changed, 126 insertions(+), 15 deletions(-) diff --git a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java index fd77140..ac525dd 100644 --- a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java +++ b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java @@ -18,16 +18,6 @@ public class CalculatorController { @Autowired UserService userService; - @FXML - private Button calculatorGetStartedButton; - @FXML - private Button calculatorTravelButton; - @FXML - private Button calculatorHomeButton; - @FXML - private Button calculatorFoodButton; - @FXML - private Button calculatorShoppingButton; @FXML private AnchorPane getStartedPane; @FXML @@ -48,12 +38,29 @@ public class CalculatorController { private Label annualIncomeLabel; @FXML private Button saveButton; - // @FXML - // private Button getStartedNextButton; + //travel pane @FXML private TextField publicTransitField; @FXML private TextField airplaneTravelField; + @FXML + private TextField carTravelGasolineField; + @FXML + private Slider carTravelGasolineSlider; + @FXML + private Label carTravelGasolineLabel; + @FXML + private TextField carTravelDieselField; + @FXML + private Slider carTravelDieselSlider; + @FXML + private Label carTravelDieselLabel; + @FXML + private TextField carTravelElectricField; + @FXML + private Slider carTravelElectricSlider; + @FXML + private Label carTravelElectricLabel; /** * initializes the window, performs some actions before loading all other things. @@ -80,6 +87,20 @@ public class CalculatorController { annualIncomeLabel.setText("" + (newValue.intValue() * 1000)); } }); + + addSliderListenerCarUsage(carTravelGasolineSlider, carTravelGasolineLabel); + addSliderListenerCarUsage(carTravelDieselSlider, carTravelDieselLabel); + addSliderListenerCarUsage(carTravelElectricSlider, carTravelElectricLabel); + } + + private void addSliderListenerCarUsage(Slider slider, Label label) { + slider.valueProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, + Number oldValue, Number newValue) { + label.setText(newValue.intValue() + "L/km"); + } + }); } /** diff --git a/src/Client/src/main/resources/fxml/calculator.fxml b/src/Client/src/main/resources/fxml/calculator.fxml index 8e91268..44bec69 100644 --- a/src/Client/src/main/resources/fxml/calculator.fxml +++ b/src/Client/src/main/resources/fxml/calculator.fxml @@ -141,7 +141,85 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -157,13 +235,19 @@ - + + + + - + + + + diff --git a/src/Client/src/main/resources/stylesheets/calculatorStyle.css b/src/Client/src/main/resources/stylesheets/calculatorStyle.css index a60f95f..c205ea7 100644 --- a/src/Client/src/main/resources/stylesheets/calculatorStyle.css +++ b/src/Client/src/main/resources/stylesheets/calculatorStyle.css @@ -36,6 +36,12 @@ -fx-padding: 0 0 0 3px; } +.km-indicator { + -fx-background-color: #89a888; + -fx-background-radius: 5px; + -fx-border-radius: 5px; +} +