Skip to content
Snippets Groups Projects
Commit 7072f1a6 authored by Masson Lea's avatar Masson Lea
Browse files

Merge branch 'master' of https://gitlab.insa-rennes.fr/alex/plante-qui-pleure

parents 229f6a8b 8aa0846f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/src/Vue/FXMLVue.fxml
+ 58
− 60
View file @ 7072f1a6
......@@ -34,7 +34,7 @@
<children>
<Label text="La plante qui pleure" textAlignment="CENTER" GridPane.halignment="CENTER">
<font>
<Font name="Trebuchet MS Bold" size="28.0" />
<Font name="Trebuchet MS Bold" size="36.0" />
</font>
</Label>
<GridPane fx:id="accueil" style="-fx-background-color: white;" GridPane.rowIndex="1">
......@@ -52,111 +52,111 @@
<children>
<Label text="Informations générales" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<font>
<Font name="System Bold Italic" size="18.0" />
<Font name="System Bold Italic" size="21.0" />
</font>
</Label>
<Label text="Informations sur la plante" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<font>
<Font name="System Bold Italic" size="18.0" />
<Font name="System Bold Italic" size="21.0" />
</font></Label>
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
<children>
<ImageView fitHeight="35.0" fitWidth="37.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="70.0" fitWidth="70.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@images/temperature.jpg" />
</image></ImageView>
<Label text="température">
<Label text="Température :">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label fx:id="temperature" text="-1">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label text="°C">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
</children>
</HBox>
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
<children>
<ImageView fitHeight="35.0" fitWidth="37.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="70.0" fitWidth="70.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@images/intensity.jpg" />
</image></ImageView>
<Label text="luminosité">
<Label text="Luminosité :">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label fx:id="intensity" text="-1">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label text="\%">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
</children>
</HBox>
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
<children>
<ImageView fitHeight="35.0" fitWidth="37.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="70.0" fitWidth="70.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@images/humidity.png" />
</image></ImageView>
<Label text="humidité dans l'air">
<Label text="Humidité air : ">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label fx:id="humidityAir" text="-1">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label text="\%">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
</children>
</HBox>
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
<children>
<ImageView fitHeight="35.0" fitWidth="37.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="70.0" fitWidth="70.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@images/humidity.png" />
</image></ImageView>
<Label text="humidité plante">
<Label text="Humidité plante :">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label fx:id="humidityPlante" text="-1">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label text="\%">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
</children>
</HBox>
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
<children>
<ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="70.0" fitWidth="70.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@images/seuil.jpg" />
</image></ImageView>
<Label text="seuil d'humidité">
<Label text="Seuil d'humidité :">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label fx:id="humiditySeuil" text="50">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
<Label text="\%">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font></Label>
</children>
<GridPane.margin>
......@@ -241,38 +241,36 @@
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="63.0" minHeight="10.0" prefHeight="63.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="92.0" minHeight="0.0" prefHeight="31.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="135.66665649414062" minHeight="0.0" prefHeight="48.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="135.66665649414062" minHeight="10.0" prefHeight="48.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="123.66665649414062" minHeight="10.0" prefHeight="123.66665649414062" vgrow="SOMETIMES" />
<RowConstraints maxHeight="135.66665649414062" minHeight="0.0" prefHeight="119.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="135.66665649414062" minHeight="10.0" prefHeight="108.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="135.66665649414062" minHeight="10.0" prefHeight="105.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="10.0">
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<children>
<Label text="Seuil d'humidité minimum tolérable : " wrapText="true">
<Label text="Seuil d'humidité minimum tolérable " wrapText="true">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font>
</Label>
<Slider fx:id="seuil" blockIncrement="1.0" majorTickUnit="10" max="90" min="10" minorTickCount="0" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="50" />
<!--TextField fx:id="seuil" alignment="CENTER_RIGHT" promptText="&lt;100" text="50"/-->
<Label text=" %" wrapText="true" />
<HBox alignment="CENTER" prefHeight="74.0" prefWidth="580.0" spacing="10.0">
<children>
<Slider fx:id="seuil" blockIncrement="1.0" majorTickUnit="10" max="90" min="10" minorTickCount="0" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="50" />
<!--TextField fx:id="seuil" alignment="CENTER_RIGHT" promptText="&lt;100" text="50"/-->
<Label text=" (%)" wrapText="true" />
</children>
</HBox>
</children>
<GridPane.margin>
<Insets />
</GridPane.margin>
</HBox>
<!--Label fx:id="seuilError" textFill="#c70606" wrapText="true" GridPane.halignment="RIGHT" GridPane.rowIndex="1" GridPane.valignment="TOP">
<GridPane.margin>
<Insets right="40.0" />
<Insets top="10.0" />
</GridPane.margin>
</Label-->
<HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.rowIndex="2">
</VBox>
<VBox alignment="CENTER" prefHeight="82.0" prefWidth="580.0" spacing="15.0" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
<children>
<Label text="Activer l'arrosage automatique : " wrapText="true">
<font>
<Font size="14.0" />
<Font size="18.0" />
</font>
</Label>
<CheckBox fx:id="arrosageAuto" mnemonicParsing="false" onAction="#clickAuto" prefHeight="22.0" prefWidth="94.0" text="Désactivé">
......@@ -280,8 +278,18 @@
<Font size="14.0" />
</font></CheckBox>
</children>
</HBox>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" spacing="10.0" GridPane.halignment="CENTER" GridPane.rowIndex="4" GridPane.valignment="CENTER">
</VBox>
<VBox alignment="CENTER" prefHeight="117.0" prefWidth="580.0" spacing="10.0" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
<children>
<Label text="Adresse email : ">
<font>
<Font size="18.0" />
</font>
</Label>
<TextField fx:id="emailAdress" alignment="CENTER" maxWidth="-Infinity" prefWidth="300.0" promptText="ex@example.com" />
</children>
</VBox>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" spacing="10.0" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
<children>
<Button fx:id="buttonBluetooth" mnemonicParsing="false" onAction="#clickActivationBluetooth" text="Activation bluetooth">
<font>
......@@ -296,19 +304,9 @@
<Insets bottom="10.0" top="10.0" />
</GridPane.margin>
</VBox>
<HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.rowIndex="3">
<children>
<Label text="Adresse email : ">
<font>
<Font size="14.0" />
</font>
</Label>
<TextField fx:id="emailAdress" alignment="CENTER_RIGHT" prefHeight="25.0" prefWidth="206.0" promptText="ex@example.com" />
</children>
</HBox>
</children>
<GridPane.margin>
<Insets left="10.0" right="10.0" />
<Insets left="30.0" right="10.0" />
</GridPane.margin>
</GridPane>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="30.0" style="-fx-background-color: white;" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
......
app/src/app/App.java
+ 1
− 1
View file @ 7072f1a6
......@@ -27,7 +27,7 @@ public class App extends Application {
Scene scene = new Scene(root);
stage.getIcons().add(new Image("/Vue/images/logo.png"));
stage.setTitle("La plante qui pleure");
stage.setResizable(true);
stage.setResizable(false);
stage.setScene(scene);
stage.show();
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment