diff --git a/src/main/resources/com.application/test.fxml b/src/main/resources/com.application/test.fxml index 3b32926dda06f56a9bcd046eb780532f0754d288..b596aa88d227ae031310b24f837f7a339c965f93 100644 --- a/src/main/resources/com.application/test.fxml +++ b/src/main/resources/com.application/test.fxml @@ -1,22 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import javafx.geometry.Insets?> -<?import javafx.scene.control.Button?> -<?import javafx.scene.control.Label?> +<?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.ScrollPane?> <?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.HBox?> -<?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.VBox?> -<?import javafx.scene.paint.Color?> -<?import javafx.scene.text.Font?> -<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"> +<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> @@ -59,70 +56,38 @@ </MenuBar> <SplitPane focusTraversable="true" prefHeight="-1.0" prefWidth="-1.0"> <items> - <AnchorPane> + <AnchorPane prefHeight="170.0" prefWidth="1920.0" style="-fx-background-color: rgba(12, 76, 81, 1);"> <children> - <Label alignment="CENTER" layoutX="14.0" layoutY="14.0" minWidth="60.0" prefWidth="-1.0" style=" " text="Master" textAlignment="CENTER" wrapText="false"> - <font> - <Font size="18.0" fx:id="x11" /> - </font> - <textFill> - <Color blue="0.624" green="0.624" red="0.624" fx:id="x21" /> - </textFill> - </Label> - <Button layoutX="238.0" layoutY="8.0" mnemonicParsing="false" text="Button" /> + <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.2505567928730512, 0.7505567928730512" focusTraversable="true" prefHeight="-1.0" prefWidth="-1.0" VBox.vgrow="ALWAYS"> - <items> - <AnchorPane> - <children> - <Label alignment="CENTER" layoutX="14.0" layoutY="14.0" minWidth="60.0" prefWidth="-1.0" style=" " text="Master" textAlignment="CENTER" wrapText="false"> - <font> - <Font size="18.0" fx:id="x1" /> - </font> - <textFill> - <Color blue="0.624" green="0.624" red="0.624" fx:id="x2" /> - </textFill> - </Label> - <Button layoutX="95.0" layoutY="126.0" mnemonicParsing="false" text="Button" /> - </children> - </AnchorPane> - <ScrollPane prefHeight="-1.0" prefWidth="-1.0"> - <content> - <AnchorPane id="Content" minHeight="-1.0" minWidth="-1.0" prefHeight="545.0" prefWidth="430.0"> - <children> - <Label alignment="CENTER" font="$x1" layoutX="14.0" layoutY="14.0" style=" " text="View" textAlignment="CENTER" textFill="$x2" wrapText="false" /> - <Button layoutX="120.0" layoutY="182.0" mnemonicParsing="false" text="Button" /> - </children> + <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> - </content> - </ScrollPane> - <AnchorPane> - <children> - <Label alignment="CENTER" font="$x1" layoutX="14.0" layoutY="14.0" style=" " text="Details" textAlignment="CENTER" textFill="$x2" wrapText="false" /> - <Button layoutX="26.0" layoutY="171.0" mnemonicParsing="false" text="Button" /> - </children> - </AnchorPane> - </items> - </SplitPane> - <HBox id="HBox" alignment="CENTER_LEFT" spacing="5.0" VBox.vgrow="NEVER"> - <children> - <Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Left status" HBox.hgrow="ALWAYS"> - <font> - <Font size="11.0" fx:id="x3" /> - </font> - <textFill> - <Color blue="0.625" green="0.625" red="0.625" fx:id="x4" /> - </textFill> - </Label> - <Pane prefHeight="-1.0" prefWidth="-1.0" HBox.hgrow="ALWAYS" /> - <Label font="$x3" maxWidth="-1.0" text="Right status" textFill="$x4" HBox.hgrow="NEVER" /> - </children> - <padding> - <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" /> - </padding> - </HBox> + </items> + </SplitPane> </children> </VBox> diff --git a/target/classes/com.application/test.fxml b/target/classes/com.application/test.fxml index 3b32926dda06f56a9bcd046eb780532f0754d288..b596aa88d227ae031310b24f837f7a339c965f93 100644 --- a/target/classes/com.application/test.fxml +++ b/target/classes/com.application/test.fxml @@ -1,22 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import javafx.geometry.Insets?> -<?import javafx.scene.control.Button?> -<?import javafx.scene.control.Label?> +<?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.ScrollPane?> <?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.HBox?> -<?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.VBox?> -<?import javafx.scene.paint.Color?> -<?import javafx.scene.text.Font?> -<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"> +<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> @@ -59,70 +56,38 @@ </MenuBar> <SplitPane focusTraversable="true" prefHeight="-1.0" prefWidth="-1.0"> <items> - <AnchorPane> + <AnchorPane prefHeight="170.0" prefWidth="1920.0" style="-fx-background-color: rgba(12, 76, 81, 1);"> <children> - <Label alignment="CENTER" layoutX="14.0" layoutY="14.0" minWidth="60.0" prefWidth="-1.0" style=" " text="Master" textAlignment="CENTER" wrapText="false"> - <font> - <Font size="18.0" fx:id="x11" /> - </font> - <textFill> - <Color blue="0.624" green="0.624" red="0.624" fx:id="x21" /> - </textFill> - </Label> - <Button layoutX="238.0" layoutY="8.0" mnemonicParsing="false" text="Button" /> + <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.2505567928730512, 0.7505567928730512" focusTraversable="true" prefHeight="-1.0" prefWidth="-1.0" VBox.vgrow="ALWAYS"> - <items> - <AnchorPane> - <children> - <Label alignment="CENTER" layoutX="14.0" layoutY="14.0" minWidth="60.0" prefWidth="-1.0" style=" " text="Master" textAlignment="CENTER" wrapText="false"> - <font> - <Font size="18.0" fx:id="x1" /> - </font> - <textFill> - <Color blue="0.624" green="0.624" red="0.624" fx:id="x2" /> - </textFill> - </Label> - <Button layoutX="95.0" layoutY="126.0" mnemonicParsing="false" text="Button" /> - </children> - </AnchorPane> - <ScrollPane prefHeight="-1.0" prefWidth="-1.0"> - <content> - <AnchorPane id="Content" minHeight="-1.0" minWidth="-1.0" prefHeight="545.0" prefWidth="430.0"> - <children> - <Label alignment="CENTER" font="$x1" layoutX="14.0" layoutY="14.0" style=" " text="View" textAlignment="CENTER" textFill="$x2" wrapText="false" /> - <Button layoutX="120.0" layoutY="182.0" mnemonicParsing="false" text="Button" /> - </children> + <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> - </content> - </ScrollPane> - <AnchorPane> - <children> - <Label alignment="CENTER" font="$x1" layoutX="14.0" layoutY="14.0" style=" " text="Details" textAlignment="CENTER" textFill="$x2" wrapText="false" /> - <Button layoutX="26.0" layoutY="171.0" mnemonicParsing="false" text="Button" /> - </children> - </AnchorPane> - </items> - </SplitPane> - <HBox id="HBox" alignment="CENTER_LEFT" spacing="5.0" VBox.vgrow="NEVER"> - <children> - <Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Left status" HBox.hgrow="ALWAYS"> - <font> - <Font size="11.0" fx:id="x3" /> - </font> - <textFill> - <Color blue="0.625" green="0.625" red="0.625" fx:id="x4" /> - </textFill> - </Label> - <Pane prefHeight="-1.0" prefWidth="-1.0" HBox.hgrow="ALWAYS" /> - <Label font="$x3" maxWidth="-1.0" text="Right status" textFill="$x4" HBox.hgrow="NEVER" /> - </children> - <padding> - <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" /> - </padding> - </HBox> + </items> + </SplitPane> </children> </VBox> diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class index 93001873b5b9c3703d766598c63974f8421b2f26..8175cc9592a6162dd4a0b51cfa64212538e554e0 100644 Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