StrokesRest,Strokeで座標が取れるように変更 #138

Merged g-akagi merged 1 commit into nitta-lab-2021:master from nitta-lab-2021:matsu on 29 May 2021

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          15 ■■■■■
          src/main/java/org/ntlab/acanthus_server/entities/Stroke.java
 import org.ntlab.acanthus_server.resources.gallery.StrokesRest;
import org.ntlab.acanthus_server.entities.Position;
 
public class Stroke {
    private static int i; //strokeNoを数えるためだけ
    static int strokeNoCount; //strokeNoを数えるためだけ
    private int strokeNo;
    private int pen;
    private int color;
    private int thickness;
    }
    public int getThickness() {
        return this.thickness;
    }
    public ArrayList<Position> getPositions() {
        return this.positions;
    }
 
    //書き始めたらstrokeNoを追加する。
    public void addStrokeNo(){
        this.i++;
        this.strokeNo = i;
}
        strokeNoCount++;
        this.strokeNo = strokeNoCount;
    }
 
    public void addStrokes(int pen, int color, int thickness) {
        this.pen = pen;
        this.color = color;
        this.thickness = thickness;
    }
 
    public void addPositions(ArrayList<Position> positions) {
        this.positions = positions;
    }
 
}
 import org.ntlab.acanthus_server.resources.gallery.StrokesRest;
 import org.ntlab.acanthus_server.entities.Position;
 public class Stroke {
+    private static int i; //strokeNoを数えるためだけ
+    static int strokeNoCount; //strokeNoを数えるためだけ
     private int strokeNo;
     private int pen;
     private int color;
     private int thickness;
     }
     public int getThickness() {
         return this.thickness;
     }
+    public ArrayList<Position> getPositions() {
+        return this.positions;
+    }
     //書き始めたらstrokeNoを追加する。
     public void addStrokeNo(){
+        this.i++;
+        this.strokeNo = i;
+}
+        strokeNoCount++;
+        this.strokeNo = strokeNoCount;
+    }
     public void addStrokes(int pen, int color, int thickness) {
         this.pen = pen;
         this.color = color;
         this.thickness = thickness;
+    }
+    public void addPositions(ArrayList<Position> positions) {
+        this.positions = positions;
     }
 }

                Ignore Space
               Show notes
              View
            
          
          1 ■■■■■
          src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java
         var animation = gallery.getAnimationInformation(aid);
        Stroke Test = new Stroke();
        Test.addStrokes(pen, color, thick);
        Test.addStrokeNo();//strokeNoを＋１する
        Test.addPositions(this.positions);
        this.strokes.add(Test);
//        if(animation != null) {
//            this.Test.setStrokes(pen, color, thick);
//        }else{
         var animation = gallery.getAnimationInformation(aid);
         Stroke Test = new Stroke();
         Test.addStrokes(pen, color, thick);
         Test.addStrokeNo();//strokeNoを＋１する
+        Test.addPositions(this.positions);
         this.strokes.add(Test);
 //        if(animation != null) {
 //            this.Test.setStrokes(pen, color, thick);
 //        }else{