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

Implement more right-click actions in simulation table

Browse Source
This commit is contained in:
SiboVG 2022-05-30 13:17:59 +02:00
parent 1f91e28bb2
commit 3b6f914496
2 changed files with 221 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/resources/l10n/messages.properties
View File

@ -485,6 +485,11 @@ simpanel.but.ttip.newsimulation = Add a new simulation
simpanel.but.ttip.editsim = Edit the selected simulation simpanel.but.ttip.editsim = Edit the selected simulation
simpanel.but.ttip.runsimu = Re-run the selected simulations simpanel.but.ttip.runsimu = Re-run the selected simulations
simpanel.but.ttip.deletesim = Delete the selected simulations simpanel.but.ttip.deletesim = Delete the selected simulations
simpanel.pop.edit = Edit
simpanel.pop.plot = Plot / Export
simpanel.pop.run = Run
simpanel.pop.delete = Delete
simpanel.pop.duplicate = Duplicate
simpanel.checkbox.donotask = Do not ask me again simpanel.checkbox.donotask = Do not ask me again
simpanel.lbl.defpref = You can change the default operation in the preferences. simpanel.lbl.defpref = You can change the default operation in the preferences.
simpanel.dlg.lbl.DeleteSim1 = Delete the selected simulations? simpanel.dlg.lbl.DeleteSim1 = Delete the selected simulations?

345
swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
View File

