diff --git a/src/main/java/cit/PureATN/KeyEvent_on_Note.java b/src/main/java/cit/PureATN/KeyEvent_on_Note.java index 5863493..00bd02b 100644 --- a/src/main/java/cit/PureATN/KeyEvent_on_Note.java +++ b/src/main/java/cit/PureATN/KeyEvent_on_Note.java @@ -30,6 +30,11 @@ true, 1000); // ta.setStartTime(0); } + if (KeyEvent.VK_1 <= e.getKeyCode() && e.getKeyCode() <= KeyEvent.VK_9 ) { //TODO: 本当は10番まであるが,1..9でがまん + System.out.println("VK_"+(e.getKeyCode()- KeyEvent.VK_0)); + Note.theapp.setMousePenID(e.getKeyCode()- KeyEvent.VK_0); + } + if (e.getKeyCode() == KeyEvent.VK_ENTER || e.getKeyCode() == KeyEvent.VK_F || e.getKeyCode() == KeyEvent.VK_R || e.getKeyCode() == KeyEvent.VK_M) { // if (zrh.selection != null){ diff --git a/src/main/java/cit/PureATN/MultiNote/KeyEvent_on_MultiNote.java b/src/main/java/cit/PureATN/MultiNote/KeyEvent_on_MultiNote.java index 6fe14b2..77c5869 100644 --- a/src/main/java/cit/PureATN/MultiNote/KeyEvent_on_MultiNote.java +++ b/src/main/java/cit/PureATN/MultiNote/KeyEvent_on_MultiNote.java @@ -5,6 +5,8 @@ import org.piccolo2d.PCanvas; +import cit.PureATN.Note; + public class KeyEvent_on_MultiNote implements KeyListener { PCanvas canvas; @@ -40,9 +42,6 @@ if (e.getKeyCode() == KeyEvent.VK_Z) { // System.out.println("SimpleATN zoomLevel = "+getZoomLevel()); } - if (KeyEvent.VK_0 <= e.getKeyCode() && e.getKeyCode() <= KeyEvent.VK_5 ) { - System.out.println("VK_"+(e.getKeyCode()- KeyEvent.VK_0)); - } if (e.getKeyCode() == KeyEvent.VK_F11) { // menutoolbar.getButton("Full Screen").doClick(); } diff --git a/src/main/java/cit/PureATN/MultiNote/MultiNote.java b/src/main/java/cit/PureATN/MultiNote/MultiNote.java index 29b644b..abde0ca 100644 --- a/src/main/java/cit/PureATN/MultiNote/MultiNote.java +++ b/src/main/java/cit/PureATN/MultiNote/MultiNote.java @@ -14,6 +14,7 @@ public class MultiNote extends Note { + public MultiNote() { this(null); setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); @@ -22,7 +23,6 @@ public MultiNote(final PCanvas aCanvas) { super(aCanvas); - setTitle("MultiNote (Esc key to zoom whole strokes)"); int width = 1000; int height = (int) (width * 1.414); setSize(width, height); @@ -40,6 +40,10 @@ // 追加機能：右クリックでメニューをだす getCanvas().getCamera().addInputEventListener(new MouseEvent_onMN(this)); + currentTitle = "MultiNote (Esc key to zoom whole strokes)"; + // setTitle(currentTitle); + setMousePenID(1); + } public static void main(final String[] args) { @@ -65,4 +69,6 @@ repaint(); } + + } diff --git a/src/main/java/cit/PureATN/Note.java b/src/main/java/cit/PureATN/Note.java index af8b558..08ce38c 100644 --- a/src/main/java/cit/PureATN/Note.java +++ b/src/main/java/cit/PureATN/Note.java @@ -33,8 +33,10 @@ theapp = this; // どこからでもNote.theapp で参照できるように } + public static String currentTitle = "Note (Esc key to zoom whole strokes)"; + public Note(final PCanvas aCanvas) { - super("Note (Esc key to zoom whole strokes)", false, aCanvas); + super(currentTitle, false, aCanvas); setSize(650, 800); setLocation(10, 10); @@ -62,7 +64,7 @@ // panEventHandler.setEventFilter(disablemask); // getCanvas().addInputEventListener(panEventHandler); - getCanvas().addKeyListener( new KeyEvent_on_Note( getCanvas() ) ); + getCanvas().addKeyListener(new KeyEvent_on_Note(getCanvas())); layer = getCanvas().getLayer(); @@ -71,52 +73,17 @@ getCanvas().setInteractingRenderQuality(PPaintContext.HIGH_QUALITY_RENDERING); } - // public PBasicInputEventHandler createSSSquiggleEventHandler() { - // return new PBasicInputEventHandler() { + /** + * マウスで描くときのPenIDをどうするか (1〜10) + * + * @param penidint + */ + public void setMousePenID(int penidint) { + mousePenID = penidint; + setTitle(currentTitle + " [PenID:0" + penidint + "]"); + } - // protected ShortStroke squiggle; - // int dragCount = 0; - // Point2D pressP; - - // public void mousePressed(final PInputEvent aEvent) { - // pressP = aEvent.getPositionRelativeTo(layer); - // dragCount = 0; - // } - // public void mouseDragged(final PInputEvent aEvent) { - // dragCount++; - // if (squiggle == null) { - // squiggle = new ShortStroke(); - - // squiggle.penid = 1; - // squiggle.paperid = 1; - // squiggle.time = System.currentTimeMillis(); - // squiggle.addPoint(pressP); - // squiggle.applyTempPtsToAry(); - // squiggle.moveTo( pressP.getX(), pressP.getY() ); - // squiggle.setTransparency(0.7f); - // // squiggle.rebuildStroke(); - - // layer.addChild(squiggle); - - // } else { - // Point2D inkp = aEvent.getPositionRelativeTo(layer); - // squiggle.addPoint(inkp); - // squiggle.lineTo( inkp.getX(),inkp.getY()); - // } - // } - // public void mouseReleased(final PInputEvent aEvent) { - - // if (dragCount < 3){ - - // } else { - - // squiggle.play(300); - // squiggle = null; - // } - // } - - // }; - // } + public int mousePenID = 1; // マウスで描くときのPenID public PBasicInputEventHandler createSquiggleEventHandler() { return new PDragSequenceEventHandler() { @@ -126,14 +93,17 @@ public void startDrag(final PInputEvent e) { super.startDrag(e); - final Point2D p = e.getPosition(); + String mousePenIDStr = "pen0" + mousePenID; + PenUser.press(mousePenIDStr, 1); - squiggle = new ShortStroke(); - layer.addChild(squiggle); - squiggle.startDrag_on_draw(p.getX(), p.getY()); - // squiggle.setStroke(new BasicStroke((float) (3 / - // e.getCamera().getViewScale()))); - layer.repaint(); + final Point2D p = e.getPosition(); + // squiggle = new ShortStroke(); + // layer.addChild(squiggle); + // squiggle.startDrag_on_draw(p.getX(), p.getY()); + PenUser.add(mousePenIDStr, (int) p.getX(), (int) p.getY()); + // // squiggle.setStroke(new BasicStroke((float) (3 / + // // e.getCamera().getViewScale()))); + // layer.repaint(); } public void drag(final PInputEvent e) { @@ -144,19 +114,24 @@ public void endDrag(final PInputEvent e) { super.endDrag(e); updateSquiggle(e); - squiggle.endDrag_on_draw(); + String mousePenIDStr = "pen0" + mousePenID; + PenUser.press(mousePenIDStr, 0); + + // squiggle.endDrag_on_draw(); // squiggle.ink = layer; // squiggle.play(10); - squiggle = null; + // squiggle = null; } public void updateSquiggle(final PInputEvent aEvent) { final Point2D p = aEvent.getPosition(); - squiggle.drag_on_draw(p.getX(), p.getY()); - layer.repaint(); + // squiggle.drag_on_draw(p.getX(), p.getY()); + // layer.repaint(); + String mousePenIDStr = "pen0" + mousePenID; + PenUser.add(mousePenIDStr, (int) p.getX(), (int) p.getY()); + } }; } - }