Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Commit 9423902

Browse files
author
Claudio Nave
committed
Razionalizzata schermata frazioni generatrici
1 parent 8a636dc commit 9423902

File tree

4 files changed

+86
-21
lines changed

4 files changed

+86
-21
lines changed

‎build.fxbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="ASCII"?>
22
<anttasks:AntTask xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:anttasks="http://org.eclipse.fx.ide.jdt/1.0" buildDirectory="${project}/build">
33
<deploy packagingFormat="none">
4-
<application name="MathSupport" mainclass="it.nave.math.Main" version="0.1"/>
4+
<application name="MathSupport" mainclass="it.nave.math.Main" version="1.1"/>
55
<info title="MathSupport" vendor="Navesoft"/>
66
</deploy>
77
<signjar/>

‎resources/Frazioni.fxml

Lines changed: 78 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,85 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3+
<?import javafx.geometry.Insets?>
34
<?import javafx.scene.control.Button?>
45
<?import javafx.scene.control.Label?>
6+
<?import javafx.scene.control.ScrollPane?>
57
<?import javafx.scene.control.TextField?>
6-
<?import javafx.scene.layout.AnchorPane?>
8+
<?import javafx.scene.layout.ColumnConstraints?>
9+
<?import javafx.scene.layout.GridPane?>
10+
<?import javafx.scene.layout.HBox?>
11+
<?import javafx.scene.layout.RowConstraints?>
12+
<?import javafx.scene.layout.VBox?>
713
<?import javafx.scene.shape.Line?>
14+
<?import javafx.scene.text.Font?>
815

