Team4388/RidgeScout
1
0
Fork 0
mirror of https://github.com/Team4388/RidgeScout.git synced 2026-06-08 16:28:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from Team4388/Fix-CSV-Export

Browse Source 
Fix CSV Export
This commit is contained in:
Michael Mikovsky
2025-03-06 18:48:05 +00:00
committed by GitHub
parent 0846f5a3b3 a15deda539
commit 18748301cd
10 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/ridgebotics/ridgescout/types/data/dataType.java
+4
View File
@@ -1,5 +1,9 @@
package com.ridgebotics.ridgescout.types.data;
import androidx.annotation.NonNull;
import org.jetbrains.annotations.NotNull;
public abstract class dataType {
public enum valueTypes {
NUM,
app/src/main/java/com/ridgebotics/ridgescout/types/input/checkboxType.java
+4
View File
@@ -219,5 +219,9 @@ public class checkboxType extends inputType {
chart.invalidate();
parent.addView(chart);
}
public String toString(dataType data){
return (int) data.get() == 1 ? "true" : "false";
}
}
app/src/main/java/com/ridgebotics/ridgescout/types/input/dropdownType.java
+4
View File
@@ -245,5 +245,9 @@ public class dropdownType extends inputType {
chart.invalidate();
parent.addView(chart);
}
public String toString(dataType data){
return text_options[(int) data.get()];
}
}
app/src/main/java/com/ridgebotics/ridgescout/types/input/fieldposType.java
+5
View File
@@ -232,5 +232,10 @@ public class fieldposType extends inputType {
parent.addView(chart);
}
public String toString(dataType data){
int[] intarr = (int[]) data.get();
return "[" + intarr[0] + "," + intarr[1] + "]";
}
}
app/src/main/java/com/ridgebotics/ridgescout/types/input/inputType.java
+3
View File
@@ -107,4 +107,7 @@ public abstract class inputType {
public abstract void add_history_view(LinearLayout parent, dataType[] data);
public abstract String toString(dataType data);
}
app/src/main/java/com/ridgebotics/ridgescout/types/input/numberType.java
+4
View File
@@ -318,5 +318,9 @@ public class numberType extends inputType {
parent.addView(chart);
}
public String toString(dataType data){
return String.valueOf((int) data.get());
}
}
app/src/main/java/com/ridgebotics/ridgescout/types/input/sliderType.java
+4
View File
@@ -305,4 +305,8 @@ public class sliderType extends inputType {
parent.addView(chart);
}
public String toString(dataType data){
return String.valueOf((int) data.get());
}
}
app/src/main/java/com/ridgebotics/ridgescout/types/input/tallyType.java
+4
View File
@@ -298,5 +298,9 @@ public class tallyType extends inputType {
parent.addView(chart);
}
public String toString(dataType data){
return String.valueOf((int) data.get());
}
}
app/src/main/java/com/ridgebotics/ridgescout/types/input/textType.java
+4
View File
@@ -230,5 +230,9 @@ public class textType extends inputType {
parent.addView(chart);
}
public String toString(dataType data){
return String.valueOf(data.get());
}
}
app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/CSVExport.java
+11 -4
View File
@@ -12,6 +12,7 @@ import com.ridgebotics.ridgescout.scoutingData.ScoutingDataWriter;
import com.ridgebotics.ridgescout.types.data.dataType;
import com.ridgebotics.ridgescout.types.frcMatch;
import com.ridgebotics.ridgescout.types.frcTeam;
import com.ridgebotics.ridgescout.types.input.inputType;
import com.ridgebotics.ridgescout.utility.DataManager;
import com.ridgebotics.ridgescout.utility.fileEditor;
@@ -59,11 +60,14 @@ public class CSVExport {
data += ("null,".repeat(match_latest_values.length));
}else{
try {
String tempData = "";
ScoutingDataWriter.ParsedScoutingDataResult psdr = ScoutingDataWriter.load(filename, DataManager.match_values, DataManager.match_transferValues);
dataType[] types = psdr.data.array;
dataType[] matchData = psdr.data.array;
inputType[] types = psdr.data.values[psdr.data.values.length-1];
for (int i = 0; i < types.length; i++) {
data += (safeCSV(types[i].get().toString()) + ",");
tempData += (safeCSV(types[i].toString(matchData[i])) + ",");
}
data += tempData;
} catch (Exception e){
e.printStackTrace();
data += ("null,".repeat(pit_latest_values.length));
@@ -108,11 +112,14 @@ public class CSVExport {
data += ("null,".repeat(pit_latest_values.length));
}else{
try {
String tempData = "";
ScoutingDataWriter.ParsedScoutingDataResult psdr = ScoutingDataWriter.load(filename, DataManager.pit_values, DataManager.pit_transferValues);
dataType[] types = psdr.data.array;
dataType[] teamData = psdr.data.array;
inputType[] types = psdr.data.values[psdr.data.values.length-1];
for (int i = 0; i < types.length; i++) {
data += (safeCSV(types[i].get().toString()) + ",");
tempData += (safeCSV(types[i].toString(teamData[i])) + ",");
}
data += tempData;
} catch (Exception e){
e.printStackTrace();
data += ("null,".repeat(pit_latest_values.length));