Merge pull request #34 from chillibasket/dev

Dev
chillibasket · Jun 12, 2022 · 60f132e · 60f132e
2 parents 78368a9 + d9ad0a0
commit 60f132e
Show file tree

Hide file tree

Showing 9 changed files with 345 additions and 31 deletions.
diff --git a/ProcessingGrapher/CustomTable.pde b/ProcessingGrapher/CustomTable.pde
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Copyright (C) 2021 - Simon Bluett <hello@chillibasket.com>
+ * Copyright (C) 2022 - Simon Bluett <hello@chillibasket.com>
  *
  * This file is part of ProcessingGrapher 
  * <https://github.com/chillibasket/processing-grapher>

diff --git a/ProcessingGrapher/FileGraph.pde b/ProcessingGrapher/FileGraph.pde
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Copyright (C) 2021 - Simon Bluett <hello@chillibasket.com>
+ * Copyright (C) 2022 - Simon Bluett <hello@chillibasket.com>
  *
  * This file is part of ProcessingGrapher 
  * <https://github.com/chillibasket/processing-grapher>
@@ -200,6 +200,8 @@ class FileGraph implements TabAPI {
 				if (newoutput.contains(".csv")) {
 					//outputfile = newoutput;
 					currentfile = newoutput;
+					outputfile = "No File Set";
+					xData = -1;
 					workerActive = true;
 					WorkerThread loadingThread = new WorkerThread();
 					loadingThread.loadFile();
@@ -233,7 +235,7 @@ class FileGraph implements TabAPI {
 			for (int i = 0; i < dataTable.getColumnCount(); i++) {
 
 				String columnTitle = dataTable.getColumnTitle(i);
-				if (columnTitle.contains("x:")) {
+				if (columnTitle.contains("x:") || columnTitle.contains("X:")) {
 					xData = i;
 				} else if (columnTitle.contains("l:")) {
 					columnTitle = split(columnTitle, ':')[1];
@@ -694,7 +696,7 @@ class FileGraph implements TabAPI {
 					}
 
 					// Draw the label and get the x-axis position
-					float xPosition = graph.setXlabel(xcoord, labelColumn);
+					float xPosition = graph.setXlabel(xcoord, labelColumn, dataSignals.get(labelColumn).signalColor);
 
 					// Set the correct entry in the label column
 					if (xData != -1) {
@@ -1231,7 +1233,7 @@ class FileGraph implements TabAPI {
 					}
 				}
 
-				double[] outputData = filterClass.runFilter(filter, signalData, xAxisData);
+				double[] outputData = filterClass.runFilter(filter, signalData, xAxisData, currentfile);
 
 				if (outputData != null) {
 					String signalName = filterClass.filterSlug[filter] + "[" + dataTable.getColumnTitle(signal) + "]";