@ -15,6 +15,7 @@ import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
@ -137,17 +138,7 @@ public class SimulationPanel extends JPanel {
editButton.addActionListener(new ActionListener() { editButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int[] selection = simulationTable.getSelectedRows(); editSimulationAction();
if (selection.length == 0) {
return;
}
Simulation[] sims = new Simulation[selection.length];
for (int i = 0; i < selection.length; i++) {
selection[i] = simulationTable.convertRowIndexToModel(selection[i]);
sims[i] = document.getSimulation(selection[i]);
}
openDialog(false, sims);
} }
}); });
this.add(editButton, "gapright para"); this.add(editButton, "gapright para");
@ -159,21 +150,7 @@ public class SimulationPanel extends JPanel {
runButton.addActionListener(new ActionListener() { runButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int[] selection = simulationTable.getSelectedRows(); runSimulationAction();
if (selection.length == 0) {
return;
}
Simulation[] sims = new Simulation[selection.length];
for (int i = 0; i < selection.length; i++) {
selection[i] = simulationTable.convertRowIndexToModel(selection[i]);
sims[i] = document.getSimulation(selection[i]);
}
long t = System.currentTimeMillis();
new SimulationRunDialog(SwingUtilities.getWindowAncestor(
SimulationPanel.this), document, sims).setVisible(true);
log.info("Running simulations took " + (System.currentTimeMillis() - t) + " ms");
fireMaintainSelection();
} }
}); });
this.add(runButton, "gapright para"); this.add(runButton, "gapright para");
@ -185,50 +162,7 @@ public class SimulationPanel extends JPanel {
deleteButton.addActionListener(new ActionListener() { deleteButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int[] selection = simulationTable.getSelectedRows(); deleteSimulationAction();
if (selection.length == 0) {
return;
}
// Verify deletion
boolean verify = Application.getPreferences().getBoolean(Preferences.CONFIRM_DELETE_SIMULATION, true);
if (verify) {
JPanel panel = new JPanel(new MigLayout());
//// Do not ask me again
JCheckBox dontAsk = new JCheckBox(trans.get("simpanel.checkbox.donotask"));
panel.add(dontAsk, "wrap");
//// You can change the default operation in the preferences.
panel.add(new StyledLabel(trans.get("simpanel.lbl.defpref"), -2));
int ret = JOptionPane.showConfirmDialog(SimulationPanel.this,
new Object[] {
//// Delete the selected simulations?
trans.get("simpanel.dlg.lbl.DeleteSim1"),
//// <html><i>This operation cannot be undone.</i>
trans.get("simpanel.dlg.lbl.DeleteSim2"),
"",
panel },
//// Delete simulations
trans.get("simpanel.dlg.lbl.DeleteSim3"),
JOptionPane.OK_CANCEL_OPTION,
JOptionPane.WARNING_MESSAGE);
if (ret != JOptionPane.OK_OPTION)
return;
if (dontAsk.isSelected()) {
Application.getPreferences().putBoolean(Preferences.CONFIRM_DELETE_SIMULATION, false);
}
}
// Delete simulations
for (int i = 0; i < selection.length; i++) {
selection[i] = simulationTable.convertRowIndexToModel(selection[i]);
}
Arrays.sort(selection);
for (int i = selection.length - 1; i >= 0; i--) {
document.removeSimulation(selection[i]);
}
simulationTableModel.fireTableDataChanged();
} }
}); });
this.add(deleteButton, "gapright para"); this.add(deleteButton, "gapright para");
@ -239,26 +173,7 @@ public class SimulationPanel extends JPanel {
plotButton.addActionListener(new ActionListener() { plotButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int selected = simulationTable.getSelectedRow(); plotSimulationAction();
if (selected < 0) {
return;
}
selected = simulationTable.convertRowIndexToModel(selected);
simulationTable.clearSelection();
simulationTable.addRowSelectionInterval(selected, selected);
Simulation sim = document.getSimulations().get(selected);
if (!sim.hasSimulationData()) {
new SimulationRunDialog(SwingUtilities.getWindowAncestor(
SimulationPanel.this), document, sim).setVisible(true);
}
fireMaintainSelection();
openDialog(true, sim);
} }
}); });
this.add(plotButton, "wrap para"); this.add(plotButton, "wrap para");
@ -537,7 +452,13 @@ public class SimulationPanel extends JPanel {
simulationTableModel.setColumnWidths(simulationTable.getColumnModel()); simulationTableModel.setColumnWidths(simulationTable.getColumnModel());
pm = new JPopupMenu(); pm = new JPopupMenu();
pm.add(new CopyAction(simulationTable)); pm.add(new EditSimulationAction());
pm.add(new DuplicateSimulationAction());
pm.add(new DeleteSimulationAction());
pm.addSeparator();
pm.add(new RunSimulationAction());
pm.add(new PlotSimulationAction());
// Mouse listener to act on double-clicks // Mouse listener to act on double-clicks
simulationTable.addMouseListener(new MouseAdapter() { simulationTable.addMouseListener(new MouseAdapter() {
@ -561,6 +482,10 @@ public class SimulationPanel extends JPanel {
openDialog(document.getSimulations().get(selected)); openDialog(document.getSimulations().get(selected));
} }
} else if (e.getButton() == MouseEvent.BUTTON3 && e.getClickCount() == 1){ } else if (e.getButton() == MouseEvent.BUTTON3 && e.getClickCount() == 1){
int selectedRow = simulationTable.getSelectedRow();
if (selectedRow < 0) {
return;
}
doPopup(e); doPopup(e);
} }
} }
@ -603,6 +528,159 @@ public class SimulationPanel extends JPanel {
updateButtonStates(); updateButtonStates();
} }
private void plotSimulationAction() {
int selected = simulationTable.getSelectedRow();
if (selected < 0) {
return;
}
selected = simulationTable.convertRowIndexToModel(selected);
simulationTable.clearSelection();
simulationTable.addRowSelectionInterval(selected, selected);
Simulation sim = document.getSimulations().get(selected);
if (!sim.hasSimulationData()) {
new SimulationRunDialog(SwingUtilities.getWindowAncestor(
SimulationPanel.this), document, sim).setVisible(true);
}
fireMaintainSelection();
openDialog(true, sim);
}
private void deleteSimulationAction() {
int[] selection = simulationTable.getSelectedRows();
if (selection.length == 0) {
return;
}
// Verify deletion
boolean verify = Application.getPreferences().getBoolean(Preferences.CONFIRM_DELETE_SIMULATION, true);
if (verify) {
JPanel panel = new JPanel(new MigLayout());
//// Do not ask me again
JCheckBox dontAsk = new JCheckBox(trans.get("simpanel.checkbox.donotask"));
panel.add(dontAsk, "wrap");
//// You can change the default operation in the preferences.
panel.add(new StyledLabel(trans.get("simpanel.lbl.defpref"), -2));
int ret = JOptionPane.showConfirmDialog(SimulationPanel.this,
new Object[] {
//// Delete the selected simulations?
trans.get("simpanel.dlg.lbl.DeleteSim1"),
//// <html><i>This operation cannot be undone.</i>
trans.get("simpanel.dlg.lbl.DeleteSim2"),
"",
panel },
//// Delete simulations
trans.get("simpanel.dlg.lbl.DeleteSim3"),
JOptionPane.OK_CANCEL_OPTION,
JOptionPane.WARNING_MESSAGE);
if (ret != JOptionPane.OK_OPTION)
return;
if (dontAsk.isSelected()) {
Application.getPreferences().putBoolean(Preferences.CONFIRM_DELETE_SIMULATION, false);
}
}
// Delete simulations
for (int i = 0; i < selection.length; i++) {
selection[i] = simulationTable.convertRowIndexToModel(selection[i]);
}
Arrays.sort(selection);
for (int i = selection.length - 1; i >= 0; i--) {
document.removeSimulation(selection[i]);
}
simulationTableModel.fireTableDataChanged();
}
private void runSimulationAction() {
Simulation[] sims = getSelectedSimulations();
if (sims == null) return;
long t = System.currentTimeMillis();
new SimulationRunDialog(SwingUtilities.getWindowAncestor(
SimulationPanel.this), document, sims).setVisible(true);
log.info("Running simulations took " + (System.currentTimeMillis() - t) + " ms");
fireMaintainSelection();
}
private void editSimulationAction() {
Simulation[] sims = getSelectedSimulations();
if (sims == null) return;
openDialog(false, sims);
}
private Simulation[] getSelectedSimulations() {
int[] selection = simulationTable.getSelectedRows();
if (selection.length == 0) {
return null;
}
Simulation[] sims = new Simulation[selection.length];
for (int i = 0; i < selection.length; i++) {
selection[i] = simulationTable.convertRowIndexToModel(selection[i]);
sims[i] = document.getSimulation(selection[i]);
}
return sims;
}
private void copySimulationAction() {
int numCols=simulationTable.getColumnCount();
int numRows=simulationTable.getSelectedRowCount();
int[] rowsSelected=simulationTable.getSelectedRows();
if (numRows!=rowsSelected[rowsSelected.length-1]-rowsSelected[0]+1 || numRows!=rowsSelected.length) {
JOptionPane.showMessageDialog(null, "Invalid Copy Selection", "Invalid Copy Selection", JOptionPane.ERROR_MESSAGE);
return;
}
StringBuilder excelStr =new StringBuilder();
for (int k = 1; k < numCols; k++) {
excelStr.append(simulationTable.getColumnName(k));
if (k < numCols-1) {
excelStr.append("\t");
}
}
excelStr.append("\n");
for (int i = 0; i < numRows; i++) {
for (int j = 1; j < numCols; j++) {
excelStr.append(simulationTable.getValueAt(rowsSelected[i], j));
if (j < numCols-1) {
excelStr.append("\t");
}
}
excelStr.append("\n");
}
StringSelection sel = new StringSelection(excelStr.toString());
Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard();
cb.setContents(sel, sel);
}
private void duplicateSimulationAction() {
Simulation[] sims = getSelectedSimulations();
if (sims == null) return;
for (Simulation s: sims) {
Simulation copy = s.duplicateSimulation(document.getRocket());
String name = copy.getName();
if (name.matches(OpenRocketDocument.SIMULATION_NAME_PREFIX + "[0-9]+ *")) {
copy.setName(document.getNextSimulationName());
}
document.addSimulation(copy);
}
simulationTable.getSelectionModel().setSelectionInterval(simulationTable.getRowCount()-sims.length,simulationTable.getRowCount()-1);
}
protected void doPopup(MouseEvent e) { protected void doPopup(MouseEvent e) {
pm.show(e.getComponent(), e.getX(), e.getY()); pm.show(e.getComponent(), e.getX(), e.getY());
} }
@ -696,52 +774,59 @@ public class SimulationPanel extends JPanel {
} }
} }
class CopyAction extends AbstractAction { class EditSimulationAction extends AbstractAction {
public EditSimulationAction() {
putValue(NAME, trans.get("simpanel.pop.edit"));
}
private JTable table; @Override
public void actionPerformed(ActionEvent e) {
editSimulationAction();
}
}
public CopyAction(JTable table) { class RunSimulationAction extends AbstractAction {
this.table = table; public RunSimulationAction() {
putValue(NAME, "Copy"); putValue(NAME, trans.get("simpanel.pop.run"));
}
@Override
public void actionPerformed(ActionEvent e) {
runSimulationAction();
}
}
class DeleteSimulationAction extends AbstractAction {
public DeleteSimulationAction() {
putValue(NAME, trans.get("simpanel.pop.delete"));
}
@Override
public void actionPerformed(ActionEvent e) {
deleteSimulationAction();
}
}
class PlotSimulationAction extends AbstractAction {
public PlotSimulationAction() {
putValue(NAME, trans.get("simpanel.pop.plot"));
}
@Override
public void actionPerformed(ActionEvent e) {
plotSimulationAction();
}
}
class DuplicateSimulationAction extends AbstractAction {
public DuplicateSimulationAction() {
putValue(NAME, trans.get("simpanel.pop.duplicate"));
} }
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
duplicateSimulationAction();
int numCols=table.getColumnCount();
int numRows=table.getSelectedRowCount();
int[] rowsSelected=table.getSelectedRows();
if (numRows!=rowsSelected[rowsSelected.length-1]-rowsSelected[0]+1 || numRows!=rowsSelected.length ) {
JOptionPane.showMessageDialog(null, "Invalid Copy Selection", "Invalid Copy Selection", JOptionPane.ERROR_MESSAGE);
return;
}
StringBuffer excelStr=new StringBuffer();
for (int k=1; k<numCols; k++) {
excelStr.append(table.getColumnName(k));
if (k<numCols-1) {
excelStr.append("\t");
}
}
excelStr.append("\n");
for (int i=0; i<numRows; i++) {
for (int j=1; j<numCols; j++) {
excelStr.append(table.getValueAt(rowsSelected[i], j));
if (j<numCols-1) {
excelStr.append("\t");
}
}
excelStr.append("\n");
}
StringSelection sel = new StringSelection(excelStr.toString());
Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard();
cb.setContents(sel, sel);
} }
} }
public static class CellTransferable implements Transferable { public static class CellTransferable implements Transferable {