Merge branch 'master' of git://github.com/duff2013/Arduino

Author: cmaglie

app/src/processing/app/SerialPlotter.java

@@ -38,7 +38,7 @@ public class SerialPlotter extends AbstractMonitor {
   private final StringBuffer messageBuffer;
   private JComboBox<String> serialRates;
   private Serial serial;
-  private int serialRate;
+  private int serialRate, xCount;
 
   private ArrayList<Graph> graphs;
   private final static int BUFFER_CAPACITY = 500;
@@ -73,14 +73,17 @@ private float transformY(double rawY, double minY, double rangeY, double height)
   private class GraphPanel extends JPanel {
     private double minY, maxY, rangeY;
     private Rectangle bounds;
-    private int xOffset;
+    private int xOffset, xPadding;
     private final Font font;
-    private final Color bgColor;
+    private final Color bgColor, gridColor, boundsColor;
 
     public GraphPanel() {
       font = Theme.getFont("console.font");
       bgColor = Theme.getColor("plotting.bgcolor");
+      gridColor = Theme.getColor("plotting.gridcolor");
+      boundsColor = Theme.getColor("plotting.boundscolor");
       xOffset = 20;
+      xPadding = 20;
     }
 
     private Ticks computeBounds() {
@@ -100,7 +103,7 @@ private Ticks computeBounds() {
         minY = mid - MIN_DELTA / 2;
       }
 
-      Ticks ticks = new Ticks(minY, maxY, 3);
+      Ticks ticks = new Ticks(minY, maxY, 5);
       minY = Math.min(minY, ticks.getTick(0));
       maxY = Math.max(maxY, ticks.getTick(ticks.getTickCount() - 1));
       rangeY = maxY - minY;
@@ -132,16 +135,56 @@ public void paintComponent(Graphics g1) {
         Rectangle2D fRect = fm.getStringBounds(String.valueOf(tick), g);
         xOffset = Math.max(xOffset, (int) fRect.getWidth() + 15);
 
+        g.setColor(boundsColor);
         // draw tick
         g.drawLine(xOffset - 5, (int) transformY(tick), xOffset + 2, (int) transformY(tick));
         // draw tick label
         g.drawString(String.valueOf(tick), xOffset - (int) fRect.getWidth() - 10, transformY(tick) - (float) fRect.getHeight() * 0.5f + fm.getAscent());
+        // draw horizontal grid lines
+        g.setColor(gridColor);
+        g.drawLine(xOffset + 3, (int) transformY(tick), bounds.width - xPadding, (int) transformY(tick));
       }
 
-      g.drawLine(bounds.x + xOffset, bounds.y + 5, bounds.x + xOffset, bounds.y + bounds.height - 10);
-
+      // handle data count
+      int cnt = xCount - BUFFER_CAPACITY;
+      if (xCount < BUFFER_CAPACITY) cnt = 0;
+        
+      double zeroTick = ticks.getTick(0);
+      double lastTick = ticks.getTick(ticks.getTickCount() - 1);
+      double xTickRange = BUFFER_CAPACITY / ticks.getTickCount();
+        
+      for (int i = 0; i < ticks.getTickCount() + 1; i++) {
+          String s;
+          int xValue;
+          int sWidth;
+          Rectangle2D fBounds;
+          if  (i == 0) {
+              s = String.valueOf(cnt);
+              fBounds = fm.getStringBounds(s, g);
+              sWidth = (int)fBounds.getWidth()/2;
+              xValue = xOffset;
+          } else {
+              s = String.valueOf((int)(xTickRange * i)+cnt);
+              fBounds = fm.getStringBounds(s, g);
+              sWidth = (int)fBounds.getWidth()/2;
+              xValue = (int)((bounds.width - xOffset - xPadding) * ((xTickRange * i) / BUFFER_CAPACITY) + xOffset);
+          }
+          // draw graph x axis, ticks and labels
+          g.setColor(boundsColor);
+          g.drawString(s, xValue - sWidth, (int) bounds.y + (int) transformY(zeroTick) + 15);
+          g.drawLine(xValue, (int)transformY(zeroTick) - 2, xValue, bounds.y + (int)transformY(zeroTick) + 5);
+          // draw vertical grid lines
+          g.setColor(gridColor);
+          g.drawLine(xValue, (int)transformY(zeroTick) - 3, xValue, bounds.y + (int)transformY(lastTick));
+      }
+      g.setColor(boundsColor);
+      // draw major y axis
+      g.drawLine(bounds.x + xOffset, (int) transformY(lastTick) - 5, bounds.x + xOffset, bounds.y + (int) transformY(zeroTick) + 5);
+      // draw major x axis
+      g.drawLine(xOffset, (int) transformY(zeroTick), bounds.width - xPadding, (int)transformY(zeroTick));
+        
       g.setTransform(AffineTransform.getTranslateInstance(xOffset, 0));
-      float xstep = (float) (bounds.width - xOffset) / (float) BUFFER_CAPACITY;
+      float xstep = (float) (bounds.width - xOffset - xPadding) / (float) BUFFER_CAPACITY;
       int legendLength = graphs.size() * 10 + (graphs.size() - 1) * 3;
 
       for(int i = 0; i < graphs.size(); ++i) {
@@ -206,6 +249,7 @@ protected void onCreateWindow(Container mainPane) {
 
     serialRates.setMaximumSize(serialRates.getMinimumSize());
 
+    pane.add(Box.createHorizontalGlue());
     pane.add(Box.createRigidArea(new Dimension(8, 0)));
     pane.add(serialRates);
 
@@ -227,7 +271,7 @@ public void message(final String s) {
       if (linebreak == -1) {
         break;
       }
-
+      xCount++;
       String line = messageBuffer.substring(0, linebreak);
       messageBuffer.delete(0, linebreak + 1);
 

build/shared/lib/theme/theme.txt

@@ -40,6 +40,8 @@ buttons.status.color = #ffffff
 # color cycle created via colorbrewer2.org
 plotting.bgcolor = #ffffff
 plotting.color = #ffffff
+plotting.gridcolor = #f0f0f0
+plotting.boundscolor = #000000
 plotting.graphcolor.size = 4
 plotting.graphcolor.00 = #2c7bb6
 plotting.graphcolor.01 = #fdae61

build/shared/revisions.txt

@@ -7,6 +7,7 @@ ARDUINO 1.6.13
   didn't use it straight away (this caused issues mainly on CI environments)
 * Libraries and Boards Managers: if a download error happens (CRC error) the IDE tries to download the file again
   without the need to remove the corrupted file manually.
+* Improved serial plotter with horizontal axis and grid. Thanks @duff2013
 
 [core]
 * avr: set default values for "upload.verify" and "program.verify" (allows compatibility with older IDE). Thanks @per1234