added working graph from input, the textfield is for giving the Hz

Author: stipmonster

app/src/processing/app/Editor.java

@@ -954,6 +954,10 @@ protected void selectSerialPort(String name) {
     serialMonitor.closeSerialPort();
     serialMonitor.setVisible(false);
     serialMonitor = new SerialMonitor(Preferences.get("serial.port"));
+    graphMonitor.closeSerialPort();
+    graphMonitor.setVisible(false);
+    graphMonitor = new GraphMonitor(Preferences.get("serial.port"));
+    
     //System.out.println("set to " + get("serial.port"));
   }
 

app/src/processing/app/Graph.java

@@ -0,0 +1,48 @@
+package processing.app;
+//import processing.core.*;
+
+import processing.app.debug.MessageConsumer;
+
+
+import java.io.*;
+import java.util.*;
+import org.jfree.chart.*;
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.ChartPanel;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.axis.NumberTickUnit;
+import org.jfree.chart.axis.TickUnits;
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.plot.DatasetRenderingOrder;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
+import org.jfree.chart.renderer.xy.XYStepRenderer;
+import org.jfree.data.time.Millisecond;
+import org.jfree.data.time.TimeTableXYDataset;
+
+
+public class Graph {
+  
+  private TimeTableXYDataset data;
+  private String name;
+  public Graph(){
+    data = new TimeTableXYDataset();
+    name="a";
+  }
+  public void add(Millisecond y, int x){
+    data.add(y,x,name);
+  }
+  public void reset(){
+    // data=null;  //does not work :S
+    // data=new TimeTableXYDataset();
+  }
+  public ChartPanel panel(){
+    JFreeChart chart = ChartFactory.createXYLineChart(null, null, null,
+        data, PlotOrientation.VERTICAL,
+        false, false, false);
+    ChartPanel panel = new ChartPanel(chart);
+    
+    return panel;
+  }
+}

app/src/processing/app/GraphMonitor.java

@@ -22,7 +22,7 @@
 import processing.core.*;
 
 import java.awt.*;
-import java.util.Date;
+import java.util.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.border.*;
@@ -40,7 +40,7 @@
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
 import org.jfree.chart.renderer.xy.XYStepRenderer;
