diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Stroke.java b/src/main/java/org/ntlab/acanthus_server/entities/Stroke.java index 7d3922b..af314c4 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Stroke.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Stroke.java @@ -6,7 +6,7 @@ import org.ntlab.acanthus_server.entities.Position; public class Stroke { - static int strokeNoCount; //strokeNoを数えるためだけ + private static int strokeNoCount; //strokeNoを数えるためだけ private int strokeNo; private int pen; private int color; @@ -41,7 +41,7 @@ this.thickness = thickness; } - public void addPositions(ArrayList positions) { + public void addPosition(ArrayList positions) { this.positions = positions; } diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java index 1b09a00..3714886 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java @@ -57,7 +57,7 @@ Stroke Test = new Stroke(); Test.addStrokes(pen, color, thick); Test.addStrokeNo();//strokeNoを+1する - Test.addPositions(this.positions); + Test.addPosition(this.positions); this.strokes.add(Test); // if(animation != null) { // this.Test.setStrokes(pen, color, thick); @@ -94,12 +94,15 @@ @Path("/{aid}/pageMap/0/layers/0/strokes/{strokeNo}/position") @POST @Produces(MediaType.APPLICATION_JSON) - public void addPositions(@PathParam("aid") Integer aid, @FormParam("x") Float x, @FormParam("y") Float y) { + public void addPositions(@PathParam("aid") Integer aid, @PathParam("strokeNo") Integer strokeNo, @FormParam("x") Float x, @FormParam("y") Float y) { var animation = gallery.getAnimationInformation(aid); - Position Position = new Position(); - Position.setXY(x, y); - this.positions.add(Position); +// Stroke stroke = strokes.get(strokeNo); + + Position position = new Position(); + position.setXY(x, y); +// stroke.addPosition(Position); + this.positions.add(position); // if(animation != null) { // this.Position.setXY(x, y); // this.positions.add(this.Position);