Skip to content

Commit

Permalink
🚀 Ajout du rapport
Browse files Browse the repository at this point in the history
  • Loading branch information
ctruillet committed Dec 23, 2021
1 parent 9f0c6a0 commit 5c77a0f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
Binary file removed doc/Rapport.docx
Binary file not shown.
3 changes: 3 additions & 0 deletions src/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: eu.ctruillet.ihm.triceratops.palette.Palette

6 changes: 0 additions & 6 deletions src/eu/ctruillet/ihm/triceratops/command/Command.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@ public class Command {

//Constructeur
public Command(){
//ToDo peut être pas une bonne idée de mettre ici les params par défaut -> fout en l'air le check si la commande est valide
this(null, null, null, new PVector((float) (Math.random() * 640), (float) (Math.random() * 480)), 0.f, 0.f);
}

public Command(Action action, Shape shape) {
// ToDo Gestion de la couleur, la localisation et confidence par defaut
this(action,shape,null, null, 0.f, 0.f);
}

Expand All @@ -82,17 +80,14 @@ public Command(FSM fsm) {
}

public Command(Action action, Shape shape, float confidenceShape) {
// ToDo Gestion de la couleur et de la localisation par defaut
this(action,shape,null, null, confidenceShape, 0.f);
}

public Command(Action action, Shape shape, Couleur color, PVector localisation) {
// ToDo Gestion de la couleur et de la localisation par defaut
this(action, shape, color, localisation, 0.f, 0.f);
}

public Command(Action action, Shape shape, Couleur color, float confidenceShape, float confidenceColor) {
// ToDo Gestion de la localisation par defaut
this(action,shape,color, null, confidenceShape, confidenceColor);
}

Expand Down Expand Up @@ -178,7 +173,6 @@ public PVector getLocalisation(){
}

public void drawCommand(){
//ToDo Afficher le résultat de la commande sur la palette

if(this.action != Action.CREER)
return;
Expand Down
3 changes: 0 additions & 3 deletions src/eu/ctruillet/ihm/triceratops/ivy/TricerIVY.java
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,14 @@ public void receive(IvyClient ivyClient, String[] strings) {
break;

case "DELETE":
// ToDo
commandMerger.addCommandSRA(Action.SUPPRIMER, strings[1], Shape.getShape(strings[2]), Couleur.getColor(strings[3]), strings[4], confidence);
break;

case "MOVE":
// ToDo
commandMerger.addCommandSRA(Action.DEPLACER, strings[1], Shape.getShape(strings[2]), Couleur.getColor(strings[3]), strings[4], confidence);
break;

case "MODIFIER":
// ToDo
commandMerger.addCommandSRA(Action.MODIFIER, strings[1], Shape.getShape(strings[2]), Couleur.getColor(strings[3]), strings[4], confidence);
break;

Expand Down

0 comments on commit 5c77a0f

Please sign in to comment.