auto-scaling added. support for X-Y graphing added.

Author: devinaconley

Plotter/Plotter.cpp

@@ -5,75 +5,99 @@ Plotter::Plotter() {
   head = NULL;
   total_size = 0;
   num_graphs = 0;
+  max_points_displayed = 0;
   last_updated = millis();
 }
 
 Plotter::~Plotter() { }
 
 
-void Plotter::addTimeGraph(String title, String labelA, double* refA) {
+void Plotter::addTimeGraph(String title, int points_displayed, String labelA, double* refA) {
   GraphNode* temp = head;
   String labels[] = {labelA};
   double* refs[] = {refA};
-  head = new GraphNode(title, labels, refs, 1, false);
+  head = new GraphNode(title, labels, refs, 1, false, points_displayed);
   head->next = temp;
   total_size++;
   num_graphs++;
+  if (points_displayed > max_points_displayed) {
+    max_points_displayed = points_displayed;
+  }
   last_updated = millis();
 }
 
-void Plotter::addTimeGraph(String title, String labelA, double* refA, 
+void Plotter::addTimeGraph(String title, int points_displayed, String labelA, double* refA, 
 			   String labelB, double* refB) {
   GraphNode* temp = head;
   String labels[] = {labelA, labelB};
   double* refs[] = {refA, refB};
-  head = new GraphNode(title, labels, refs, 2, false);
+  head = new GraphNode(title, labels, refs, 2, false, points_displayed);
   head->next = temp;
   total_size+=2;
   num_graphs++;
+  if (points_displayed > max_points_displayed) {
+    max_points_displayed = points_displayed;
+  }
   last_updated = millis();
 }
 
-void Plotter::addTimeGraph(String title, String labelA, double* refA, 
+void Plotter::addTimeGraph(String title, int points_displayed, String labelA, double* refA, 
 			   String labelB, double* refB, String labelC, double* refC) {
   GraphNode* temp = head;
   String labels[] = {labelA, labelB, labelC};
   double* refs[] = {refA, refB, refC};
-  head = new GraphNode(title, labels, refs, 3, false);
+  head = new GraphNode(title, labels, refs, 3, false, points_displayed);
   head->next = temp;
   total_size+=3;
   num_graphs++;
+  if (points_displayed > max_points_displayed) {
+    max_points_displayed = points_displayed;
+  }
   last_updated = millis();
 }
 
 
-void Plotter::addXYGraph(String title, String labelX, double* refX, String labelY, double* refY) {
+void Plotter::addXYGraph(String title, int points_displayed, String labelX, double* refX, String labelY, double* refY) {
+  // Code for creating XYgraph...
+  GraphNode* temp = head;
+  String labels[] = {labelX, labelY};
+  double* refs[] = {refX, refY};
+  head = new GraphNode(title, labels, refs, 2, true, points_displayed);
+  head->next = temp;
   total_size+=2;
   num_graphs++;
+  if (points_displayed > max_points_displayed) {
+    max_points_displayed = points_displayed;
+  }
   last_updated = millis();
 }
 
-void Plotter::init() {
-
-}
-
 void Plotter::plot() {
   // Print configuration code
-  Serial.print(OUTER_KEY);
-  Serial.print(num_graphs); Serial.print('@'); Serial.print(total_size); Serial.print('@'); 
+  String code = OUTER_KEY;
+  code += (num_graphs + INNER_KEY + total_size + INNER_KEY
+	   + max_points_displayed + INNER_KEY + last_updated + INNER_KEY);
+  Serial.print(code);
+  /*
+    Serial.print(OUTER_KEY);
+  Serial.print(num_graphs); Serial.print('@'); Serial.print(num_time); Serial.print(INNER_KEY);
+  Serial.print(total_size); Serial.print('@'); 
   Serial.print(last_updated); Serial.print('@'); Serial.println();
+  */
   GraphNode* temp = head;
   while (temp != NULL) {
+    Serial.println();
     temp->plot();
     temp = temp->next;
   }
-  Serial.print(OUTER_KEY);
+  Serial.println(OUTER_KEY);
 }
 
 // Functions for helper class
-Plotter::GraphNode::GraphNode(String title, String* _labels, double** _refs, int size, bool xvy) :  title(title), size(size), xvy(xvy) {
+Plotter::GraphNode::GraphNode(String title, String* _labels, double** _refs, int size, bool xvy, 
+			      int points_displayed) : title(title), size(size), xvy(xvy), 
+						      points_displayed(points_displayed) {
   next = NULL;
-  points_displayed = 300;
   labels = new String[size];
   refs = new double*[size];
   for (int i = 0; i < size; i++) {
@@ -84,12 +108,11 @@ Plotter::GraphNode::GraphNode(String title, String* _labels, double** _refs, int
 
 void Plotter::GraphNode::plot() {
   Serial.print(title); Serial.print('@');
-  Serial.print(true); Serial.print('@');
+  Serial.print(xvy); Serial.print('@');
   Serial.print(points_displayed); Serial.print('@');
   Serial.print(size); Serial.print('@');
   for (int i = 0; i < size; i++) {
     Serial.print(labels[i]); Serial.print('@');
     Serial.print(*refs[i]); Serial.print('@');
   }
-  Serial.println();
 }

Plotter/Plotter.h

@@ -7,12 +7,14 @@ class Plotter {
  public:
   Plotter();
   ~Plotter();
-  void addTimeGraph(String title, String labelA, double* refA);
-  void addTimeGraph(String title, String labelA, double* refA, String labelB, double* refB);
-  void addTimeGraph(String title, String labelA, double* refA, String labelB, double* refB, 
-		    String labelC, double* refC);
+  void addTimeGraph(String title, int points_displayed, String labelA, double* refA);
+  void addTimeGraph(String title, int points_displayed, String labelA, double* refA, 
+		    String labelB, double* refB);
+  void addTimeGraph(String title, int points_displayed, String labelA, double* refA, 
+		    String labelB, double* refB, String labelC, double* refC);
 
-  void addXYGraph(String title, String labelX, double* refX, String labelY, double* refY);
+  void addXYGraph(String title, int points_displayed,
+		  String labelX, double* refX, String labelY, double* refY);
   void init();
   void plot();
 
@@ -22,7 +24,8 @@ class Plotter {
   class GraphNode {
   public:
     GraphNode* next;
-    GraphNode(String title, String* labels, double** refs, int size, bool xvy);
+    GraphNode(String title, String* labels, double** refs, int size, bool xvy, 
+	      int points_displayed);
     void plot();
   private:
     bool xvy;
@@ -35,11 +38,14 @@ class Plotter {
   // Private members
   int num_graphs;
   int total_size;
+  int max_points_displayed;
   unsigned long last_updated;
   GraphNode* head;
 
-  static const char OUTER_KEY = '#';
-  static const char INNER_KEY = '@';
 };
 
+static const String OUTER_KEY = "#";
+static const String INNER_KEY = "@";
+
+
 #endif

Plotter/examples/test/test.ino

@@ -13,24 +13,21 @@ boolean anotherOne = true;
 void setup() {
   Serial.begin(9600);
   test = Plotter();
-  test.addTimeGraph("Title of graph", "x label", &x);
+
+  test.addXYGraph("X-Y graph", 3000, "x", &x, "y", &y);
   x = 10;
   test.plot();
 }
 
 void loop() {
 
-  if (millis() > 5000 && oneTime){
-    test.addTimeGraph("Graph 2", "y label", &y, "z label", &z);
-    oneTime = false;
-  }
   if (millis() > 10100 && anotherOne) {
-    test.addTimeGraph("Anothah one", "x", &x, "y", &y, "z", &z);
+    test.addTimeGraph("Anothah one", 3000, "x", &x, "y", &y, "z", &z);
     anotherOne = false;
   }
-  Serial.print("hello");
-  x = 10*sin(2.0*PI*(millis()/1000.0));
-  y = 10*cos(2.0*PI*(millis()/1000.0));
-  z = 5*sin(2.0*PI*(millis()/1000.0));
+
+  x = 10*sin(2.0*PI*(millis()/10000.0));
+  y = 10*cos(2.0*PI*(millis()/10000.0));
+  z = 5*sin(2.0*PI*(millis()/10000.0));
   test.plot();
 }