9-
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="it.nave.math.controller.FrazioniController">
10-
<children>
11-
<Label layoutX="280.0" layoutY="31.0" text="Frazioni generatrici" />
12-
<TextField fx:id="input" layoutX="191.0" layoutY="96.0" promptText="Numero decimale" />
13-
<TextField fx:id="numeratore1" layoutX="182.0" layoutY="229.0" promptText="Numeratore" />
14-
<TextField fx:id="denominatore1" layoutX="182.0" layoutY="296.0" promptText="Denominatore" />
15-
<TextField fx:id="numeratore2" layoutX="381.0" layoutY="242.0" promptText="Numeratore semplificato" />
16-
<TextField fx:id="denominatore2" layoutX="381.0" layoutY="296.0" promptText="Denominatore semplificato" />
17-
<Label layoutX="55.0" layoutY="100.0" text="Numero decimale" />
18-
<Label layoutX="229.0" layoutY="183.0" text="Frazione generatrice" />
19-
<Label layoutX="381.0" layoutY="192.0" text="Frazione generatrice semplificata" />
20-
<Line endX="65.0" layoutX="257.0" layoutY="277.0" startX="-73.0" />
21-
<Line endX="61.0" layoutX="468.0" layoutY="278.0" startX="-80.0" />
22-
<Button layoutX="114.0" layoutY="350.0" mnemonicParsing="false" onAction="#genera" text="GENERA" />
23-
<Button layoutX="388.0" layoutY="350.0" mnemonicParsing="false" onAction="#backToHome" text="INDIETRO" />
24-
</children>
25-
</AnchorPane>
16+
<ScrollPane fitToHeight="true" fitToWidth="true" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="it.nave.math.controller.FrazioniController">
17+
<content>
18+
<GridPane hgap="20.0" prefHeight="450.0" prefWidth="550.0" vgap="20.0">
19+
<columnConstraints>
20+
<ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" percentWidth="50.0" />
21+
<ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" />
22+
</columnConstraints>
23+
<rowConstraints>
24+
<RowConstraints vgrow="SOMETIMES" />
25+
<RowConstraints vgrow="SOMETIMES" />
26+
<RowConstraints vgrow="SOMETIMES" />
27+
<RowConstraints vgrow="SOMETIMES" />
28+
</rowConstraints>
29+
<children>
30+
<Label maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="45.0" prefWidth="252.0" text="Frazioni generatrici" textFill="RED" GridPane.columnSpan="2147483647">
31+
<font>
32+
<Font size="30.0" />
33+
</font>
34+
</Label>
35+
<HBox alignment="CENTER" spacing="20.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1">
36+
<children>
37+
<Label maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="126.0" text="Numero decimale">
38+
<font>
39+
<Font size="16.0" />
40+
</font>
41+
</Label>
42+
<TextField fx:id="input" maxHeight="-Infinity" maxWidth="400.0" minHeight="-Infinity" minWidth="100.0" prefHeight="25.0" promptText="Numero decimale" />
43+
</children>
44+
</HBox>
45+
<VBox alignment="CENTER" spacing="10.0" GridPane.rowIndex="2">
46+
<children>
47+
<Label maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="144.0" text="Frazione generatrice">
48+
<font>
49+
<Font size="16.0" />
50+
</font>
51+
</Label>
52+
<TextField fx:id="numeratore1" maxHeight="-Infinity" maxWidth="400.0" minHeight="-Infinity" minWidth="100.0" prefHeight="25.0" promptText="Numeratore" />
53+
<Line endX="145.5" startX="-73.0" />
54+
<TextField fx:id="denominatore1" maxHeight="-Infinity" maxWidth="400.0" minHeight="-Infinity" minWidth="100.0" prefHeight="25.0" promptText="Denominatore" />
55+
</children>
56+
</VBox>
57+
<VBox alignment="CENTER" spacing="10.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
58+
<children>
59+
<Label maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="232.0" text="Frazione generatrice semplificata">
60+
<font>
61+
<Font size="16.0" />
62+
</font>
63+
</Label>
64+
<TextField fx:id="numeratore2" maxHeight="-Infinity" maxWidth="400.0" minHeight="-Infinity" minWidth="100.0" prefHeight="25.0" promptText="Numeratore semplificato" />
65+
<Line endX="152.5" startX="-73.0" />
66+
<TextField fx:id="denominatore2" maxHeight="-Infinity" maxWidth="400.0" minHeight="-Infinity" minWidth="100.0" prefHeight="25.0" promptText="Denominatore semplificato" />
67+
</children>
68+
</VBox>
69+
<Button maxHeight="102.0" maxWidth="200.0" minHeight="39.0" minWidth="103.0" mnemonicParsing="false" onAction="#genera" text="GENERA" GridPane.rowIndex="3">
70+
<font>
71+
<Font size="18.0" />
72+
</font>
73+
</Button>
74+
<Button maxHeight="102.0" maxWidth="200.0" minHeight="39.0" minWidth="103.0" mnemonicParsing="false" onAction="#backToHome" text="INDIETRO" GridPane.columnIndex="1" GridPane.rowIndex="3">
75+
<font>
76+
<Font size="18.0" />
77+
</font>
78+
</Button>
79+
</children>
80+
<padding>
81+
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
82+
</padding>
83+
</GridPane>
84+
</content>
85+
</ScrollPane>

‎src/it/nave/math/controller/FrazioniController.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ private void backToHome() throws IOException {
3434

3535
@FXML
3636
private void genera() {
37-
Fraction f = new Fraction(input.getText());
37+
Fraction f;
38+
try {
39+
f = new Fraction(input.getText());
40+
} catch (IllegalArgumentException e) {
41+
Tool.inputNotValid("La stringa non è un decimale valido");
42+
return;
43+
}
3844
scriviFrazione(f);
3945
}
4046

‎src/it/nave/math/support/Tool.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public static Stage setStandardStage(Stage stage, String fxmlFile, String title)
3333
Parent root = FXMLLoader.load(Tool.class.getClassLoader().getResource(fxmlFile));
3434
stage.setTitle(title);
3535
stage.setScene(new Scene(root));
36-
// stage.setResizable(false); // FIXME computazionalmente più efficiente di rendere gli elementi dinamici
3736
return stage;
3837
}
3938

0 commit comments

Comments
 (0)