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

Fix error in component duplication

Browse Source
This commit is contained in:
SiboVG 2022-05-31 03:59:29 +02:00
parent 9e1602b1c9
commit e5ec38f227
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
swing/src/net/sf/openrocket/gui/main/RocketActions.java
View File

@ -830,24 +830,35 @@ public class RocketActions {
Simulation[] sims = selectionModel.getSelectedSimulations(); Simulation[] sims = selectionModel.getSelectedSimulations();
if (isCopyable(components)) { if (isCopyable(components)) {
List<RocketComponent> duplicateComponents = new LinkedList<>(copyComponentsMaintainParent(components)); ComponentConfigDialog.disposeDialog();
List<RocketComponent> copiedComponents = new LinkedList<>(copyComponentsMaintainParent(components));
OpenRocketClipboard.setClipboard(copiedComponents);
copiedComponents = new LinkedList<>(OpenRocketClipboard.getClipboardComponents());
List<RocketComponent> pasted = new LinkedList<>();
for (RocketComponent component : copiedComponents) {
pasted.add(component.copy());
}
List<Pair<RocketComponent, Integer>> positions = new LinkedList<>(); List<Pair<RocketComponent, Integer>> positions = new LinkedList<>();
for (RocketComponent component : duplicateComponents) { for (RocketComponent component : pasted) {
positions.add(getPastePosition(component)); positions.add(getPastePosition(component));
} }
if (duplicateComponents.size() == 1) { if (pasted.size() == 1) {
document.addUndoPosition("Duplicate " + duplicateComponents.get(0).getComponentName()); document.addUndoPosition("Duplicate " + pasted.get(0).getComponentName());
} else { } else {
document.addUndoPosition("Duplicate components"); document.addUndoPosition("Duplicate components");
} }
for (int i = 0; i < duplicateComponents.size(); i++) { for (int i = 0; i < pasted.size(); i++) {
positions.get(i).getU().addChild(duplicateComponents.get(i), positions.get(i).getV()); positions.get(i).getU().addChild(pasted.get(i), positions.get(i).getV());
} }
selectionModel.setSelectedComponents(duplicateComponents); selectionModel.setSelectedComponents(pasted);
parentFrame.selectTab(BasicFrame.COMPONENT_TAB);
} else if (sims != null && sims.length > 0) { } else if (sims != null && sims.length > 0) {
ArrayList<Simulation> copySims = new ArrayList<Simulation>(); ArrayList<Simulation> copySims = new ArrayList<Simulation>();