kauron/estraba
kauron/estraba
Archived
1
0
Fork 0
Code Releases Wiki Activity

Added toggle for time/distance

Browse source
This commit is contained in:
Carlos Galindo 2016-05-25 11:44:14 +02:00
parent 5c09e8b074
commit 5c6f8db4da
Signed by: kauron
GPG key ID: 83E68706DEE119A3
5 changed files with 176 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/es/kauron/estraba/controller/DashboardController.java
View file

@ -45,12 +45,13 @@ import javafx.scene.Scene;
import javafx.scene.chart.AreaChart; import javafx.scene.chart.AreaChart;
import javafx.scene.chart.LineChart; import javafx.scene.chart.LineChart;
import javafx.scene.chart.PieChart; import javafx.scene.chart.PieChart;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.Tab; import javafx.scene.control.Tab;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.StackPane;
import javafx.stage.Stage; import javafx.stage.Stage;
import jgpx.model.analysis.Chunk; import jgpx.model.analysis.Chunk;
@ -65,8 +66,8 @@ import java.util.ResourceBundle;
public class DashboardController implements Initializable, MapComponentInitializedListener { public class DashboardController implements Initializable, MapComponentInitializedListener {
final int N = 0, S = 1, E = 2, W = 3; private final int N = 0, S = 1, E = 2, W = 3;
final double[] coord = new double[4]; private final double[] coord = new double[4];
@FXML @FXML
private AnchorPane root; private AnchorPane root;
@FXML @FXML
@ -100,6 +101,12 @@ public class DashboardController implements Initializable, MapComponentInitializ
@FXML @FXML
private LineChart<Long, Double> speedTChart, hrTChart, cadenceTChart; private LineChart<Long, Double> speedTChart, hrTChart, cadenceTChart;
@FXML
private ChoiceBox<String> choiceBox;
@FXML
private StackPane charts;
@Override @Override
public void initialize(URL location, ResourceBundle resources) { public void initialize(URL location, ResourceBundle resources) {
mapView.setVisible(false); mapView.setVisible(false);
@ -116,13 +123,14 @@ public class DashboardController implements Initializable, MapComponentInitializ
imgDate.setImage(new Image(App.class.getResourceAsStream("img/date.png"))); imgDate.setImage(new Image(App.class.getResourceAsStream("img/date.png")));
imgDistance.setImage(new Image(App.class.getResourceAsStream("img/distance.png"))); imgDistance.setImage(new Image(App.class.getResourceAsStream("img/distance.png")));
imgElevation.setImage(new Image(App.class.getResourceAsStream("img/elevation.png"))); imgElevation.setImage(new Image(App.class.getResourceAsStream("img/elevation.png")));
}
@FXML choiceBox.getItems().add(App.GENERAL_BUNDLE.getString("label.distance"));
private void toggleChart(MouseEvent e) { choiceBox.getItems().add(App.GENERAL_BUNDLE.getString("label.time"));
System.out.println("hi"); choiceBox.setValue(choiceBox.getItems().get(0));
for (Node n : ((Node) e.getSource()).getParent().getChildrenUnmodifiable()) choiceBox.valueProperty().addListener((observableValue, s, t1) -> {
for (Node n : charts.getChildrenUnmodifiable())
n.setVisible(!n.isVisible()); n.setVisible(!n.isVisible());
});
} }
@FXML @FXML

151
src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml
View file

@ -25,17 +25,27 @@
~ ~
--> -->
<?import com.jfoenix.controls.*?> <?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXSpinner?>
<?import com.jfoenix.controls.JFXTabPane?>
<?import com.lynden.gmapsfx.GoogleMapView?> <?import com.lynden.gmapsfx.GoogleMapView?>
<?import javafx.geometry.*?> <?import java.lang.String?>
<?import javafx.scene.chart.*?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.chart.AreaChart?>
<?import javafx.scene.image.*?> <?import javafx.scene.chart.LineChart?>
<?import javafx.scene.layout.*?> <?import javafx.scene.chart.NumberAxis?>
<?import javafx.scene.text.*?> <?import javafx.scene.chart.PieChart?>
<?import java.lang.*?> <?import javafx.scene.control.ChoiceBox?>
<AnchorPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" xmlns="http://javafx.com/javafx/8.0.76-ea" <?import javafx.scene.control.Label?>
fx:controller="es.kauron.estraba.controller.DashboardController"> <?import javafx.scene.control.Tab?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<AnchorPane fx:id="root" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.estraba.controller.DashboardController">
<JFXTabPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="1000.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <JFXTabPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="1000.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<Tab fx:id="tabDashboard" styleClass=".estraba.dashboard" text="%tab.dashboard"> <Tab fx:id="tabDashboard" styleClass=".estraba.dashboard" text="%tab.dashboard">
<VBox prefHeight="200.0" prefWidth="100.0"> <VBox prefHeight="200.0" prefWidth="100.0">
@ -63,8 +73,7 @@
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</HBox.margin> </HBox.margin>
<HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" VBox.vgrow="ALWAYS"> <HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<ImageView fx:id="imgHR" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" <ImageView fx:id="imgHR" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass="icon">
preserveRatio="true" styleClass="icon">
</ImageView> </ImageView>
<VBox alignment="CENTER" HBox.hgrow="ALWAYS"> <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
<Label alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="%label.hr"> <Label alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="%label.hr">
@ -120,8 +129,7 @@
</VBox> </VBox>
</HBox> </HBox>
<HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" VBox.vgrow="ALWAYS"> <HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<ImageView fx:id="imgSpeed" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" <ImageView fx:id="imgSpeed" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass="icon">
preserveRatio="true" styleClass="icon">
</ImageView> </ImageView>
<VBox alignment="CENTER" HBox.hgrow="ALWAYS"> <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
<Label alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="%label.speed"> <Label alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="%label.speed">
@ -162,8 +170,7 @@
</VBox> </VBox>
</HBox> </HBox>
<HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" VBox.vgrow="ALWAYS"> <HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<ImageView fx:id="imgCadence" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" <ImageView fx:id="imgCadence" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass="icon">
preserveRatio="true" styleClass="icon">
</ImageView> </ImageView>
<VBox alignment="CENTER" HBox.hgrow="ALWAYS"> <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
<Label alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="%label.cadence"> <Label alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="%label.cadence">
@ -260,8 +267,7 @@
</styleClass> </styleClass>
</Label> </Label>
</VBox> </VBox>
<ImageView fx:id="imgDate" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" <ImageView fx:id="imgDate" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass="icon">
preserveRatio="true" styleClass="icon">
</ImageView> </ImageView>
</HBox> </HBox>
<HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS"> <HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS">
@ -289,8 +295,7 @@
</styleClass> </styleClass>
</Label> </Label>
</VBox> </VBox>
<ImageView fx:id="imgDistance" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" <ImageView fx:id="imgDistance" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass="icon">
preserveRatio="true" styleClass="icon">
</ImageView> </ImageView>
</HBox> </HBox>
<HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS"> <HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS">
@ -346,8 +351,7 @@
</Label> </Label>
</HBox> </HBox>
</VBox> </VBox>
<ImageView fx:id="imgElevation" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" <ImageView fx:id="imgElevation" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass="icon">
preserveRatio="true" styleClass="icon">
</ImageView> </ImageView>
</HBox> </HBox>
</VBox> </VBox>
@ -417,14 +421,16 @@
</VBox> </VBox>
</Tab> </Tab>
<Tab fx:id="tabGraph" text="%tab.graph"> <Tab fx:id="tabGraph" text="%tab.graph">
<VBox> <VBox alignment="CENTER">
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
<StackPane> <ChoiceBox fx:id="choiceBox" prefWidth="150.0" />
<StackPane fx:id="charts">
<children> <children>
<AreaChart fx:id="elevationChart" createSymbols="false" legendVisible="false" minHeight="100.0" <VBox>
onMouseClicked="#toggleChart"> <children>
<AreaChart fx:id="elevationChart" createSymbols="false" legendVisible="false" minHeight="100.0">
<xAxis> <xAxis>
<NumberAxis side="BOTTOM" /> <NumberAxis side="BOTTOM" />
</xAxis> </xAxis>
@ -432,8 +438,35 @@
<NumberAxis side="LEFT" /> <NumberAxis side="LEFT" />
</yAxis> </yAxis>
</AreaChart> </AreaChart>
<AreaChart fx:id="elevationTChart" createSymbols="false" layoutX="10.0" layoutY="10.0" <LineChart fx:id="speedChart" createSymbols="false" legendVisible="false" minHeight="100.0">
legendVisible="false" minHeight="100.0" onMouseClicked="#toggleChart" visible="false"> <xAxis>
<NumberAxis />
</xAxis>
<yAxis>
<NumberAxis side="LEFT" />
</yAxis>
</LineChart>
<LineChart fx:id="hrChart" createSymbols="false" legendVisible="false" minHeight="100.0">
<xAxis>
<NumberAxis side="BOTTOM" />
</xAxis>
<yAxis>
<NumberAxis side="LEFT" />
</yAxis>
</LineChart>
<LineChart fx:id="cadenceChart" createSymbols="false" legendVisible="false" minHeight="100.0">
<xAxis>
<NumberAxis side="BOTTOM" />
</xAxis>
<yAxis>
<NumberAxis side="LEFT" />
</yAxis>
</LineChart>
</children>
</VBox>
<VBox visible="false">
<children>
<AreaChart fx:id="elevationTChart" createSymbols="false" legendVisible="false" minHeight="100.0">
<xAxis> <xAxis>
<NumberAxis /> <NumberAxis />
</xAxis> </xAxis>
@ -441,12 +474,7 @@
<NumberAxis side="LEFT" /> <NumberAxis side="LEFT" />
</yAxis> </yAxis>
</AreaChart> </AreaChart>
</children> <LineChart fx:id="speedTChart" createSymbols="false" legendVisible="false" minHeight="100.0">
</StackPane>
<StackPane>
<children>
<LineChart fx:id="speedChart" createSymbols="false" legendVisible="false" minHeight="100.0"
onMouseClicked="#toggleChart">
<xAxis> <xAxis>
<NumberAxis /> <NumberAxis />
</xAxis> </xAxis>
@ -454,8 +482,15 @@
<NumberAxis side="LEFT" /> <NumberAxis side="LEFT" />
</yAxis> </yAxis>
</LineChart> </LineChart>
<LineChart fx:id="speedTChart" createSymbols="false" layoutX="10.0" layoutY="10.0" <LineChart fx:id="hrTChart" createSymbols="false" legendVisible="false" minHeight="100.0">
legendVisible="false" minHeight="100.0" onMouseClicked="#toggleChart" visible="false"> <xAxis>
<NumberAxis />
</xAxis>
<yAxis>
<NumberAxis side="LEFT" />
</yAxis>
</LineChart>
<LineChart fx:id="cadenceTChart" createSymbols="false" legendVisible="false" minHeight="100.0">
<xAxis> <xAxis>
<NumberAxis /> <NumberAxis />
</xAxis> </xAxis>
@ -464,49 +499,7 @@
</yAxis> </yAxis>
</LineChart> </LineChart>
</children> </children>
</StackPane> </VBox>
<StackPane>
<children>
<LineChart fx:id="hrChart" createSymbols="false" legendVisible="false" minHeight="100.0"
onMouseClicked="#toggleChart">
<xAxis>
<NumberAxis side="BOTTOM"/>
</xAxis>
<yAxis>
<NumberAxis side="LEFT"/>
</yAxis>
</LineChart>
<LineChart fx:id="hrTChart" createSymbols="false" layoutX="10.0" layoutY="10.0" legendVisible="false"
minHeight="100.0" onMouseClicked="#toggleChart" visible="false">
<xAxis>
<NumberAxis/>
</xAxis>
<yAxis>
<NumberAxis side="LEFT"/>
</yAxis>
</LineChart>
</children>
</StackPane>
<StackPane>
<children>
<LineChart fx:id="cadenceChart" createSymbols="false" legendVisible="false" minHeight="100.0"
onMouseClicked="#toggleChart">
<xAxis>
<NumberAxis side="BOTTOM"/>
</xAxis>
<yAxis>
<NumberAxis side="LEFT"/>
</yAxis>
</LineChart>
<LineChart fx:id="cadenceTChart" createSymbols="false" layoutX="10.0" layoutY="10.0"
legendVisible="false" minHeight="100.0" onMouseClicked="#toggleChart" visible="false">
<xAxis>
<NumberAxis/>
</xAxis>
<yAxis>
<NumberAxis side="LEFT"/>
</yAxis>
</LineChart>
</children> </children>
</StackPane> </StackPane>
</VBox> </VBox>

1
src/main/resources/general.properties
View file

@ -37,6 +37,7 @@ label.loadGPX=Load GPX file
label.maxHR=Max. heart rate label.maxHR=Max. heart rate
label.motivation=Welcome! label.motivation=Welcome!
label.speed=Speed label.speed=Speed
label.time=Time
label.welcome=Welcome! label.welcome=Welcome!
tab.dashboard=Dashboard tab.dashboard=Dashboard
tab.graph=Stats tab.graph=Stats

1
src/main/resources/general_ca.properties
View file

@ -37,6 +37,7 @@ label.loadGPX=Obrir arxiu GPX
label.maxHR=Max. pulsacions/min label.maxHR=Max. pulsacions/min
label.motivation=\u00a1Benvinguts! label.motivation=\u00a1Benvinguts!
label.speed=Speed label.speed=Speed
label.time=Temps
label.welcome=Benvingut! label.welcome=Benvingut!
tab.dashboard=Sumari tab.dashboard=Sumari
tab.graph=Estad\u00edstiques tab.graph=Estad\u00edstiques

1
src/main/resources/general_es.properties
View file

@ -37,6 +37,7 @@ label.loadGPX=Abrir archivo GPX
label.maxHR=Max. pulsaciones/min label.maxHR=Max. pulsaciones/min
label.motivation=\u00a1Bienvenido! label.motivation=\u00a1Bienvenido!
label.speed=Velocidad label.speed=Velocidad
label.time=Tiempo
label.welcome=¡Bienvenido! label.welcome=¡Bienvenido!
tab.dashboard=Res\u00famen tab.dashboard=Res\u00famen
tab.graph=Estad\u00edsticas tab.graph=Estad\u00edsticas