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 a49e8b5..cd16287 100644 --- a/src/main/java/cit/PureATN/MultiNote/KeyEvent_on_MultiNote.java +++ b/src/main/java/cit/PureATN/MultiNote/KeyEvent_on_MultiNote.java @@ -23,40 +23,50 @@ } public void keyPressed(KeyEvent e) { - // System.out.println("keyCode=" + e.getKeyCode() + " keyChar [" + e.getKeyChar() + "]"); + // System.out.println("keyCode=" + e.getKeyCode() + " keyChar [" + + // e.getKeyChar() + "]"); if (e.getKeyCode() == KeyEvent.VK_ENTER) { - MultiNote mn = (MultiNote)Note.theapp; + MultiNote mn = (MultiNote) Note.theapp; mn.toggleExpandMode(); mn.vlayout(); - mn.iroduke(); + mn.iroduke(); } - if (e.getKeyCode() == KeyEvent.VK_C) { //色付け & setMoveTargetToSelf 自己移動可能 - MultiNote mn = (MultiNote)Note.theapp; - mn.iroduke(); + if (e.getKeyCode() == KeyEvent.VK_C) { // 色付け & setMoveTargetToSelf 自己移動可能 + MultiNote mn = (MultiNote) Note.theapp; + mn.iroduke(); mn.setMoveTargetToShortStroke(true); // マウスドラッグで筆記を移動可能にする } - if (e.getKeyCode() == KeyEvent.VK_D) { //色付け戻す & setMoveTargetToSelf 自己移動可能 - MultiNote mn = (MultiNote)Note.theapp; - mn.irodukeOrig(); + if (e.getKeyCode() == KeyEvent.VK_D) { // 色付け戻す & setMoveTargetToSelf 自己移動可能 + MultiNote mn = (MultiNote) Note.theapp; + mn.irodukeOrig(); mn.setMoveTargetToShortStroke(true); // マウスドラッグで筆記を移動可能にする } - if (e.getKeyCode() == KeyEvent.VK_V) { //Visual Layout - MultiNote mn = (MultiNote)Note.theapp; - mn.setExpandMode(true); + if (e.getKeyCode() == KeyEvent.VK_V) { // Visual Layout + MultiNote mn = (MultiNote) Note.theapp; + mn.setExpandMode(true); } - if (e.getKeyCode() == KeyEvent.VK_F) { //Fold - MultiNote mn = (MultiNote)Note.theapp; - mn.setExpandMode(false); + if (e.getKeyCode() == KeyEvent.VK_F) { // Fold + MultiNote mn = (MultiNote) Note.theapp; + mn.setExpandMode(false); } if (e.getKeyCode() == KeyEvent.VK_R) { - MultiNote mn = (MultiNote)Note.theapp; - mn.showStat(); + MultiNote mn = (MultiNote) Note.theapp; + mn.showStat(); mn.rotate(); mn.vlayout(); } if (e.getKeyCode() == KeyEvent.VK_DELETE) { - MultiNote mn = (MultiNote)Note.theapp; - mn.deleteAllStrokes(); + MultiNote mn = (MultiNote) Note.theapp; + mn.deleteAllStrokes(); + } + if (e.getKeyCode() == KeyEvent.VK_UP) { + MultiNote mn = (MultiNote) Note.theapp; + mn.zoomToUpper(); + } + if (e.getKeyCode() == KeyEvent.VK_DOWN) { + MultiNote mn = (MultiNote) Note.theapp; + mn.zoomToLower(); + // menutoolbar.getButton("Full Screen").doClick(); } if (e.getKeyCode() == KeyEvent.VK_Z) { diff --git a/src/main/java/cit/PureATN/MultiNote/MultiNote.java b/src/main/java/cit/PureATN/MultiNote/MultiNote.java index 92645f8..eb00840 100644 --- a/src/main/java/cit/PureATN/MultiNote/MultiNote.java +++ b/src/main/java/cit/PureATN/MultiNote/MultiNote.java @@ -178,25 +178,25 @@ // Query q5 = new Query(); // try { - // q5.parse("select * from cit.PureATN.ShortStroke group by penid"); + // q5.parse("select * from cit.PureATN.ShortStroke group by penid"); // } catch (QueryParseException e) { - // e.printStackTrace(); + // e.printStackTrace(); // } // QueryResults qr5 = null; // try { - // qr5 = q5.execute(ass); - // Map grpBys = qr5.getGroupByResults(); - // Iterator iter = grpBys.keySet().iterator(); - // while (iter.hasNext()) { - // List key = (List) iter.next(); - // List res = (List) grpBys.get(key); - // System.out.println(key.toString() + " " + res.size()); - // } - // // for (ShortStroke ss : (List) qr5.getResults()) { - // // System.out.println(ss.penid); - // // } + // qr5 = q5.execute(ass); + // Map grpBys = qr5.getGroupByResults(); + // Iterator iter = grpBys.keySet().iterator(); + // while (iter.hasNext()) { + // List key = (List) iter.next(); + // List res = (List) grpBys.get(key); + // System.out.println(key.toString() + " " + res.size()); + // } + // // for (ShortStroke ss : (List) qr5.getResults()) { + // // System.out.println(ss.penid); + // // } // } catch (QueryExecutionException e) { - // e.printStackTrace(); + // e.printStackTrace(); // } } @@ -325,4 +325,19 @@ rotation = (Math.PI / 2) * muki; isTate = !isTate; } + + public void zoomToUpper() { + PTransformActivity ta2 = getCanvas().getCamera().animateViewToCenterBounds( + // getCanvas().getLayer().getFullBounds(), + new PBounds(0, 0, width, height / 2), + true, 1000); + + } + + public void zoomToLower() { + PTransformActivity ta2 = getCanvas().getCamera().animateViewToCenterBounds( + // getCanvas().getLayer().getFullBounds(), + new PBounds(0, height/2, width, height ), + true, 1000); + } }