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

Add insert fin point context menu action

Browse Source
This commit is contained in:
SiboVG 2022-11-17 19:17:09 +01:00
parent 6f2cbf31ae
commit 6bd2ac05aa
2 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1031,6 +1031,7 @@ FreeformFinSetConfig.lbl.ctrlClick = Ctrl+click: Delete point
FreeformFinSetConfig.lbl.scaleFin = Scale Fin FreeformFinSetConfig.lbl.scaleFin = Scale Fin
FreeformFinSetConfig.lbl.exportCSV = Export CSV FreeformFinSetConfig.lbl.exportCSV = Export CSV
FreeformFinSetConfig.lbl.deletePoint = Delete point FreeformFinSetConfig.lbl.deletePoint = Delete point
FreeformFinSetConfig.lbl.insertPoint = Insert point
!TubeFinSetConfig !TubeFinSetConfig
TubeFinSetCfg.lbl.Nbroffins = Number of fins: TubeFinSetCfg.lbl.Nbroffins = Number of fins:

52
swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
View File

@ -91,6 +91,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
private ScaleScrollPane figurePane = null; private ScaleScrollPane figurePane = null;
private ScaleSelector selector; private ScaleSelector selector;
private FinPointAction insertFinPointAction;
private FinPointAction deleteFinPointAction; private FinPointAction deleteFinPointAction;
public FreeformFinSetConfig(OpenRocketDocument d, RocketComponent component, JDialog parent) { public FreeformFinSetConfig(OpenRocketDocument d, RocketComponent component, JDialog parent) {
@ -294,8 +295,10 @@ public class FreeformFinSetConfig extends FinSetConfig {
}); });
// Context menu for table // Context menu for table
insertFinPointAction = new InsertPointAction();
deleteFinPointAction = new DeletePointAction(); deleteFinPointAction = new DeletePointAction();
pm = new JPopupMenu(); pm = new JPopupMenu();
pm.add(insertFinPointAction);
pm.add(deleteFinPointAction); pm.add(deleteFinPointAction);
table.getSelectionModel().addListSelectionListener(new ListSelectionListener() { table.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@ -457,16 +460,32 @@ public class FreeformFinSetConfig extends FinSetConfig {
} }
/** /**
* Delete the selected point in the fin point table. * Insert a new fin point between the currently selected point and the next point.
* The coordinates of the new point will be the average of the two points.
*/
private void insertPoint() {
int currentPointIdx = table.getSelectedRow();
if (currentPointIdx == -1 || currentPointIdx >= table.getRowCount() - 1) {
return;
}
final FreeformFinSet finSet = (FreeformFinSet) component;
Coordinate currentPoint = finSet.getFinPoints()[currentPointIdx];
Coordinate nextPoint = finSet.getFinPoints()[currentPointIdx + 1];
Point2D.Double toAdd = new Point2D.Double((currentPoint.x + nextPoint.x) / 2, (currentPoint.y + nextPoint.y) / 2);
finSet.addPoint(currentPointIdx + 1, toAdd);
}
/**
* Delete the currently selected fin point.
*/ */
private void deletePoint() { private void deletePoint() {
int row = table.getSelectedRow(); int currentPointIdx = table.getSelectedRow();
if (row == -1) { if (currentPointIdx == -1) {
return; return;
} }
final FreeformFinSet finSet = (FreeformFinSet) component; final FreeformFinSet finSet = (FreeformFinSet) component;
try { try {
finSet.removePoint(row); finSet.removePoint(currentPointIdx);
} catch (IllegalFinPointException ex) { } catch (IllegalFinPointException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
@ -477,9 +496,12 @@ public class FreeformFinSetConfig extends FinSetConfig {
} }
private void updateActionStates() { private void updateActionStates() {
if (deleteFinPointAction != null) { if (insertFinPointAction == null) { // If one of the actions is null, the rest will be too
deleteFinPointAction.updateEnabledState(); return;
} }
insertFinPointAction.updateEnabledState();
deleteFinPointAction.updateEnabledState();
} }
private class FinPointScrollPane extends ScaleScrollPane { private class FinPointScrollPane extends ScaleScrollPane {
@ -767,6 +789,24 @@ public class FreeformFinSetConfig extends FinSetConfig {
public abstract void updateEnabledState(); public abstract void updateEnabledState();
} }
private class InsertPointAction extends FinPointAction {
public InsertPointAction() {
putValue(NAME, trans.get("FreeformFinSetConfig.lbl.insertPoint"));
this.putValue(SMALL_ICON, Icons.FILE_NEW);
}
@Override
public void actionPerformed(ActionEvent e) {
insertPoint();
}
@Override
public void updateEnabledState() {
// You can't add to the last fin point
setEnabled(table.getSelectedRow() < table.getRowCount() - 1);
}
}
private class DeletePointAction extends FinPointAction { private class DeletePointAction extends FinPointAction {
public DeletePointAction() { public DeletePointAction() {
putValue(NAME, trans.get("FreeformFinSetConfig.lbl.deletePoint")); putValue(NAME, trans.get("FreeformFinSetConfig.lbl.deletePoint"));