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

Moved Splash HR dialog to Splash

Browse source
This commit is contained in:
Carlos Galindo 2016-05-25 11:02:05 +02:00
parent cd465af904
commit 435c695ab7
Signed by: kauron
GPG key ID: 83E68706DEE119A3
5 changed files with 67 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
src/main/java/es/kauron/estraba/controller/SplashController.java
View file

@ -30,6 +30,7 @@ import com.jfoenix.controls.JFXSnackbar;
import com.jfoenix.controls.JFXSpinner; import com.jfoenix.controls.JFXSpinner;
import es.kauron.estraba.App; import es.kauron.estraba.App;
import es.kauron.estraba.model.DataBundle; import es.kauron.estraba.model.DataBundle;
import javafx.application.Platform;
import javafx.concurrent.Task; import javafx.concurrent.Task;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
@ -37,16 +38,14 @@ import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.Parent; import javafx.scene.Parent;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.Dialog;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.*; import javafx.scene.control.Spinner;
import javafx.scene.control.SpinnerValueFactory;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.input.Dragboard; import javafx.scene.input.Dragboard;
import javafx.scene.input.TransferMode; import javafx.scene.input.TransferMode;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import javafx.stage.FileChooser; import javafx.stage.FileChooser;
import javafx.stage.Stage; import javafx.stage.Stage;
@ -80,6 +79,12 @@ public class SplashController implements Initializable{
@FXML @FXML
private JFXButton buttonLoad; private JFXButton buttonLoad;
@FXML
private Text textHR, textAge;
@FXML
private Spinner<Integer> spinnerAge, spinnerHR;
private JFXSnackbar snackbar; private JFXSnackbar snackbar;
private File file; private File file;
private int maxHR; private int maxHR;
@ -98,9 +103,11 @@ public class SplashController implements Initializable{
} }
public void loadGPXFile(File file) { public void loadGPXFile(File file) {
maxHR = showHRDialog();
if (maxHR < 0) errorLoading();
buttonLoad.setVisible(false); buttonLoad.setVisible(false);
textAge.setVisible(false);
textHR.setVisible(false);
spinnerAge.setVisible(false);
spinnerHR.setVisible(false);
labelWelcome.setVisible(false); labelWelcome.setVisible(false);
spinner.setVisible(true); spinner.setVisible(true);
snackbar.show("Loading file", 5000); snackbar.show("Loading file", 5000);
@ -109,7 +116,7 @@ public class SplashController implements Initializable{
protected DataBundle call() throws Exception { protected DataBundle call() throws Exception {
DataBundle db = null; DataBundle db = null;
try { try {
db = DataBundle.loadFrom(file, maxHR); db = DataBundle.loadFrom(file, spinnerHR.getValue());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -158,65 +165,46 @@ public class SplashController implements Initializable{
} }
}); });
Platform.runLater(() -> root.setOnDragOver(e -> { Platform.runLater(() -> {
Dragboard db = e.getDragboard(); root.setOnDragOver(e -> {
if (db.hasFiles()) { Dragboard db = e.getDragboard();
e.acceptTransferModes(TransferMode.COPY); if (db.hasFiles()) {
} else { e.acceptTransferModes(TransferMode.COPY);
} else {
e.consume();
}
});
root.setOnDragDropped(e -> {
Dragboard db = e.getDragboard();
boolean success = false;
if (db.hasFiles()) {
success = true;
loadGPXFile(db.getFiles().get(0).getAbsoluteFile());
}
e.setDropCompleted(success);
e.consume(); e.consume();
} });
})); });
// Dropping over surface
Platform.runLater(() -> root.setOnDragDropped(e -> {
Dragboard db = e.getDragboard();
boolean success = false;
if (db.hasFiles()) {
success = true;
loadGPXFile(db.getFiles().get(0).getAbsoluteFile());
}
e.setDropCompleted(success);
e.consume();
}));
snackbar.registerSnackbarContainer(root); snackbar.registerSnackbarContainer(root);
spinnerAge.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(18, 99, 25, 1));
spinnerHR.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(60, 202, 195, 5));
spinnerAge.valueProperty().addListener((obs, oldV, newV) ->
spinnerHR.setValueFactory(new SpinnerValueFactory
.IntegerSpinnerValueFactory(60, 202, 220 - newV, 5)));
spinnerHR.valueProperty().addListener((obs, old, newV) ->
spinnerAge.setValueFactory(new SpinnerValueFactory
.IntegerSpinnerValueFactory(18, 99, 220 - newV, 1)));
} }
private void errorLoading() { private void errorLoading() {
textAge.setVisible(true);
textHR.setVisible(true);
spinnerHR.setVisible(true);
spinnerAge.setVisible(true);
buttonLoad.setVisible(true); buttonLoad.setVisible(true);
labelWelcome.setVisible(true); labelWelcome.setVisible(true);
spinner.setVisible(false); spinner.setVisible(false);
snackbar.show(App.GENERAL_BUNDLE.getString("error.file"), 3000); snackbar.show(App.GENERAL_BUNDLE.getString("error.file"), 3000);
} }
private int showHRDialog() {
Dialog<Integer> dialog = new Dialog<>();
dialog.setTitle("Input your maximum heart rate or age");
GridPane grid = new GridPane();
grid.setHgap(5);
grid.setVgap(2);
grid.addColumn(0, new Text("Heart rate:"), new Text("Age:"));
Spinner<Integer> spinnerAge = new Spinner<>(18, 99, 25, 1);
Spinner<Integer> spinnerHR = new Spinner<>(60, 202, 180, 5);
spinnerAge.valueProperty().addListener((obs, oldV, newV) ->
spinnerHR.setValueFactory(new SpinnerValueFactory
.IntegerSpinnerValueFactory(60, 202, 220 - newV, 5)));
spinnerHR.valueProperty().addListener((obs, old, newV) ->
spinnerAge.setValueFactory(new SpinnerValueFactory
.IntegerSpinnerValueFactory(18, 99, 220 - newV, 1)));
grid.addColumn(1, spinnerHR, spinnerAge);
Button buttonOk = new Button("Ok");
buttonOk.setDefaultButton(true);
buttonOk.setOnAction(event -> {
dialog.setResult(spinnerHR.getValue());
dialog.close();
});
grid.add(buttonOk, 1, 2);
dialog.getDialogPane().setContent(grid);
dialog.showAndWait();
if (dialog.getResult() != null)
return dialog.getResult();
else
return -1;
}
} }

