rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

SerialPlotter: reset xCount when clear the graph

Browse Source
This commit is contained in:
Wilhelm Wiens 2020-04-09 17:05:57 +02:00
parent 819b87cb2d
commit 450c40d9f2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/processing/app/SerialPlotter.java
View File

@ -263,7 +263,7 @@ public class SerialPlotter extends AbstractMonitor {
graphWidth.addChangeListener(cl -> {setNewBufferCapacity((int)graphWidth.getValue()); } ); graphWidth.addChangeListener(cl -> {setNewBufferCapacity((int)graphWidth.getValue()); } );
clearButton.addActionListener(ae -> {graphs.clear();}); clearButton.addActionListener(ae -> {CommandClearGraph();});
} }
protected void onCreateWindow(Container mainPane) { protected void onCreateWindow(Container mainPane) {
@ -396,7 +396,7 @@ public class SerialPlotter extends AbstractMonitor {
sendButton.addActionListener(listener); sendButton.addActionListener(listener);
} }
public void appyPreferences() { public void applyPreferences() {
// Apply line endings. // Apply line endings.
if (PreferencesData.get("serial.line_ending") != null) { if (PreferencesData.get("serial.line_ending") != null) {
lineEndings.setSelectedIndex(PreferencesData.getInteger("serial.line_ending")); lineEndings.setSelectedIndex(PreferencesData.getInteger("serial.line_ending"));
@ -429,6 +429,12 @@ public class SerialPlotter extends AbstractMonitor {
} }
} }
private void CommandClearGraph()
{
graphs.clear();
xCount=0;
}
public void message(final String s) { public void message(final String s) {
messageBuffer.append(s); messageBuffer.append(s);
while (true) { while (true) {
@ -457,7 +463,7 @@ public class SerialPlotter extends AbstractMonitor {
if(parts[i].startsWith("#") && parts[i].length() > 1) { if(parts[i].startsWith("#") && parts[i].length() > 1) {
String command = parts[i].substring(1, parts[i].length()).trim(); String command = parts[i].substring(1, parts[i].length()).trim();
if("CLEAR".equals(command)) { if("CLEAR".equals(command)) {
graphs.clear(); CommandClearGraph();
} }
else if(command.startsWith("SIZE:")) { else if(command.startsWith("SIZE:")) {
String[] subString = parts[i].split("[:]+"); String[] subString = parts[i].split("[:]+");
@ -522,14 +528,14 @@ public class SerialPlotter extends AbstractMonitor {
if(value != null) { if(value != null) {
if(validParts >= graphs.size()) { if(validParts >= graphs.size()) {
graphs.add(new Graph(validParts)); graphs.add(new Graph(validParts, buffer_capacity));
} }
graphs.get(validParts).buffer.add(value); graphs.get(validParts).buffer.add(value);
validParts++; validParts++;
} }
if(label != null) { if(label != null) {
if(validLabels >= graphs.size()) { if(validLabels >= graphs.size()) {
graphs.add(new Graph(validLabels)); graphs.add(new Graph(validLabels, buffer_capacity));
} }
graphs.get(validLabels).label = label; graphs.get(validLabels).label = label;
validLabels++; validLabels++;
@ -538,10 +544,11 @@ public class SerialPlotter extends AbstractMonitor {
else if(validLabels > validParts) validParts = validLabels; else if(validLabels > validParts) validParts = validLabels;
} }
} }
}
SwingUtilities.invokeLater(SerialPlotter.this::repaint); SwingUtilities.invokeLater(SerialPlotter.this::repaint);
} }
public void open() throws Exception { public void open() throws Exception {
super.open(); super.open();