-import org.jfree.data.time.Second;
+import org.jfree.data.time.Millisecond;
 import org.jfree.data.time.TimeTableXYDataset;
 public class GraphMonitor extends JFrame implements MessageConsumer {
   private Serial serial;
@@ -56,12 +56,16 @@ public class GraphMonitor extends JFrame implements MessageConsumer {
   private JComboBox lineEndings;
   private JComboBox serialRates;
   private int serialRate;
-
+  private boolean start=false;
+  private long starttime;
+  private LinkedList <Character> stringdata;
+  private Graph graph;
+  private int hz=1000;
   public GraphMonitor(String port) {
     super(port);
 
     this.port = port;
-  
+    graph= new Graph();
     addWindowListener(new WindowAdapter() {
         public void windowClosing(WindowEvent e) {
           closeSerialPort();
@@ -78,25 +82,29 @@ public void actionPerformed(ActionEvent e) {
       }});
 
     getContentPane().setLayout(new BorderLayout());
-    
+    stringdata= new LinkedList<Character>();
     Font font = Theme.getFont("console.font");
-    toolbar= new GraphToolbar(null,null);
+    toolbar= new GraphToolbar(this,null);
     textArea = new JTextArea(16, 10);
     textArea.setEditable(false);    
     textArea.setFont(font);
     // don't automatically update the caret.  that way we can manually decide
     // whether or not to do so based on the autoscroll checkbox.
     ((DefaultCaret)textArea.getCaret()).setUpdatePolicy(DefaultCaret.NEVER_UPDATE);
-    
+    textField = new JTextField(40);
+    textField.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        hz=1000/Integer.valueOf(textField.getText()).intValue();
+      }});
     scrollPane = new JScrollPane(textArea);
     JPanel pane = new JPanel();
     pane.setLayout(new BoxLayout(pane, BoxLayout.Y_AXIS));
     pane.setBorder(new EmptyBorder(4, 4, 4, 4));
-    pane.add(this.graph());
+    pane.add(graph.panel());
     pane.add(scrollPane);
     getContentPane().add(toolbar,BorderLayout.NORTH);
     getContentPane().add(pane, BorderLayout.CENTER);
-
+    getContentPane().add(textField, BorderLayout.SOUTH);
     pack();
 
     Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
@@ -162,27 +170,62 @@ public void closeSerialPort() {
   }
 
   public void message(final String s) {
+    //System.err.println(serial.readString());
     SwingUtilities.invokeLater(new Runnable() {//TODO implement 2 arrays for x and y values
       public void run() {
-        textArea.append(s);
-        if (autoscrollBox.isSelected()) {
-          textArea.setCaretPosition(textArea.getDocument().getLength());
+        if (start) {
+          addtobuffer(s);
         }
+        textArea.append(s);
+        textArea.setCaretPosition(textArea.getDocument().getLength());
       }});
   }
-  public ChartPanel graph(){
-    TimeTableXYDataset data = new TimeTableXYDataset();
-    Second second = new Second(new Date(System.currentTimeMillis() + 1000));
-    data.add(second, 20.0,"a");
-    Second second2 = new Second(new Date(System.currentTimeMillis() + 2000));
-    data.add(second2, 30.8,"a");
-    Second second3 = new Second(new Date(System.currentTimeMillis() + 3000));
-    data.add(second3, 60.5,"a");
-    JFreeChart chart = ChartFactory.createXYLineChart(null, null, null,
-        data, PlotOrientation.VERTICAL,
-        false, false, false);
-    ChartPanel panel = new ChartPanel(chart);
-  
-      return panel;
+  public void addtobuffer(String s){
+    for (int i=0; i==(s.length()-1);i++ ) {
+        stringdata.add(s.charAt(i));
+    }
+    
+  }
+  public void handleStart(){
+    start=true;
+    starttime=System.currentTimeMillis();
+    //serial.write("****");
+    //graph.reset();
+    if (textField.getText()!="") {
+      hz=1000/Integer.valueOf(textField.getText()).intValue();
+      
+    }
+  }
+  public void handleStop(){
+    start=false;
+    
+    //serial.write("****");
+    parse();
+  }
+  public void parse(){
+    graph.reset();
+    int count=0;
+    String number="";
+    char c;
+    int isNumber=1;
+    while(stringdata.size()!=0){
+      while(isNumber==1){
+         c=stringdata.poll();
+         if(Character.isDigit(c)){
+           number +=c;          
+        }else{
+           isNumber=0;
+        }
+      }
+      if(number.length()>0){
+        int temp= Integer.valueOf( number ).intValue();
+        graph.add(new Millisecond(new Date(count*hz)),temp);
+        number="";
+        count++;
+      }
+      isNumber=1;
+    }
+    //textArea.append("====");
+    
   }
 }

app/src/processing/app/GraphToolbar.java

@@ -65,7 +65,7 @@ public class GraphToolbar extends JComponent implements MouseInputListener, KeyL
   static final int ROLLOVER = 1;
   static final int ACTIVE   = 2;
 
-  Editor editor;
+  GraphMonitor monitor;
 
   Image offscreen;
   int width, height;
@@ -91,8 +91,8 @@ public class GraphToolbar extends JComponent implements MouseInputListener, KeyL
 
   boolean shiftPressed;
 
-  public GraphToolbar(Editor editor, JMenu menu) {
-    this.editor = editor;
+  public GraphToolbar(GraphMonitor monitor, JMenu menu) {
+    this.monitor = monitor;
     this.menu = menu;
 
     buttonCount = 0;
@@ -304,9 +304,11 @@ public void mousePressed(MouseEvent e) {
 
     switch (sel) {
     case START:
+      monitor.handleStart();
       break;
 
     case STOP:
+      monitor.handleStop();
       break;
 
     case COPY:

build/windows/launcher/config.xml

@@ -26,7 +26,7 @@
     <cp>lib/servlet.jar</cp>
     <cp>lib/jfreechart-swt.jar</cp>
     <cp>lib/gnujaxp.jar</cp>
-    
+    <cp>lib/jcommon.jar</cp>
   </classPath>
   <jre>
     <path>java</path>