31
src/main/resources/es/kauron/estraba/fxml/Splash.fxml
View file

@ -29,24 +29,23 @@
<?import com.jfoenix.controls.JFXSpinner?> <?import com.jfoenix.controls.JFXSpinner?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.control.Spinner?>
<?import javafx.scene.image.ImageView?> <?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.AnchorPane?>
<AnchorPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" maxHeight="-Infinity" maxWidth="-Infinity" <?import javafx.scene.text.Text?>
minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="300.0" styleClass="background"
stylesheets="@../css/palette.css" xmlns="http://javafx.com/javafx/8.0.76-ea" <AnchorPane fx:id="root" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="300.0" styleClass="background" stylesheets="@../css/palette.css" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.estraba.controller.SplashController">
fx:controller="es.kauron.estraba.controller.SplashController">
<ImageView fx:id="imgLogo" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="25.0"> <ImageView fx:id="imgLogo" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="25.0">
</ImageView> </ImageView>
<JFXSpinner fx:id="spinner" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" /> <JFXSpinner fx:id="spinner" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
<Label fx:id="labelWelcome" alignment="CENTER" text="%label.welcome" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" /> <Label fx:id="labelWelcome" alignment="CENTER" layoutX="101.0" layoutY="91.0" text="%label.welcome" />
<StackPane layoutX="-1.0" layoutY="251.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"> <JFXButton fx:id="buttonLoad" layoutX="87.0" layoutY="237.0" maxHeight="-Infinity" maxWidth="-Infinity" onAction="#loadGPXFile" styleClass="default-primary-color" text="%label.loadGPX">
<JFXButton fx:id="buttonLoad" maxHeight="-Infinity" maxWidth="-Infinity" onAction="#loadGPXFile" styleClass="accent-color" text="%label.loadGPX"> <padding>
<padding> <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
<Insets bottom="15.0" left="15.0" right="15.0" top="15.0" /> </padding>
</padding> </JFXButton>
<StackPane.margin> <Spinner fx:id="spinnerHR" layoutX="124.0" layoutY="118.0" />
<Insets bottom="15.0" left="15.0" right="15.0" top="15.0" /> <Spinner fx:id="spinnerAge" layoutX="124.0" layoutY="150.0" />
</StackPane.margin> <Text fx:id="textHR" layoutX="14.0" layoutY="137.0" strokeType="OUTSIDE" strokeWidth="0.0" text="%label.maxHR" />
</JFXButton> <Text fx:id="textAge" layoutX="14.0" layoutY="169.0" strokeType="OUTSIDE" strokeWidth="0.0" text="%label.age" />
</StackPane>
</AnchorPane> </AnchorPane>

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

