fixed paths, fixed some FXML mistakes, added icons to Initialize (not yet working)
13
.idea/libraries/Maven__org_vesalainen_gpx_GPX11_1_0_2.xml
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
<component name="libraryTable">
|
||||||
|
<library name="Maven: org.vesalainen.gpx:GPX11:1.0.2">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$MAVEN_REPOSITORY$/org/vesalainen/gpx/GPX11/1.0.2/GPX11-1.0.2.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC>
|
||||||
|
<root url="jar://$MAVEN_REPOSITORY$/org/vesalainen/gpx/GPX11/1.0.2/GPX11-1.0.2-javadoc.jar!/" />
|
||||||
|
</JAVADOC>
|
||||||
|
<SOURCES>
|
||||||
|
<root url="jar://$MAVEN_REPOSITORY$/org/vesalainen/gpx/GPX11/1.0.2/GPX11-1.0.2-sources.jar!/" />
|
||||||
|
</SOURCES>
|
||||||
|
</library>
|
||||||
|
</component>
|
|
@ -50,7 +50,7 @@ public class App extends Application {
|
||||||
@Override
|
@Override
|
||||||
public void start(Stage stage) throws Exception {
|
public void start(Stage stage) throws Exception {
|
||||||
FXMLLoader loader = new FXMLLoader(
|
FXMLLoader loader = new FXMLLoader(
|
||||||
App.class.getResource("fxml/App.fxml"), GENERAL_BUNDLE);
|
App.class.getResource("fxml/Dashboard.fxml"), GENERAL_BUNDLE);
|
||||||
Parent root = loader.load();
|
Parent root = loader.load();
|
||||||
stage.getIcons().add(new Image(App.class.getResource("img/icon.png").toString()));
|
stage.getIcons().add(new Image(App.class.getResource("img/icon.png").toString()));
|
||||||
stage.setTitle("ESTRABA");
|
stage.setTitle("ESTRABA");
|
||||||
|
|
|
@ -1,11 +1,17 @@
|
||||||
package es.kauron.estraba.controller;
|
package es.kauron.estraba.controller;
|
||||||
|
|
||||||
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXListView;
|
import com.jfoenix.controls.JFXListView;
|
||||||
|
import com.jfoenix.controls.JFXTabPane;
|
||||||
import com.lynden.gmapsfx.GoogleMapView;
|
import com.lynden.gmapsfx.GoogleMapView;
|
||||||
|
import es.kauron.estraba.App;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.fxml.Initializable;
|
import javafx.fxml.Initializable;
|
||||||
import javafx.scene.chart.AreaChart;
|
import javafx.scene.chart.AreaChart;
|
||||||
import javafx.scene.chart.LineChart;
|
import javafx.scene.chart.LineChart;
|
||||||
import javafx.scene.control.Tab;
|
import javafx.scene.control.Tab;
|
||||||
|
import javafx.scene.image.Image;
|
||||||
|
import javafx.scene.image.ImageView;
|
||||||
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.ResourceBundle;
|
import java.util.ResourceBundle;
|
||||||
|
@ -17,6 +23,9 @@ import java.util.ResourceBundle;
|
||||||
|
|
||||||
public class DashboardController implements Initializable {
|
public class DashboardController implements Initializable {
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private JFXTabPane root;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private Tab tabDashboard;
|
private Tab tabDashboard;
|
||||||
|
|
||||||
|
@ -29,26 +38,42 @@ public class DashboardController implements Initializable {
|
||||||
@FXML
|
@FXML
|
||||||
private JFXListView<?> mapSummary;
|
private JFXListView<?> mapSummary;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private JFXButton elevationButton;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private JFXButton speedButton;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private JFXButton hrButton;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private JFXButton cadenceButton;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private Tab tabGraph;
|
private Tab tabGraph;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private AreaChart<?, ?> elevationChart;
|
private AreaChart<Double, Double> elevationChart;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private LineChart<?, ?> speedChart;
|
private LineChart<Double, Double> speedChart;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private LineChart<?, ?> hrChart;
|
private LineChart<Double, Double> hrChart;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private LineChart<?, ?> cadenceChart;
|
private LineChart<Double, Double> cadenceChart;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private Tab tabSettings;
|
private Tab tabSettings;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initialize(URL location, ResourceBundle resources) {
|
public void initialize(URL location, ResourceBundle resources) {
|
||||||
|
elevationButton.setGraphic(new ImageView(new Image(App.class.getResourceAsStream("img/elevation.png"))));
|
||||||
|
speedButton.setGraphic(new ImageView(new Image(App.class.getResourceAsStream("img/speed.png"))));
|
||||||
|
hrButton.setGraphic(new ImageView(new Image(App.class.getResourceAsStream("img/hr.png"))));
|
||||||
|
cadenceButton.setGraphic(new ImageView(new Image(App.class.getResourceAsStream("img/cadence.png"))));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
<?import javafx.scene.control.Label?>
|
<?import javafx.scene.control.Label?>
|
||||||
<?import javafx.scene.control.Tab?>
|
<?import javafx.scene.control.Tab?>
|
||||||
<?import javafx.scene.layout.AnchorPane?>
|
<?import javafx.scene.layout.AnchorPane?>
|
||||||
|
<?import javafx.scene.layout.HBox?>
|
||||||
|
<?import javafx.scene.layout.VBox?>
|
||||||
<?import javafx.scene.text.Font?>
|
<?import javafx.scene.text.Font?>
|
||||||
<?import jfxtras.scene.layout.HBox?>
|
|
||||||
<?import jfxtras.scene.layout.VBox?>
|
|
||||||
|
|
||||||
<JFXTabPane prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
|
<JFXTabPane fx:id="root" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
|
||||||
<tabs>
|
<tabs>
|
||||||
<Tab fx:id="tabDashboard" text="%tab.dashboard">
|
<Tab fx:id="tabDashboard" text="%tab.dashboard">
|
||||||
<content>
|
<content>
|
||||||
|
@ -34,20 +34,20 @@
|
||||||
<content>
|
<content>
|
||||||
<VBox>
|
<VBox>
|
||||||
<children>
|
<children>
|
||||||
<HBox>
|
<HBox VBox.vgrow="ALWAYS">
|
||||||
<children>
|
<children>
|
||||||
<GoogleMapView fx:id="mapView" />
|
<GoogleMapView fx:id="mapView" HBox.hgrow="ALWAYS" />
|
||||||
<JFXListView fx:id="mapSummary" minWidth="100.0" />
|
<JFXListView fx:id="mapSummary" minWidth="100.0" />
|
||||||
</children>
|
</children>
|
||||||
</HBox>
|
</HBox>
|
||||||
<HBox minHeight="128.0" prefHeight="0.0">
|
<HBox minHeight="128.0" prefHeight="0.0">
|
||||||
<children>
|
<children>
|
||||||
<VBox prefHeight="200.0" prefWidth="100.0">
|
<VBox prefHeight="200.0" prefWidth="100.0" HBox.hgrow="ALWAYS">
|
||||||
<children>
|
<children>
|
||||||
<JFXButton minHeight="32.0" minWidth="32.0" />
|
<JFXButton fx:id="elevationButton" minHeight="32.0" minWidth="32.0" />
|
||||||
<JFXButton layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
|
<JFXButton fx:id="speedButton" layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
|
||||||
<JFXButton layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
|
<JFXButton fx:id="hrButton" layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
|
||||||
<JFXButton layoutX="10.0" layoutY="42.0" minHeight="32.0" minWidth="32.0" />
|
<JFXButton fx:id="cadenceButton" layoutX="10.0" layoutY="42.0" minHeight="32.0" minWidth="32.0" />
|
||||||
</children>
|
</children>
|
||||||
</VBox>
|
</VBox>
|
||||||
<LineChart minHeight="100.0" prefWidth="9999.0">
|
<LineChart minHeight="100.0" prefWidth="9999.0">
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 922 B After Width: | Height: | Size: 922 B |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 822 B After Width: | Height: | Size: 822 B |
Before Width: | Height: | Size: 857 B After Width: | Height: | Size: 857 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 3 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
label.welcome=Welcome!
|
||||||
|
tab.dashboard=Dashboard
|
||||||
|
tab.graph=Stats
|
||||||
|
tab.map=Your Route
|
||||||
|
tab.settings=Settings
|
|
@ -0,0 +1,5 @@
|
||||||
|
label.welcome=¡Benvinguts!
|
||||||
|
tab.dashboard=Sumari
|
||||||
|
tab.graph=Estadístiques
|
||||||
|
tab.map=La teva ruta
|
||||||
|
tab.settings=Ajustos
|
|
@ -0,0 +1,5 @@
|
||||||
|
label.welcome=¡Bienvenido!
|
||||||
|
tab.dashboard=Resúmen
|
||||||
|
tab.graph=Estadísticas
|
||||||
|
tab.map=Tu ruta
|
||||||
|
tab.settings=Ajustes
|