hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code clean-up

Browse Source
This commit is contained in:
SiboVG 2023-03-06 19:25:23 +01:00
parent 92881660ec
commit 61f7abe9a1
1 changed files with 49 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
swing/src/net/sf/openrocket/utils/SimulationTableCSVExport.java
View File

@ -3,7 +3,6 @@ package net.sf.openrocket.utils;
import java.awt.Container; import java.awt.Container;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -26,9 +25,10 @@ import net.sf.openrocket.gui.util.FileHelper;
import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.startup.Preferences;
import net.sf.openrocket.unit.Value; import net.sf.openrocket.unit.Value;
import net.sf.openrocket.util.TextUtil; import net.sf.openrocket.util.TextUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SimulationTableCSVExport { public class SimulationTableCSVExport {
private final OpenRocketDocument document; private final OpenRocketDocument document;
@ -36,15 +36,16 @@ public class SimulationTableCSVExport {
private final ColumnTableModel simulationTableModel; private final ColumnTableModel simulationTableModel;
private final HashMap<String, String> valueColumnToUnitString = new HashMap<>(); private final HashMap<String, String> valueColumnToUnitString = new HashMap<>();
private static final Translator trans = Application.getTranslator();
private static final String SPACE = "SPACE"; private static final String SPACE = "SPACE";
private static final String TAB = "TAB"; private static final String TAB = "TAB";
private static final Translator trans = Application.getTranslator();
private static final Logger log = LoggerFactory.getLogger(SimulationTableCSVExport.class);
public SimulationTableCSVExport (OpenRocketDocument document, public SimulationTableCSVExport (OpenRocketDocument document,
JTable simulationTable, JTable simulationTable,
ColumnTableModel simulationTableModel ColumnTableModel simulationTableModel
) ) {
{
this.document = document; this.document = document;
this.simulationTable = simulationTable; this.simulationTable = simulationTable;
this.simulationTableModel = simulationTableModel; this.simulationTableModel = simulationTableModel;
@ -55,7 +56,7 @@ public class SimulationTableCSVExport {
* units will be added to the header... * units will be added to the header...
*/ */
private void populateColumnNameToUnitsHashTable() { private void populateColumnNameToUnitsHashTable() {
if (null == simulationTableModel) { if (simulationTableModel == null) {
return; return;
} }
valueColumnToUnitString.clear(); // necessary if units changed during session valueColumnToUnitString.clear(); // necessary if units changed during session
@ -71,18 +72,15 @@ public class SimulationTableCSVExport {
} }
/** /**
* Dump data from sim table to file for run simulations * Dump data from sim table to file for run simulations
* @param data The csv data as one string block. * @param data The CSV data as one string block.
* @param csvFile The file to dump the data to. * @param CSVFile The file to dump the data to.
*/ */
private void dumpDataToFile(String data, File csvFile) { private void dumpDataToFile(String data, File CSVFile) {
BufferedWriter bufferedWriter = null; BufferedWriter bufferedWriter = null;
try { try {
csvFile.createNewFile(); CSVFile.createNewFile();
bufferedWriter = new BufferedWriter(new FileWriter(csvFile)); bufferedWriter = new BufferedWriter(new FileWriter(CSVFile));
bufferedWriter.write(data); bufferedWriter.write(data);
} catch (FileNotFoundException e) {
String msg = e.getMessage();
JOptionPane.showMessageDialog(simulationTable.getParent(), msg);
} catch (IOException e) { } catch (IOException e) {
String msg = e.getMessage(); String msg = e.getMessage();
JOptionPane.showMessageDialog(simulationTable.getParent(), msg); JOptionPane.showMessageDialog(simulationTable.getParent(), msg);
@ -98,31 +96,28 @@ public class SimulationTableCSVExport {
} }
} }
/**
* Create the file chooser to save the CSV file.
* @return The file chooser.
*/
private JFileChooser setUpFileChooser() { private JFileChooser setUpFileChooser() {
JFileChooser fch = new JFileChooser(); JFileChooser fch = new JFileChooser();
String saveDialogTitle = trans.get("simpanel.pop.exportToCSV.save.dialog.title"); fch.setDialogTitle(trans.get("simpanel.pop.exportToCSV.save.dialog.title"));
fch.setDialogTitle(saveDialogTitle);
fch.setFileFilter(FileHelper.CSV_FILTER); fch.setFileFilter(FileHelper.CSV_FILTER);
// default output csv to same name as the document's rocket name.
String documentFileName = document.getRocket().getName();
documentFileName += ".csv";
fch.setSelectedFile(new File(documentFileName));
CsvOptionPanel csvOptions = new CsvOptionPanel(SimulationTableCSVExport.class /*,
trans.get("GeneralOptimizationDialog.export.header"), trans.get("GeneralOptimizationDialog.export.header.ttip")*/);
fch.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory()); fch.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
fch.setAccessory(csvOptions);
// Default output CSV to same name as the document's rocket name.
String fileName = document.getRocket().getName() + ".csv";
fch.setSelectedFile(new File(fileName));
// Add CSV options to FileChooser
CsvOptionPanel CSVOptions = new CsvOptionPanel(SimulationTableCSVExport.class);
fch.setAccessory(CSVOptions);
return fch; return fch;
} }
public void performTableDataConversion() { public void performTableDataConversion() {
// one down side is that to change this means you have to export and save at least ONCE!
// there is no entry in the preferences to set this a-priori and it is default to a comma
String fieldSep = Application.getPreferences().getString(Preferences.EXPORT_FIELD_SEPARATOR, ",");
Container tableParent = simulationTable.getParent(); Container tableParent = simulationTable.getParent();
int modelColumnCount = simulationTableModel.getColumnCount(); int modelColumnCount = simulationTableModel.getColumnCount();
int modelRowCount = simulationTableModel.getRowCount(); int modelRowCount = simulationTableModel.getRowCount();
@ -139,11 +134,12 @@ public class SimulationTableCSVExport {
JFileChooser fch = this.setUpFileChooser(); JFileChooser fch = this.setUpFileChooser();
int selectionStatus = fch.showSaveDialog(tableParent); int selectionStatus = fch.showSaveDialog(tableParent);
if (selectionStatus == JFileChooser.CANCEL_OPTION || selectionStatus == JFileChooser.ERROR_OPTION) { if (selectionStatus != JFileChooser.APPROVE_OPTION) {
return; // cancel or error... nothing to do here log.info("User cancelled CSV export");
return;
} }
fieldSep = ((CsvOptionPanel) fch.getAccessory()).getFieldSeparator(); String fieldSep = ((CsvOptionPanel) fch.getAccessory()).getFieldSeparator();
int precision = ((CsvOptionPanel) fch.getAccessory()).getDecimalPlaces(); int precision = ((CsvOptionPanel) fch.getAccessory()).getDecimalPlaces();
((CsvOptionPanel) fch.getAccessory()).storePreferences(); ((CsvOptionPanel) fch.getAccessory()).storePreferences();
@ -153,12 +149,13 @@ public class SimulationTableCSVExport {
fieldSep = "\t"; fieldSep = "\t";
} }
File csvFile = fch.getSelectedFile(); File CSVFile = fch.getSelectedFile();
CSVFile = FileHelper.forceExtension(CSVFile, "csv");
String csvSimResultString = ""; String CSVSimResultString;
// obtain the column titles for the first row of the csv // obtain the column titles for the first row of the CSV
ArrayList<String> rowColumnElement = new ArrayList<>(); ArrayList<String> rowColumnElement = new ArrayList<>();
for (int j=1; j<modelColumnCount ; j++) { for (int j = 1; j<modelColumnCount ; j++) {
String colName = simulationTable.getColumnName(j); String colName = simulationTable.getColumnName(j);
// get the unit string and append to column that it applies to. // get the unit string and append to column that it applies to.
@ -170,34 +167,34 @@ public class SimulationTableCSVExport {
rowColumnElement.add(colName); rowColumnElement.add(colName);
} }
// ONE difference here is that we'll place any warnings at the last cell in the csv. // ONE difference here is that we'll place any warnings at the last cell in the CSV.
csvSimResultString = StringUtils.join(fieldSep, rowColumnElement) + fieldSep + "Simulation Warnings"; CSVSimResultString = StringUtils.join(fieldSep, rowColumnElement) + fieldSep + "Simulation Warnings";
String fullOutputResult = csvSimResultString; StringBuilder fullOutputResult = new StringBuilder(CSVSimResultString);
// get relevant data and create the comma separated data from it. // get relevant data and create the comma separated data from it.
for (int i1 = 0; i1 < modelRowCount; i1++) { for (int i = 0; i < modelRowCount; i++) {
// account for sorting... resulting csv file will be in the // account for sorting... resulting CSV file will be in the
// same order as shown in the table thanks to this gem. // same order as shown in the table thanks to this gem.
int i = simulationTable.convertRowIndexToModel(i1); int idx = simulationTable.convertRowIndexToModel(i);
int nullCnt = 0; int nullCnt = 0;
rowColumnElement.clear(); rowColumnElement.clear();
// get the simulation's warning text if any... this bypasses the need to use // get the simulation's warning text if any... this bypasses the need to use
// the column 0 stuff which is kind of difficult to use! // the column 0 stuff which is kind of difficult to use!
WarningSet ws = document.getSimulation(i).getSimulatedWarnings(); WarningSet ws = document.getSimulation(idx).getSimulatedWarnings();
String warningsText = ""; StringBuilder warningsText = new StringBuilder();
for (Warning w : ws) { for (Warning w : ws) {
String warning = w.toString(); String warning = w.toString();
if (warning != null) { if (warning != null) {
warningsText += w + " "; // TODO - formatting. inserting a \n does funny things so use " " for now warningsText.append(w).append(" "); // TODO - formatting. inserting a \n does funny things so use " " for now
} }
} }
// piece together the column data for the ith row, skipping any rows with null counts > 0! // piece together the column data for the ith row, skipping any rows with null counts > 0!
for (int j=1; j<modelColumnCount ; j++) { // skip first column for (int j = 1; j < modelColumnCount ; j++) { // skip first column
Object o = simulationTableModel.getValueAt(i, j); Object o = simulationTableModel.getValueAt(idx, j);
if (o != null) { if (o != null) {
final String value; final String value;
if (o instanceof Value) { if (o instanceof Value) {
@ -221,15 +218,14 @@ public class SimulationTableCSVExport {
} }
// create the column data comma separated string for the ith row... // create the column data comma separated string for the ith row...
csvSimResultString = StringUtils.join(fieldSep, rowColumnElement); CSVSimResultString = StringUtils.join(fieldSep, rowColumnElement);
// piece together all rows into one big ginourmous string, adding any warnings to the item // piece together all rows into one big ginormous string, adding any warnings to the item
fullOutputResult += "\n" + csvSimResultString + fieldSep + warningsText; fullOutputResult.append("\n").append(CSVSimResultString).append(fieldSep).append(warningsText);
} }
// dump the string to the file. // dump the string to the file.
this.dumpDataToFile(fullOutputResult, csvFile); this.dumpDataToFile(fullOutputResult.toString(), CSVFile);
return;
} }
} }