fixed scaling issue in listener, updated readme and examples

Author: devinaconley

Plotter/examples/control_points_displayed/control_points_displayed.ino

@@ -27,8 +27,8 @@ void setup() {
   p.addXYGraph("X-Y graph w/ 200 points", 200, "x axis", &x, "y axis", &y);
 
   // Add time graphs. Notice the effect of points displayed on the time scale
-  p.addTimeGraph("Time graph w/ 100 points", 1000, "x label", &x);
   p.addTimeGraph("Time graph w/ 500 points", 500, "x label", &x);
+  p.addTimeGraph("Time graph w/ 200 points", 200, "x label", &x);
 
 }
 

Plotter/examples/dynamically_modify_graph_layout/dynamically_modify_graph_layout.ino

@@ -29,20 +29,20 @@ void setup() {
   p = Plotter();
 
   // Add a graph during setup
-  p.addTimeGraph("x and y against time", 2000, "x label", &x, "y label", &y);
+  p.addTimeGraph("x and y against time", 1000, "x label", &x, "y label", &y);
 }
 
 void loop() {
 
   // After 3 seconds add a 1-variable graph
   if (millis() > 3000 && add_first) {
-    p.addTimeGraph("First dynamic addition", 2000, "z label", &z);
+    p.addTimeGraph("First dynamic addition", 1000, "z label", &z);
     add_first = false;
   }
 
   // After 5 seconds, add a 3-variable graph
   if (millis() > 5000 && add_second) {
-    p.addTimeGraph("Second dynamic addition", 2000, "x label", &x, "y label", &y, "z label", &z);
+    p.addTimeGraph("Second dynamic addition", 1000, "x label", &x, "y label", &y, "z label", &z);
     add_second = false;
   }
 

Plotter/library.properties

@@ -1,9 +1,9 @@
 name=Plotter
-version=1.0.0
+version=1.0.1
 author=Devin Conley <devinconley@jhu.edu>
 maintainer=Devin Conley <devinconley@jhu.edu>
-sentence=an Arduino library for easy plotting using Processing via serial communication.
-paragraph=Supports multi-variable plots against time as well as 2D plotting of an X vs Y variable. Multiple graphs can be displayed at once, with all formatting and scaling handled automatically. Various listener options are provided, including stand-alone options so that the Processing software does NOT need to be downloaded. The listener requires no modification, just start the program on the host computer.
+sentence=An Arduino library for easy plotting on host computer via serial communication.
+paragraph=Supports multi-variable plots against time as well as 2D plotting of an X vs Y variable. Multiple graphs can be displayed at once, with all formatting and scaling handled automatically. A stand-alone listener application, written with Processing, is provided.
 category=Data Processing
 url=https://github.com/devinconley/ArduinoPlotter
 architectures=*

README.md

@@ -1,26 +1,20 @@
 ArduinoPlotter
 ===============
-an Arduino library for easy plotting using Processing via serial communication
+An Arduino library for easy plotting on host computer via serial communication
 
 _by: Devin Conley_
 
-Types of plots available:
-------------------------
-- Multivariable plots against time
-- 2-variable "x" vs "y" plots
-
 Features:
 ----------
+- Multi-variable plots against time
+- 2-variable "x" vs "y" plots
 - Display multiple graphs within single window 
-- Simply pass a reference to your variables when the graph is added, no need to update the values manually
-- Choose desired number of data points to be shown along time scale for each graph
+- Simply pass a reference to your variables when the graph is added, no need to update each value directly
+- Control number of data points displayed on each graph
 - Auto-scaling to fit all data on graph
+- Stand-alone listener application, written with Processing, is provided
 
-Processing listener options:
------------------------------
-- Stand-alone Windows application (32-bit, 64-bit)
-- Stand-alone Linux application (32-bit, 64-bit)
-- Source Processing script (ArduinoPlotter_processingListener.pde)
+![Plotter Preview Image](https://www.dropbox.com/s/0471kf89skyo72x/plotter_preview.png?raw=1)
 
 Quickstart:
 ------------
@@ -30,10 +24,10 @@ Search for "Plotter" in the Arduino Library Manager.
 
 ___or___
 
-Install directly with the [ZIP file of Plotter](https://github.com/devinconley/ArduinoPlotter-for-Library-Manager/archive/master.zip)/
+Install manually with the [ZIP file of Plotter](https://github.com/devinconley/ArduinoPlotter-for-Library-Manager/archive/master.zip).
 
 #### Setup Listener
-Download one of the following stand-alone listener options. Keep the folder intact so the application can access the lib and source folders. These stand-alone applications are dependent on your system having the Java Runtime Engine (JRE) installed.
+Download one of the following stand-alone listener options. Keep the folder intact so the application can access the library and source folders. 
 - [Windows 32-bit](https://www.dropbox.com/s/88wa2nkfzh5j3uz/ArduinoPlotter_listener_windows32.zip?dl=1)
 - [Windows 64-bit](https://www.dropbox.com/s/ahy2ppul6v4lybi/ArduinoPlotter_listener_windows64.zip?dl=1)
 - [Linux 32-bit](https://www.dropbox.com/s/ilt9n3hkiw74vrf/ArduinoPlotter_listener_linux32.zip?dl=1)
@@ -58,11 +52,10 @@ Plotter p;
 ```
 
 Create the Plotter object and add graphs as desired. When adding graphs, the first argument is a String with the title of the graph and the second argument is an int with the number of points displayed at any given time. These two arguments are followed by atleast one String and double reference. Include more arguments (in pairs of a String and double reference) to plot multiple variables on a single time graph. If adding an XYGraph, exactly two of these pairs are required. 
-_Although graphs will usually be added during setup(), they can be added and removed at any time (see example on dynamic modification)._
 ```arduino
 void setup() {
   p = Plotter();
-
+  
   p.addTimeGraph("Some title of single variable graph", 500, "label for x", &x);
   p.addTimeGraph("Some title of two-variable graph", 500, "label for x", &x, "label for y", &y);
   p.addXYGraph("Title of x versus y graph", 500, "x axis", &x, "y axis", &y);
@@ -75,11 +68,15 @@ void loop() {
   x = 10*sin(2.0*PI*(millis()/5000.0));
   y = 10*cos(2.0*PI*(millis()/5000.0));
 
-  p.plot();
+  p.plot(); // usually called within loop()
 }
 ```
 
 #### Using the Listener
-Once the Arduino is running, start the listener application that you chose above.
+Once the Arduino is running, start the listener application that you setup above.
+
+![Start Listener Image](https://www.dropbox.com/s/9kyzory64369mjh/start_listener.png?raw=1)
+
+The application will auto-configure itself and your data should be plotted appropriately.
 
 __That's it!__

listener_src/ArduinoPlotter_processingListener/ArduinoPlotter_processingListener.pde

@@ -38,6 +38,7 @@ final int BG_COL = 75; //
 final int PLOT_COL = 115;
 final int TICK_LEN = 6;
 final int NUM_TICKS = 5;
+final float PT_SZ = 1.5;
 
 // Setup and config Globals
 int h;
@@ -78,6 +79,7 @@ void setup() {
   frameRate(100);
   textSize(16);
   background(BG_COL);
+  strokeWeight(PT_SZ);
 }
 
 void draw() {
@@ -191,28 +193,34 @@ void drawTicks(int g) {
   // Draw ticks along y-axis
   float temp_x = pos_graphs[g][0] - TICK_LEN/2;
   float tick_offset = 0.5*(1.0 - AXIS_COVERAGE)*sub_height; 
+  float tick_interval = AXIS_COVERAGE * sub_height / (NUM_TICKS - 1);
   float val = (float)extremes_graphs[g][3];
   float val_interval = (float)(extremes_graphs[g][3] - extremes_graphs[g][2]) / (NUM_TICKS - 1);
   for (float temp_y = pos_graphs[g][1] + tick_offset;
-       temp_y <= pos_graphs[g][1] + sub_height - tick_offset; 
-       temp_y += AXIS_COVERAGE * sub_height / (NUM_TICKS - 1)) {
+       temp_y <= pos_graphs[g][1] + sub_height - tick_offset; temp_y += tick_interval) {
     line(temp_x, temp_y, temp_x + TICK_LEN, temp_y);
     text(Float.toString(val), temp_x + TICK_LEN + 5, temp_y);
     val -= val_interval;
   }
-  // Draw along x-axis
+  // Draw along x-axis (will be diff for each type of graph)
   float temp_y = pos_graphs[g][1] + sub_height - TICK_LEN/2;
-  tick_offset = 0.5*(1.0 - AXIS_COVERAGE)*sub_width;
-  val = (float)extremes_graphs[g][0];
-  val_interval = (float)(extremes_graphs[g][1] - extremes_graphs[g][0]) / (NUM_TICKS - 1);  
+  // if XvY graph, evenly spaced ticks within coverage
   if (xvy[g]) {
-    val *= AXIS_COVERAGE;
-    val_interval *= AXIS_COVERAGE;
+    val = (float)extremes_graphs[g][0];
+    val_interval = (float)(extremes_graphs[g][1] - extremes_graphs[g][0]) / (NUM_TICKS - 1);  
+    tick_offset = 0.5*(1.0 - AXIS_COVERAGE)*sub_width;
+    tick_interval = AXIS_COVERAGE * sub_width / (NUM_TICKS - 1);
+  // if a time graph, evenly spaced ticks across all
+  } else {
+    val_interval = (float)(extremes_graphs[g][1] - extremes_graphs[g][0]) / (NUM_TICKS + 1);
+    val = (float)extremes_graphs[g][0] + val_interval;
+    tick_offset = sub_width / (NUM_TICKS + 1);
+    tick_interval = tick_offset;
   }
   textAlign(CENTER, BOTTOM);
   for (temp_x = pos_graphs[g][0] + tick_offset;
        temp_x <= pos_graphs[g][0] + sub_width - tick_offset; 
-       temp_x += AXIS_COVERAGE * sub_width / (NUM_TICKS - 1)) {
+       temp_x += tick_interval) {
     line(temp_x, temp_y, temp_x, temp_y + TICK_LEN);
     text(Float.toString(val), temp_x, temp_y - 5);
     val += val_interval;