From 940b15a20c591e305a944944c7beefcceee50797 Mon Sep 17 00:00:00 2001 From: wildercayden Date: Mon, 10 Feb 2025 11:54:13 -0500 Subject: [PATCH] Changed the way you save to the CSV file --- .../com/example/scoutingapp/AutoActivity.java | 43 +++++++++++-------- .../com/example/scoutingapp/TeleActivity.java | 43 ++++++++++--------- 2 files changed, 48 insertions(+), 38 deletions(-) diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java index 9fcb29e..ab02a35 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java @@ -17,6 +17,7 @@ import androidx.core.view.WindowInsetsCompat; import java.io.File; import java.io.FileWriter; import java.io.IOException; +import java.io.PrintWriter; public class AutoActivity extends AppCompatActivity { private int l4Scored = 0; @@ -182,32 +183,38 @@ public class AutoActivity extends AppCompatActivity { netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net\n", netScored)); } + public void CSVmake(Context context) { - //adds the strings String CSVLine = String.format( - "%s,%s,%s,Auto,%s,%s,%s,%s,%s,%s,%s,%s,%s", - eventString, - matchString, - TeamString, - l4Scored, - l3Scored, - l2Scored, - l1Scored, - processorScored, - netScored, + "%b,%b,%b", reefPickup, canLeave, coralPickup ); - //makes the file - File csvFile = new File(context.getFilesDir(), eventString+matchString+TeamString+".csv"); + + File csvFile = new File(context.getFilesDir(), eventString + matchString + TeamString + ".csv"); Log.d("CSVFile", "File created/written at: " + csvFile.getAbsolutePath()); - //writes to file - try (FileWriter writer = new FileWriter(csvFile, true)) { - writer.append(CSVLine).append("\n"); - Log.d("CSVFilePath", csvFile.getAbsolutePath()); + + try (PrintWriter pwriter = new PrintWriter(new FileWriter(csvFile), true)) { + pwriter.append(eventString).append(","); + pwriter.append(matchString).append(","); + pwriter.append(TeamString).append(","); + pwriter.append("auto").append(","); + + pwriter.print(l4Scored); pwriter.print(","); + pwriter.print(l3Scored); pwriter.print(","); + pwriter.print(l2Scored); pwriter.print(","); + pwriter.print(l1Scored); pwriter.print(","); + pwriter.print(netScored); pwriter.print(","); + pwriter.print(processorScored); pwriter.print(","); + + pwriter.append(CSVLine).append("\n"); + + Log.d("CSVSuccess", "CSV written successfully at: " + csvFile.getAbsolutePath()); } catch (IOException e) { - Log.d("CSVFail", "CSV didn't make"); + Log.e("CSVFail", "CSV didn't make", e); } } + } + diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java index 9be5c00..5fe65a4 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java @@ -17,6 +17,7 @@ import androidx.core.view.WindowInsetsCompat; import java.io.File; import java.io.FileWriter; import java.io.IOException; +import java.io.PrintWriter; public class TeleActivity extends AppCompatActivity { private int l4Scored = 0; @@ -138,7 +139,7 @@ public class TeleActivity extends AppCompatActivity { nextButton.setOnLongClickListener((v) -> { //submit data - csvMake(); + CSVmake(TeleActivity.this); Intent intent = new Intent(this, EndActivity.class); intent.putExtra(Event_Key, eventString); intent.putExtra(Match_key, matchString); @@ -181,33 +182,35 @@ public class TeleActivity extends AppCompatActivity { netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net\n", netScored)); } - public void csvMake() { - //adds the strings + public void CSVmake(Context context) { String CSVLine = String.format( - "%s,%s,%s,Tele,%s,%s,%s,%s,%s,%s,%s,%s,%s", - eventString, - matchString, - TeamString, - l4Scored, - l3Scored, - l2Scored, - l1Scored, - processorScored, - netScored, + "%b,%b,%b", reefPickup, canLeave, coralPickup ); - //makes the file - File csvFile = new File(this.getFilesDir(), eventString+matchString+TeamString+".csv"); + File csvFile = new File(context.getFilesDir(), eventString + matchString + TeamString + ".csv"); Log.d("CSVFile", "File created/written at: " + csvFile.getAbsolutePath()); - //writes to file - try (FileWriter writer = new FileWriter(csvFile, true)) { - writer.append(CSVLine).append("\n"); - Log.d("CSVFilePath", csvFile.getAbsolutePath()); + + try (PrintWriter pwriter = new PrintWriter(new FileWriter(csvFile), true)) { + pwriter.append(eventString).append(","); + pwriter.append(matchString).append(","); + pwriter.append(TeamString).append(","); + pwriter.append("auto").append(","); + + pwriter.print(l4Scored); pwriter.print(","); + pwriter.print(l3Scored); pwriter.print(","); + pwriter.print(l2Scored); pwriter.print(","); + pwriter.print(l1Scored); pwriter.print(","); + pwriter.print(netScored); pwriter.print(","); + pwriter.print(processorScored); pwriter.print(","); + + pwriter.append(CSVLine).append("\n"); + + Log.d("CSVSuccess", "CSV written successfully at: " + csvFile.getAbsolutePath()); } catch (IOException e) { - Log.d("CSVFail", "CSV didn't make"); + Log.e("CSVFail", "CSV didn't make", e); } } }