diff --git a/pom.xml b/pom.xml index 2ded2d6..46a6f4f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ info.istlab.IoTP IoTP jar - 0.14 + 0.15 IoTP http://maven.apache.org diff --git a/src/main/java/info/istlab/IoTP/JTAConsole.java b/src/main/java/info/istlab/IoTP/JTAConsole.java index 200d354..a324c17 100644 --- a/src/main/java/info/istlab/IoTP/JTAConsole.java +++ b/src/main/java/info/istlab/IoTP/JTAConsole.java @@ -76,7 +76,7 @@ // frame.setLocation(lastFrameP.x+500, lastFrameP.y); // } // lastWindow = this; - // winStack.push(this); + winStack.push(this); originalContent = new StringBuilder(); } diff --git a/src/main/java/info/istlab/IoTP/Launcher.java b/src/main/java/info/istlab/IoTP/Launcher.java index 3459fba..4a8fd7c 100644 --- a/src/main/java/info/istlab/IoTP/Launcher.java +++ b/src/main/java/info/istlab/IoTP/Launcher.java @@ -26,7 +26,7 @@ public class Launcher extends JFrame implements MouseInputListener, KeyListener { public static Launcher theapp; - public static String version = "0.14"; + public static String version = "0.15"; // JPanel mainP; File root; JTree tree; @@ -130,7 +130,7 @@ // getContentPane().add(mainP, BorderLayout.WEST); setSize(310, 600); - setLocation(SerialWindow.centerOfScreen(getSize())); + setLocation(SerialWindow.leftOfScreen(getSize())); } public void renameOrDeleteNWPFolder() { diff --git a/src/main/java/info/istlab/IoTP/ScriptRunner.java b/src/main/java/info/istlab/IoTP/ScriptRunner.java index 15f5629..7016705 100644 --- a/src/main/java/info/istlab/IoTP/ScriptRunner.java +++ b/src/main/java/info/istlab/IoTP/ScriptRunner.java @@ -40,7 +40,6 @@ @Override public void run() { // Run script - // System.out.println(scriptfile); ArrayList comlist = new ArrayList(); if (App.isWindows) { SerialWindow.check(false); diff --git a/src/main/java/info/istlab/IoTP/SerialWindow.java b/src/main/java/info/istlab/IoTP/SerialWindow.java index 88e66a2..9097850 100644 --- a/src/main/java/info/istlab/IoTP/SerialWindow.java +++ b/src/main/java/info/istlab/IoTP/SerialWindow.java @@ -79,7 +79,7 @@ } public SerialWindow(SerialPort _sp) { - super("SerialMonitor " + _sp.getSystemPortName()); + super("SerialMonitor " + _sp.getSystemPortName()+" (ボーレート:115200)"); sp = _sp; sp.setBaudRate(115200); sp.addDataListener(this); @@ -189,6 +189,11 @@ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); return new Point((screenSize.width - winSize.width) / 2, (screenSize.height - winSize.height) / 2); } + // ここで、画面中心にウィンドウ表示するため、いろいろ計算する + public static Point leftOfScreen(Dimension winSize) { + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + return new Point(10, (screenSize.height - winSize.height) / 2); + } @Override public void actionPerformed(ActionEvent e) {