diff --git a/src/main/java/cit/PureATN/DPenReceiver.java b/src/main/java/cit/PureATN/DPenReceiver.java index e0cd6f6..6d0685f 100644 --- a/src/main/java/cit/PureATN/DPenReceiver.java +++ b/src/main/java/cit/PureATN/DPenReceiver.java @@ -62,7 +62,7 @@ String pen = ints[2]; String penid = convertPenSerial2PenID.get(pen); if (penid != null) pen = penid; - PenUser.press(penid, Integer.parseInt(ints[1])); // 1 press, 0 up + PenUser.press(penid, Integer.parseInt(ints[1]), true); // 1 press, 0 up } else { int x1 = Integer.parseInt(ints[2]); int y1 = Integer.parseInt(ints[3]); diff --git a/src/main/java/cit/PureATN/MultiNote/MultiNote.java b/src/main/java/cit/PureATN/MultiNote/MultiNote.java index 998f2ae..f812047 100644 --- a/src/main/java/cit/PureATN/MultiNote/MultiNote.java +++ b/src/main/java/cit/PureATN/MultiNote/MultiNote.java @@ -16,7 +16,6 @@ import org.josql.QueryResults; import org.piccolo2d.PCanvas; import org.piccolo2d.PLayer; -import org.piccolo2d.PNode; import org.piccolo2d.activities.PTransformActivity; import org.piccolo2d.nodes.PPath; import org.piccolo2d.util.PBounds; @@ -36,7 +35,7 @@ public MultiNote(final PCanvas aCanvas) { super(aCanvas); int width = 1000; - int height = (int) (width * 1.414); + int height = (int) (width / 1.414); setSize(width, height); setLocation(100, 200); diff --git a/src/main/java/cit/PureATN/Note.java b/src/main/java/cit/PureATN/Note.java index a5bf9ba..04e3111 100644 --- a/src/main/java/cit/PureATN/Note.java +++ b/src/main/java/cit/PureATN/Note.java @@ -100,7 +100,7 @@ if (pressPN instanceof PCamera) { String mousePenIDStr = "pen0" + mousePenID; - PenUser.press(mousePenIDStr, 1); + PenUser.press(mousePenIDStr, 1, false); final Point2D p = e.getPosition(); // squiggle = new ShortStroke(); @@ -126,7 +126,7 @@ updateSquiggle(e); String mousePenIDStr = "pen0" + mousePenID; - PenUser.press(mousePenIDStr, 0); + PenUser.press(mousePenIDStr, 0, false); } } diff --git a/src/main/java/cit/PureATN/PenUser.java b/src/main/java/cit/PureATN/PenUser.java index 7788878..5790414 100644 --- a/src/main/java/cit/PureATN/PenUser.java +++ b/src/main/java/cit/PureATN/PenUser.java @@ -65,9 +65,9 @@ pu.add(x, y); } - public static void press(String penid, int phase) { + public static void press(String penid, int phase, boolean realPen) { PenUser pu = PenUser.find(penid); - pu.press(phase); + pu.press(phase, realPen); } public static void drawAll(Graphics g) { @@ -200,7 +200,7 @@ } - public void press(int ph) { + public void press(int ph, boolean realPen) { System.out.println("press " + ph); if (ph == 0) { if (graphicsMode == GraphicsMode.AWT) { @@ -218,6 +218,7 @@ } strokes.add(squiggle); squiggle.penid = num; // 整数型のPenID + squiggle.isRealPen = realPen; squiggle.endDrag_on_draw(); // 筆記確定後の仕上げをする squiggle = null; } diff --git a/src/main/java/cit/PureATN/ShortStroke.java b/src/main/java/cit/PureATN/ShortStroke.java index 0f30599..08f7555 100644 --- a/src/main/java/cit/PureATN/ShortStroke.java +++ b/src/main/java/cit/PureATN/ShortStroke.java @@ -17,7 +17,6 @@ import org.piccolo2d.activities.PActivity; import org.piccolo2d.nodes.PPath; import org.piccolo2d.util.PBounds; -import org.piccolo2d.util.PDimension; import cit.PureATN.MultiNote.MultiNote; @@ -41,6 +40,7 @@ public int penid;//ペンのID // public int paperid;//シートのID public long time; + public boolean isRealPen = false; //マウス描画ならfalse // public int sbackid; public transient long id; @@ -145,7 +145,9 @@ PPath theShitajiki = mn.shitajikiNodes[penid]; if (theShitajiki != null){ Point2D offset = theShitajiki.getOffset(); - move((float)-offset.getX(), (float)-offset.getY()); + if (!this.isRealPen) { //マウス描画のときは、下敷きのオフセットにあわせる + move((float)-offset.getX(), (float)-offset.getY()); + } theShitajiki.addChild(this); } }