Ako/makeyourownapp-jam
1
0
Fork 0
mirror of https://github.com/Akomry/makeyourownapp-jam.git synced 2025-12-06 11:43:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: changement de nom de l'application

Browse source
This commit is contained in:
Emi Boucly 2025-03-27 09:57:59 +01:00
parent 574dc13c06
commit a464760998
5 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
graphical-app/src/main/java/fr/emiko/graphicalapp/HelloApplication.java → graphical-app/src/main/java/fr/emiko/graphicalapp/DrawApplication.java
View file

@ -7,10 +7,10 @@ import javafx.stage.Stage;
import java.io.IOException;
public class HelloApplication extends Application {
public class DrawApplication extends Application {
@Override
public void start(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("hello-view.fxml"));
FXMLLoader fxmlLoader = new FXMLLoader(DrawApplication.class.getResource("draw-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 1280, 720);
stage.setTitle("PixelWriter");
stage.setScene(scene);

26
graphical-app/src/main/java/fr/emiko/graphicalapp/HelloController.java → graphical-app/src/main/java/fr/emiko/graphicalapp/DrawController.java
View file

@ -6,14 +6,12 @@ import fr.emiko.net.DrawClient;
import fr.emiko.net.DrawServer;
import fr.emiko.net.Event;
import fr.emiko.net.User;
import javafx.beans.binding.Bindings;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.canvas.Canvas;
import javafx.scene.control.*;
@ -25,13 +23,11 @@ import javafx.scene.layout.Pane;
import javafx.scene.layout.Priority;
import javafx.scene.paint.Color;
import fr.emiko.graphicsElement.Stroke;
import javafx.scene.robot.Robot;
import javafx.scene.transform.Scale;
import javafx.stage.Modality;
import javafx.stage.Stage;
import org.json.JSONObject;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@ -40,7 +36,7 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class HelloController implements Initializable {
public class DrawController implements Initializable {
private final Pattern hostPortPattern = Pattern.compile("^([-.a-zA-Z0-9]+)(?::([0-9]{1,5}))?$");
public Canvas drawingCanvas;
public MenuItem saveButton;
@ -309,15 +305,10 @@ public class HelloController implements Initializable {
if (controller.isOk()) {
//drawingCanvas = new Canvas(controller.getCanvasWidth(), controller.getCanvasHeight());
//setupCanvas();
System.out.println(controller.getCanvasHeight());
System.out.println(controller.getCanvasWidth());
layerObservableList.clear();
drawingCanvas.setWidth(controller.getCanvasWidth());
drawingCanvas.setHeight(controller.getCanvasHeight());
drawingCanvas.getGraphicsContext2D().setFill(Color.WHITE);
drawingCanvas.getGraphicsContext2D().fillRect(0, 0, drawingCanvas.getWidth(), drawingCanvas.getHeight());
drawingCanvas.getGraphicsContext2D().fill();
pane.setScaleX(1);
pane.setScaleY(1);
clearDrawingCanvas();
client.sendEvent(new Event(Event.ADDCANVAS, new JSONObject().put("width", drawingCanvas.getWidth()).put("height", drawingCanvas.getHeight())));
System.out.println("New canvas created");
}
@ -431,15 +422,22 @@ public class HelloController implements Initializable {
}
private void doAddCanvas(JSONObject content) {
layerObservableList.clear();
drawingCanvas.setWidth(content.getDouble("width"));
drawingCanvas.setHeight(content.getDouble("height"));
clearDrawingCanvas();
setupCanvas(drawingCanvas);
}
private void clearDrawingCanvas() {
drawingCanvas.getGraphicsContext2D().setFill(Color.WHITE);
drawingCanvas.getGraphicsContext2D().fillRect(0, 0, drawingCanvas.getWidth(), drawingCanvas.getHeight());
drawingCanvas.getGraphicsContext2D().fill();
pane.setScaleX(1);
pane.setScaleY(1);
setupCanvas(drawingCanvas);
layerObservableList.add(drawingCanvas);
layerListView.refresh();
}
private void doDeleteLine(JSONObject content) {

6
graphical-app/src/main/java/fr/emiko/net/DrawClient.java
View file

@ -1,15 +1,15 @@
package fr.emiko.net;
import fr.emiko.graphicalapp.HelloController;
import fr.emiko.graphicalapp.DrawController;
import javafx.application.Platform;
import org.json.JSONObject;
import java.io.IOException;
public class DrawClient extends ClientTCP{
private final HelloController listener;
private final DrawController listener;
public DrawClient(String host, int port, HelloController listener) throws IOException {
public DrawClient(String host, int port, DrawController listener) throws IOException {
super(host, port);
this.listener = listener;
}

2
graphical-app/src/main/resources/fr/emiko/graphicalapp/hello-view.fxml → graphical-app/src/main/resources/fr/emiko/graphicalapp/draw-view.fxml
View file

@ -20,7 +20,7 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<VBox alignment="CENTER" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.emiko.graphicalapp.HelloController">
<VBox alignment="CENTER" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.emiko.graphicalapp.DrawController">
<children>
<MenuBar VBox.vgrow="NEVER">
<menus>