diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java index 5195ce0..b61813d 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java @@ -85,25 +85,24 @@ float x = event.getX(); float y = event.getY(); - //(3-2)タッチの処理 switch (event.getAction()) { case MotionEvent.ACTION_DOWN: Log.d("motion", "+++++++++++++++++++++++++++++++++++++++down======================================================"); onTouched(x, y); - paintViewModel.addLocalStrokeRequest(); + paintViewModel.addLocalStrokeRequest(x,y); //paintViewModel.addPositionLocal(x, y); break; case MotionEvent.ACTION_MOVE: Log.d("motion", "move"); onTouchedMove(x, y); - paintViewModel.addPositionLocal(x, y); + paintViewModel.addPositionRequest(x,y); break; case MotionEvent.ACTION_UP: Log.d("motion", "=====================================up======================================================"); - paintViewModel.addPositionRequest(); + paintViewModel.addPositionRequestfirst(); break; } @@ -153,13 +152,14 @@ //描写するための取得 public void getCanvas() { - int cnt = 1; - path2.reset();//ここで一旦クリア + int cnt = 0; + path2.reset(); + invalidate(); for (Stroke s : paintViewModel.getStroke().getValue()) { for (Position p : s.getPositions()) { - if (cnt == 1) { + if (cnt == 0) { onTouched2(p.getX(), p.getY()); - } else if(cnt==p.getI()){ + } else{ onTouchedMove2(p.getX(), p.getY()); } cnt++;