Merge pull request #6 from ajayyy/multi-data-source

Multi data source UI improvements
uorocketry · May 24, 2020 · 501dad3 · 501dad3
2 parents f22b54b + 127ea98
commit 501dad3
Show file tree

Hide file tree

Showing 7 changed files with 312 additions and 103 deletions.
diff --git a/libs/XChart-source-3.6.1.zip b/libs/XChart-source-3.6.1.zip
diff --git a/src/uorocketry/basestation/DataChart.java b/src/uorocketry/basestation/DataChart.java
@@ -10,16 +10,16 @@ public class DataChart {
 	/** The snap panel for this chart */
 	SnapPanel snapPanel;
 
-	Window window;
+	Main main;
 
 	// The active chart series on this chart
 	String[] activeSeries = new String[0];
 
 	DataType[] xTypes = {DataHandler.ALTITUDE};
 	DataType yType = DataHandler.TIMESTAMP;
 
-	public DataChart(Window window, XYChart xyChart, XChartPanel<XYChart> chartPanel) {
-		this.window = window;
+	public DataChart(Main main, XYChart xyChart, XChartPanel<XYChart> chartPanel) {
+		this.main = main;
 
 		this.xyChart = xyChart;
 		this.chartPanel = chartPanel;
@@ -32,8 +32,8 @@ public DataChart(Window window, XYChart xyChart, XChartPanel<XYChart> chartPanel
 		}
 	}
 
-	public DataChart(Window window, XYChart xyChart, XChartPanel<XYChart> chartPanel, DataType[] xTypes) {
-		this(window, xyChart, chartPanel);
+	public DataChart(Main main, XYChart xyChart, XChartPanel<XYChart> chartPanel, DataType[] xTypes) {
+		this(main, xyChart, chartPanel);
 
 		this.xTypes = xTypes;
 	}

diff --git a/src/uorocketry/basestation/DataHandler.java b/src/uorocketry/basestation/DataHandler.java
@@ -1,5 +1,8 @@
 package uorocketry.basestation;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import javax.swing.JTable;
 import javax.swing.table.TableModel;
 
@@ -24,6 +27,10 @@ public class DataHandler {
 	static final DataType GPS_FIX_QUALITY = new DataType(14, 0);
 
 	Data[] data;
+	DataType[] types;
+
+	/** Which of this data should be hidden for any reason */
+	List<DataType> hiddenDataTypes = new LinkedList<DataType>();
 
 	/**
 	 * This chooses which table this data is displayed in
@@ -34,6 +41,11 @@ public DataHandler(int tableIndex) {
 		this.tableIndex = tableIndex;
 
 		this.data = new Data[Main.dataLength.get(tableIndex)];
+
+		types = new DataType[Main.dataLength.get(tableIndex)];
+		for (int i = 0; i < types.length; i++) {
+			types[i] = new DataType(i, tableIndex);
+		}
 	}
 
 	public void updateTableUIWithData(JTable table, String[] labels) {
@@ -43,8 +55,11 @@ public void updateTableUIWithData(JTable table, String[] labels) {
 			// Set label
 			tableModel.setValueAt(labels[i], i, 0);
 
+			String dataText = data[i].getFormattedString();
+			if (hiddenDataTypes.contains(types[i])) dataText = "Hidden Data";
+
 			// Set data
-			tableModel.setValueAt(data[i].getFormattedString(), i, 1);
+			tableModel.setValueAt(dataText, i, 1);
 		}
 	}
 

diff --git a/src/uorocketry/basestation/DataType.java b/src/uorocketry/basestation/DataType.java
@@ -9,6 +9,17 @@ public DataType(int index, int tableIndex) {
 		this.tableIndex = tableIndex;
 	}
 
+	@Override
+	public boolean equals(Object object) {
+		if (object != null && object.getClass() == getClass()) {
+			DataType other = (DataType) object;
+
+			return equals(other.index, other.tableIndex);
+		}
+
+		return false;
+	}
+
 	public boolean equals(int index, int tableIndex) {
 		return this.index == index && this.tableIndex == tableIndex;
 	}