Adding plotting functionality to the editor

Author: henningpohl

Diff for: app/src/processing/app/Editor.java

@@ -100,6 +100,8 @@ public class Editor extends JFrame implements RunnerListener {
 
   static SerialMenuListener serialMenuListener;
   static SerialMonitor serialMonitor;
+
+  static SerialPlotter serialPlotter;
 
   EditorHeader header;
   EditorStatus status;
@@ -201,6 +203,11 @@ public void windowDeactivated(WindowEvent e) {
       serialMonitor = new SerialMonitor(Preferences.get("serial.port"));
       serialMonitor.setIconImage(getIconImage());
     }
+
+    if (serialPlotter == null) {
+      serialPlotter = new SerialPlotter(Preferences.get("serial.port"));
+      serialPlotter.setIconImage(getIconImage());
+    }
 
     buildMenuBar();
 
@@ -668,7 +675,15 @@ public void actionPerformed(ActionEvent e) {
         }
       });
     menu.add(item);
-    
+
+    item = newJMenuItemShift(_("Serial Plotter"), 'L');
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          handlePlotter();
+        }
+    });
+    menu.add(item);
+
     addTools(menu, Base.getToolsFolder());
     File sketchbookTools = new File(Base.getSketchbookFolder(), "tools");
     addTools(menu, sketchbookTools);
@@ -945,6 +960,9 @@ protected void selectSerialPort(String name) {
     serialMonitor.closeSerialPort();
     serialMonitor.setVisible(false);
     serialMonitor = new SerialMonitor(Preferences.get("serial.port"));
+    serialPlotter.closeSerialPort();
+    serialPlotter.setVisible(false);
+    serialPlotter = new SerialPlotter(Preferences.get("serial.port"));
     //System.out.println("set to " + get("serial.port"));
   }
 
@@ -2487,6 +2505,16 @@ public void handleSerial() {
     }
   }
 
+  public void handlePlotter() {
+    if(uploading) return;
+
+    try {
+      serialPlotter.openSerialPort();
+      serialPlotter.setVisible(true);
+    } catch (SerialException e) {
+      statusError(e);
+    }
+  }
 
   protected void handleBurnBootloader() {
     console.clear();

Diff for: app/src/processing/app/EditorToolbar.java

@@ -38,12 +38,12 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
 
   /** Rollover titles for each button. */
   static final String title[] = {
-    _("Verify"), _("Upload"), _("New"), _("Open"), _("Save"), _("Serial Monitor")
+    _("Verify"), _("Upload"), _("New"), _("Open"), _("Save"), _("Serial Monitor"), _("Serial Plotter")
   };
 
   /** Titles for each button when the shift key is pressed. */ 
   static final String titleShift[] = {
-    _("Verify"), _("Upload Using Programmer"), _("New Editor Window"), _("Open in Another Window"), _("Save"), _("Serial Monitor")
+    _("Verify"), _("Upload Using Programmer"), _("New Editor Window"), _("Open in Another Window"), _("Save"), _("Serial Monitor"), _("Serial Plotter")
   };
 
   static final int BUTTON_COUNT  = title.length;
@@ -65,6 +65,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
   static final int SAVE     = 4;
 
   static final int SERIAL   = 5;
+  static final int PLOTTER  = 6;
 
   static final int INACTIVE = 0;
   static final int ROLLOVER = 1;
@@ -110,6 +111,7 @@ public EditorToolbar(Editor editor, JMenu menu) {
     which[buttonCount++] = OPEN;
     which[buttonCount++] = SAVE;
     which[buttonCount++] = SERIAL;
+    which[buttonCount++] = PLOTTER;
 
     currentRollover = -1;
 
@@ -173,8 +175,11 @@ public void paintComponent(Graphics screen) {
       }
 
       // Serial button must be on the right
-      x1[SERIAL] = width - BUTTON_WIDTH - 14;
-      x2[SERIAL] = width - 14;
+      x1[SERIAL] = width - 2 * BUTTON_WIDTH - 14;
+      x2[SERIAL] = width - BUTTON_WIDTH - 14;
+      // Plotter button too
+      x1[PLOTTER] = width - BUTTON_WIDTH - 14;
+      x2[PLOTTER] = width - 14;
     }
     Graphics g = offscreen.getGraphics();
     g.setColor(bgcolor); //getBackground());
@@ -201,12 +206,15 @@ public void paintComponent(Graphics screen) {
     if (currentRollover != -1) {
       int statusY = (BUTTON_HEIGHT + g.getFontMetrics().getAscent()) / 2;
       String status = shiftPressed ? titleShift[currentRollover] : title[currentRollover];
-      if (currentRollover != SERIAL)
-        g.drawString(status, (buttonCount-1) * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
-      else {
-        int statusX = x1[SERIAL] - BUTTON_GAP;
-        statusX -= g.getFontMetrics().stringWidth(status);
-        g.drawString(status, statusX, statusY);
+      switch (currentRollover) {
+        case SERIAL:
+        case PLOTTER:
+          int statusX = x1[SERIAL] - BUTTON_GAP;
+          statusX -= g.getFontMetrics().stringWidth(status);
+          g.drawString(status, statusX, statusY);
+          break;
+        default:
+          g.drawString(status, (buttonCount-1) * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
       }
     }
 
@@ -352,6 +360,10 @@ public void mousePressed(MouseEvent e) {
     case SERIAL:
       editor.handleSerial();
       break;
+
+    case PLOTTER:
+      editor.handlePlotter();
+      break;
     }
   }
 

Diff for: app/src/processing/app/Resources_en.po

@@ -115,6 +115,10 @@ msgstr ""
 msgid "Serial Monitor"
 msgstr ""
 
+#: Editor.java:666
+msgid "Serial Plotter"
+msgstr ""
+
 #: Editor.java:682
 msgid "Board"
 msgstr ""