@ -26,6 +26,7 @@
app.extension=GPX data files app.extension=GPX data files
app.title=ESTRABA app.title=ESTRABA
error.file=Error loading file error.file=Error loading file
label.age=Age
label.begin=Salida label.begin=Salida
label.cadence=Cadence label.cadence=Cadence
label.distance=Distance label.distance=Distance
@ -33,6 +34,7 @@ label.elevation=Elevation
label.end=Meta label.end=Meta
label.hr=Heart rate label.hr=Heart rate
label.loadGPX=Load GPX file label.loadGPX=Load GPX file
label.maxHR=Max. heart rate
label.motivation=Welcome! label.motivation=Welcome!
label.speed=Speed label.speed=Speed
label.welcome=Welcome! label.welcome=Welcome!

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

@ -26,13 +26,15 @@
app.extension=Arxius GPX app.extension=Arxius GPX
app.title=ESTRABA app.title=ESTRABA
error.file=Error error.file=Error
label.age=Edat
label.begin=Salida label.begin=Salida
label.cadence=Cadencia label.cadence=Cadencia
label.distance=Distancia label.distance=Distancia
label.elevation=Elevacion label.elevation=Elevacion
label.end=Meta label.end=Meta
label.hr=YOLO label.hr=Pulsacions
label.loadGPX=Obrir arxiu GPX label.loadGPX=Obrir arxiu GPX
label.maxHR=Max. pulsacions/min
label.motivation=\u00a1Benvinguts! label.motivation=\u00a1Benvinguts!
label.speed=Speed label.speed=Speed
label.welcome=Benvingut! label.welcome=Benvingut!

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

@ -26,6 +26,7 @@
app.extension=Archivos de datos GPX app.extension=Archivos de datos GPX
app.title=ESTRABA app.title=ESTRABA
error.file=Error al cargar el archivo error.file=Error al cargar el archivo
label.age=Edad
label.begin=Salida label.begin=Salida
label.cadence=Cadencia label.cadence=Cadencia
label.distance=Distancia label.distance=Distancia
@ -33,6 +34,7 @@ label.elevation=Elevacion
label.end=Meta label.end=Meta
label.hr=Pulsaci\u00f3nes label.hr=Pulsaci\u00f3nes
label.loadGPX=Abrir archivo GPX label.loadGPX=Abrir archivo GPX
label.maxHR=Max. pulsaciones/min
label.motivation=\u00a1Bienvenido! label.motivation=\u00a1Bienvenido!
label.speed=Velocidad label.speed=Velocidad
label.welcome=¡Bienvenido! label.welcome=¡Bienvenido!