diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
index c1c7cecf9dbbcf57c4641036a77bc190213c58fb..e27308a9e7953b5e16a42faf6dcefc32def5cd99 100644
--- a/src/main/java/com/application/Main.java
+++ b/src/main/java/com/application/Main.java
@@ -26,7 +26,7 @@ public class Main extends Application {
public void start(Stage primaryStage) throws Exception {
// Loading the GUI-fxml file from resources
- Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/com.application/test.fxml")));
+ Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/com.application/graphical_user_interface.fxml")));
// Sets the scene and defines boundaries
Scene scene = new Scene(root, 1200, 600);
diff --git a/src/main/resources/com.application/graphical_user_interface.fxml b/src/main/resources/com.application/graphical_user_interface.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..6b2bd5ef3d226874dfd39606f44e07bcbbd53adc
--- /dev/null
+++ b/src/main/resources/com.application/graphical_user_interface.fxml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.LineChart?>
+<?import javafx.scene.chart.NumberAxis?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+ <left>
+ <VBox prefHeight="200.0" prefWidth="150.0" BorderPane.alignment="CENTER">
+ <children>
+ <Label prefHeight="17.0" prefWidth="150.0" text="Tree Species" />
+ <TextField />
+ <Label prefHeight="17.0" prefWidth="150.0" text="Width x Height" />
+ <TextField />
+ <Label prefHeight="17.0" prefWidth="150.0" text="Sawsett" />
+ <TextField />
+ <Label prefHeight="17.0" prefWidth="150.0" text="Desired moisture level" />
+ <TextField />
+ <Button mnemonicParsing="false" prefHeight="25.0" prefWidth="150.0" text="Finish" />
+ </children>
+ </VBox>
+ </left>
+ <center>
+ <LineChart BorderPane.alignment="CENTER">
+ <xAxis>
+ <CategoryAxis label="Time" side="BOTTOM" />
+ </xAxis>
+ <yAxis>
+ <NumberAxis label="Kwh" side="LEFT" upperBound="25000.0">
+ <tickLabelFont>
+ <Font name="Arial" size="10.0" />
+ </tickLabelFont>
+ </NumberAxis>
+ </yAxis>
+ </LineChart>
+ </center>
+ <top>
+ <BorderPane prefHeight="80.0" prefWidth="700.0" BorderPane.alignment="CENTER">
+ <center>
+ <AnchorPane prefHeight="78.0" prefWidth="700.0" style="-fx-background-color: rgba(12, 76, 81, 1);" BorderPane.alignment="CENTER">
+ <children>
+ <BorderPane prefHeight="50.0" prefWidth="700.0">
+ <left>
+ <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true" translateX="5.0" BorderPane.alignment="CENTER">
+ <image>
+ <Image url="@moelven_logo_m.jpg" />
+ </image>
+ </ImageView>
+ </left>
+ <center>
+ <ImageView fitHeight="30.0" fitWidth="125.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@moelven_logo_tittle.jpg" />
+ </image>
+ </ImageView>
+ </center>
+ </BorderPane>
+ </children>
+ </AnchorPane>
+ </center>
+ <top>
+ <MenuBar prefHeight="25.0" prefWidth="700.0" BorderPane.alignment="CENTER">
+ <menus>
+ <Menu mnemonicParsing="false" text="File">
+ <items>
+ <MenuItem mnemonicParsing="false" text="Close" />
+ </items>
+ </Menu>
+ <Menu mnemonicParsing="false" text="Edit">
+ <items>
+ <MenuItem mnemonicParsing="false" text="Delete" />
+ </items>
+ </Menu>
+ <Menu mnemonicParsing="false" text="Help">
+ <items>
+ <MenuItem mnemonicParsing="false" text="About" />
+ </items>
+ </Menu>
+ </menus>
+ </MenuBar>
+ </top>
+ </BorderPane>
+ </top>
+</BorderPane>
diff --git a/src/main/resources/com.application/test.fxml b/src/main/resources/com.application/test.fxml
deleted file mode 100644
index b596aa88d227ae031310b24f837f7a339c965f93..0000000000000000000000000000000000000000
--- a/src/main/resources/com.application/test.fxml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.chart.CategoryAxis?>
-<?import javafx.scene.chart.LineChart?>
-<?import javafx.scene.chart.NumberAxis?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SeparatorMenuItem?>
-<?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.VBox?>
-
-<VBox prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
- <children>
- <MenuBar VBox.vgrow="NEVER">
- <menus>
- <Menu mnemonicParsing="false" text="File">
- <items>
- <MenuItem mnemonicParsing="false" text="New" />
- <MenuItem mnemonicParsing="false" text="Open…" />
- <Menu mnemonicParsing="false" text="Open Recent" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Close" />
- <MenuItem mnemonicParsing="false" text="Save" />
- <MenuItem mnemonicParsing="false" text="Save As…" />
- <MenuItem mnemonicParsing="false" text="Revert" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Preferences…" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Quit" />
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="Edit">
- <items>
- <MenuItem mnemonicParsing="false" text="Undo" />
- <MenuItem mnemonicParsing="false" text="Redo" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Cut" />
- <MenuItem mnemonicParsing="false" text="Copy" />
- <MenuItem mnemonicParsing="false" text="Paste" />
- <MenuItem mnemonicParsing="false" text="Delete" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Select All" />
- <MenuItem mnemonicParsing="false" text="Unselect All" />
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="Help">
- <items>
- <MenuItem mnemonicParsing="false" text="About MyHelloApp" />
- </items>
- </Menu>
- </menus>
- </MenuBar>
- <SplitPane focusTraversable="true" prefHeight="-1.0" prefWidth="-1.0">
- <items>
- <AnchorPane prefHeight="170.0" prefWidth="1920.0" style="-fx-background-color: rgba(12, 76, 81, 1);">
- <children>
- <ImageView fitHeight="155.0" fitWidth="246.0" layoutX="5.0" layoutY="5.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="/com.application/moelven_logo_m.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="170.0" fitWidth="700.0" layoutX="610.0" pickOnBounds="true" preserveRatio="true" y="10.0">
- <image>
- <Image url="/com.application/moelven_logo_tittle.jpg" />
- </image>
- </ImageView>
- </children>
- </AnchorPane>
- </items>
- </SplitPane>
- <SplitPane dividerPositions="0.2083333333" prefHeight="885.0" prefWidth="1920.0">
- <items>
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" />
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
- <children>
- <LineChart prefHeight="885.0" prefWidth="1520.0">
- <xAxis>
- <CategoryAxis side="BOTTOM" />
- </xAxis>
- <yAxis>
- <NumberAxis side="LEFT" />
- </yAxis>
- </LineChart>
- </children>
- </AnchorPane>
- </items>
- </SplitPane>
- </children>
-</VBox>
diff --git a/target/classes/com.application/graphical_user_interface.fxml b/target/classes/com.application/graphical_user_interface.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..6b2bd5ef3d226874dfd39606f44e07bcbbd53adc
--- /dev/null
+++ b/target/classes/com.application/graphical_user_interface.fxml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.LineChart?>
+<?import javafx.scene.chart.NumberAxis?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+ <left>
+ <VBox prefHeight="200.0" prefWidth="150.0" BorderPane.alignment="CENTER">
+ <children>
+ <Label prefHeight="17.0" prefWidth="150.0" text="Tree Species" />
+ <TextField />
+ <Label prefHeight="17.0" prefWidth="150.0" text="Width x Height" />
+ <TextField />
+ <Label prefHeight="17.0" prefWidth="150.0" text="Sawsett" />
+ <TextField />
+ <Label prefHeight="17.0" prefWidth="150.0" text="Desired moisture level" />
+ <TextField />
+ <Button mnemonicParsing="false" prefHeight="25.0" prefWidth="150.0" text="Finish" />
+ </children>
+ </VBox>
+ </left>
+ <center>
+ <LineChart BorderPane.alignment="CENTER">
+ <xAxis>
+ <CategoryAxis label="Time" side="BOTTOM" />
+ </xAxis>
+ <yAxis>
+ <NumberAxis label="Kwh" side="LEFT" upperBound="25000.0">
+ <tickLabelFont>
+ <Font name="Arial" size="10.0" />
+ </tickLabelFont>
+ </NumberAxis>
+ </yAxis>
+ </LineChart>
+ </center>
+ <top>
+ <BorderPane prefHeight="80.0" prefWidth="700.0" BorderPane.alignment="CENTER">
+ <center>
+ <AnchorPane prefHeight="78.0" prefWidth="700.0" style="-fx-background-color: rgba(12, 76, 81, 1);" BorderPane.alignment="CENTER">
+ <children>
+ <BorderPane prefHeight="50.0" prefWidth="700.0">
+ <left>
+ <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true" translateX="5.0" BorderPane.alignment="CENTER">
+ <image>
+ <Image url="@moelven_logo_m.jpg" />
+ </image>
+ </ImageView>
+ </left>
+ <center>
+ <ImageView fitHeight="30.0" fitWidth="125.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@moelven_logo_tittle.jpg" />
+ </image>
+ </ImageView>
+ </center>
+ </BorderPane>
+ </children>
+ </AnchorPane>
+ </center>
+ <top>
+ <MenuBar prefHeight="25.0" prefWidth="700.0" BorderPane.alignment="CENTER">
+ <menus>
+ <Menu mnemonicParsing="false" text="File">
+ <items>
+ <MenuItem mnemonicParsing="false" text="Close" />
+ </items>
+ </Menu>
+ <Menu mnemonicParsing="false" text="Edit">
+ <items>
+ <MenuItem mnemonicParsing="false" text="Delete" />
+ </items>
+ </Menu>
+ <Menu mnemonicParsing="false" text="Help">
+ <items>
+ <MenuItem mnemonicParsing="false" text="About" />
+ </items>
+ </Menu>
+ </menus>
+ </MenuBar>
+ </top>
+ </BorderPane>
+ </top>
+</BorderPane>
diff --git a/target/classes/com.application/moelven_logo_m.jpg b/target/classes/com.application/moelven_logo_m.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9140870bda82d1499b6d98df0a71674fd76436ec
Binary files /dev/null and b/target/classes/com.application/moelven_logo_m.jpg differ
diff --git a/target/classes/com.application/moelven_logo_tittle.jpg b/target/classes/com.application/moelven_logo_tittle.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9d3f195108bc799381176c7cd5904ed1ec3fb4f6
Binary files /dev/null and b/target/classes/com.application/moelven_logo_tittle.jpg differ
diff --git a/target/classes/com.application/test.fxml b/target/classes/com.application/test.fxml
deleted file mode 100644
index b596aa88d227ae031310b24f837f7a339c965f93..0000000000000000000000000000000000000000
--- a/target/classes/com.application/test.fxml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.chart.CategoryAxis?>
-<?import javafx.scene.chart.LineChart?>
-<?import javafx.scene.chart.NumberAxis?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SeparatorMenuItem?>
-<?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.VBox?>
-
-<VBox prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
- <children>
- <MenuBar VBox.vgrow="NEVER">
- <menus>
- <Menu mnemonicParsing="false" text="File">
- <items>
- <MenuItem mnemonicParsing="false" text="New" />
- <MenuItem mnemonicParsing="false" text="Open…" />
- <Menu mnemonicParsing="false" text="Open Recent" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Close" />
- <MenuItem mnemonicParsing="false" text="Save" />
- <MenuItem mnemonicParsing="false" text="Save As…" />
- <MenuItem mnemonicParsing="false" text="Revert" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Preferences…" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Quit" />
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="Edit">
- <items>
- <MenuItem mnemonicParsing="false" text="Undo" />
- <MenuItem mnemonicParsing="false" text="Redo" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Cut" />
- <MenuItem mnemonicParsing="false" text="Copy" />
- <MenuItem mnemonicParsing="false" text="Paste" />
- <MenuItem mnemonicParsing="false" text="Delete" />
- <SeparatorMenuItem mnemonicParsing="false" />
- <MenuItem mnemonicParsing="false" text="Select All" />
- <MenuItem mnemonicParsing="false" text="Unselect All" />
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="Help">
- <items>
- <MenuItem mnemonicParsing="false" text="About MyHelloApp" />
- </items>
- </Menu>
- </menus>
- </MenuBar>
- <SplitPane focusTraversable="true" prefHeight="-1.0" prefWidth="-1.0">
- <items>
- <AnchorPane prefHeight="170.0" prefWidth="1920.0" style="-fx-background-color: rgba(12, 76, 81, 1);">
- <children>
- <ImageView fitHeight="155.0" fitWidth="246.0" layoutX="5.0" layoutY="5.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="/com.application/moelven_logo_m.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="170.0" fitWidth="700.0" layoutX="610.0" pickOnBounds="true" preserveRatio="true" y="10.0">
- <image>
- <Image url="/com.application/moelven_logo_tittle.jpg" />
- </image>
- </ImageView>
- </children>
- </AnchorPane>
- </items>
- </SplitPane>
- <SplitPane dividerPositions="0.2083333333" prefHeight="885.0" prefWidth="1920.0">
- <items>
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" />
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
- <children>
- <LineChart prefHeight="885.0" prefWidth="1520.0">
- <xAxis>
- <CategoryAxis side="BOTTOM" />
- </xAxis>
- <yAxis>
- <NumberAxis side="LEFT" />
- </yAxis>
- </LineChart>
- </children>
- </AnchorPane>
- </items>
- </SplitPane>
- </children>
-</VBox>
diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
index 8175cc9592a6162dd4a0b51cfa64212538e554e0..c143ec51f6bd319decc4b52314c03aae8995b417 100644
Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