From b7b5a002eed7a4ff8199001b24351b9b72f2f494 Mon Sep 17 00:00:00 2001 From: vitawrap <thevitawrap@gmail.com> Date: Wed, 10 May 2023 13:19:24 +0200 Subject: [PATCH] Java: Link avec tout le code C --- .../src/main/java/application/ProjetController.java | 11 +++++++++-- .../src/main/resources/application/ProjetView.fxml | 3 +-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/java/app/src/main/java/application/ProjetController.java b/java/app/src/main/java/application/ProjetController.java index 1428208..8449f8d 100644 --- a/java/app/src/main/java/application/ProjetController.java +++ b/java/app/src/main/java/application/ProjetController.java @@ -14,7 +14,7 @@ public class ProjetController { TextField _filename; @FXML - Spinner _machineCount; + TextField _machineCount; @FXML CheckBox _balanced; @@ -28,6 +28,13 @@ public class ProjetController { @FXML public void submitToDiagram(ActionEvent event) { - Scheduling.runSchedule("STRING 1", "MESSAGE", 0, 0, 0); + int preempt = _preemptive.isSelected()? 1 : 0; + int balance = _balanced.isSelected()? 1 : 0; + int machines = Integer.parseInt(_machineCount.getText()); + Scheduling.runSchedule( + _filename.getText(), + "out", + machines, + preempt, balance); } } \ No newline at end of file diff --git a/java/app/src/main/resources/application/ProjetView.fxml b/java/app/src/main/resources/application/ProjetView.fxml index 32c9d04..6409acc 100644 --- a/java/app/src/main/resources/application/ProjetView.fxml +++ b/java/app/src/main/resources/application/ProjetView.fxml @@ -5,7 +5,6 @@ <?import javafx.scene.control.Button?> <?import javafx.scene.control.CheckBox?> <?import javafx.scene.control.Separator?> -<?import javafx.scene.control.Spinner?> <?import javafx.scene.control.SplitPane?> <?import javafx.scene.control.TextField?> <?import javafx.scene.layout.AnchorPane?> @@ -27,7 +26,7 @@ <TextField fx:id="_filename" promptText="Scheduling instance file" /> <Separator prefWidth="200.0" /> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Machine count:" /> - <Spinner fx:id="_machineCount" editable="true" /> + <TextField fx:id="_machineCount" /> <Separator prefWidth="200.0" /> <CheckBox fx:id="_balanced" mnemonicParsing="false" selected="true" text="Use balanced trees" /> <CheckBox fx:id="_preemptive" mnemonicParsing="false" text="Use SRPT over SPT" /> -- GitLab