From 16e86a8adde946ca3222d61c888c1e937eb14a86 Mon Sep 17 00:00:00 2001
From: Peppi-Lotta Saari <plsaar@utu.fi>
Date: Tue, 16 Mar 2021 11:36:45 +0200
Subject: [PATCH] asetus ikkuna toimii hyvin

---
 .../java/fi/utu/tech/gui/javafx/Check.java    | 22 ++++++++++-----
 .../fi/utu/tech/gui/javafx/Controller.java    |  4 ++-
 .../fi/utu/tech/gui/javafx/GameWindow.java    | 28 +++++++++++++++++--
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/main/java/fi/utu/tech/gui/javafx/Check.java b/src/main/java/fi/utu/tech/gui/javafx/Check.java
index bba2587..d169745 100644
--- a/src/main/java/fi/utu/tech/gui/javafx/Check.java
+++ b/src/main/java/fi/utu/tech/gui/javafx/Check.java
@@ -1,32 +1,40 @@
 package fi.utu.tech.gui.javafx;
 
 import javafx.scene.control.Alert;
+import javafx.stage.Stage;
+
+import java.io.IOException;
 
 public class Check {
-    public static void check(Object grid, Object lentotuki, Object taistelu, Object risteily, Object sukellus, Object kevyt){
+    public static void check(Object grid, Object lentotuki, Object taistelu, Object risteily, Object sukellus, Object kevyt) throws IOException {
         int l = (Integer) lentotuki;
+        l=l*5;
         int t = (Integer) taistelu;
+        t=t*4;
         int r =  (Integer) risteily;
+        r=6*3;
         int s =  (Integer) sukellus;
+        s=s*3;
         int k =  (Integer) kevyt;
+        k=k*2;
 
         if (grid.equals("5 x 5") && (l+t+r+s+k)<=25){
-            GameWindow.game(5,l,t,r,s,k);
+            GameWindow.start(5,l,t,r,s,k, new Stage());
         }
         if (grid.equals("6 x 6") && (l+t+r+s+k)<=36){
-            GameWindow.game(6,l,t,r,s,k);
+            GameWindow.start(6,l,t,r,s,k, new Stage());
         }
         if (grid.equals("7 x 7") && (l+t+r+s+k)<=49){
-            GameWindow.game(7,l,t,r,s,k);
+            GameWindow.start(7,l,t,r,s,k, new Stage());
         }
         if (grid.equals("8 x 8") && (l+t+r+s+k)<=64){
-            GameWindow.game(8,l,t,r,s,k);
+            GameWindow.start(8,l,t,r,s,k, new Stage());
         }
         if (grid.equals("9 x 9") && (l+t+r+s+k)<=81){
-            GameWindow.game(9,l,t,r,s,k);
+            GameWindow.start(9,l,t,r,s,k, new Stage());
         }
         if (grid.equals("10 x 10") && (l+t+r+s+k)<=100){
-            GameWindow.game(10,l,t,r,s,k);
+            GameWindow.start(10,l,t,r,s,k, new Stage());
         }
         else{
             Alert alert = new Alert(Alert.AlertType.INFORMATION);
diff --git a/src/main/java/fi/utu/tech/gui/javafx/Controller.java b/src/main/java/fi/utu/tech/gui/javafx/Controller.java
index daa3b4a..abb3147 100644
--- a/src/main/java/fi/utu/tech/gui/javafx/Controller.java
+++ b/src/main/java/fi/utu/tech/gui/javafx/Controller.java
@@ -6,6 +6,8 @@ import javafx.scene.control.Button;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Spinner;
 
+import java.io.IOException;
+
 public class Controller {
     @FXML
     private ChoiceBox grid;
@@ -28,7 +30,7 @@ public class Controller {
     private Button start;
 
     @FXML
-    void startGamePressed(ActionEvent e) {
+    void startGamePressed(ActionEvent e) throws IOException {
         Check.check(grid.getValue(),
                 lentotuki.getValue(),
                 taistelija.getValue(),
diff --git a/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java b/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java
index 6914ad8..3f4085e 100644
--- a/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java
+++ b/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java
@@ -1,12 +1,34 @@
 package fi.utu.tech.gui.javafx;
 
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.layout.GridPane;
+import javafx.stage.Stage;
+
+import java.io.IOException;
 
 public class GameWindow {
 
-    public static GameWindow game(int ruudukko, int lento, int taisto, int risse, int sukel, int kev ) {
-        //peli ikkunan sisältö
+    public static void start(int ruudukko, int lento, int taisto, int risse, int sukel, int kev, Stage stage ) throws IOException {
+        // Getting the reference to "class object of this class"
+        var resourceRoot = GameWindow.class;
+        // The fxml filename that is in resources folder
+        var form = "posankkamenu.fxml";
+
+        // Give the FXML resource to the FXMLLoader
+        var loader = new FXMLLoader(resourceRoot.getResource(form));
+
+        // Load and parse the FXML into an Java object (Parent)
+        Parent root = loader.load();
+
+        // This is just the usual: Setting scene, showing stage
+        stage.setTitle("Posankanupotus");
+        var scene = new Scene(root);
+        stage.setScene(scene);
+        stage.show();
     }
-    
+
+
 }
 
-- 
GitLab