Skip to content
This repository has been archived by the owner on Oct 13, 2021. It is now read-only.

[WIP]Move a ContingencyElement by using drag and drop in ContingencyStoreEditor #87

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

[WIP]Move a ContingencyElement by using drag and drop in ContingencyStoreEditor #87

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
99230b2
move a contingency element in cse by drag and drop
Oct 24, 2018
4682891
Merge branch 'master' into move_contingencyelements
miovd Oct 25, 2018
75f2870
corrections
Oct 29, 2018
22531e6
Resolve merge conflict
Nov 7, 2018
0b7ec2b
difference between copy/move + forbid move/copy to the same ancester
Nov 7, 2018
c0a0fe4
minor modif
Nov 7, 2018
4c9f2b9
Merge branch 'master' into move_contingencyelements
mathbagu Nov 9, 2018
ff8ee8e
corrections
Nov 12, 2018
3fc260f
Merge branch 'master' into move_contingencyelements
Nov 12, 2018
2c119fd
Merge branch 'master' into move_contingencyelements
miovd Nov 14, 2018
023eccb
Merge branch 'master' into move_contingencyelements
miovd Nov 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
212 changes: 133 additions & 79 deletions gse-afs-ext-base/src/main/java/com/powsybl/gse/afs/ext/base/ContingencyStoreEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.powsybl.gse.spi.Savable;
import com.powsybl.gse.util.EquipmentInfo;
import com.powsybl.gse.util.Glyph;
import com.powsybl.gse.util.IdAndName;
import com.powsybl.gse.util.GseAlerts;
import javafx.beans.binding.Bindings;
import javafx.beans.binding.BooleanBinding;
Expand Down Expand Up @@ -50,32 +51,12 @@ public class ContingencyStoreEditor extends BorderPane implements ProjectFileVie
private final class ContingencyTreeCell extends TreeCell<Object> {

private ContingencyTreeCell() {
setOnDragDropped(event -> {
Dragboard db = event.getDragboard();
boolean success = false;
if (db.hasContent(EquipmentInfo.DATA_FORMAT)) {
EquipmentInfo equipmentInfo = (EquipmentInfo) db.getContent(EquipmentInfo.DATA_FORMAT);
ContingencyElement element = createElement(equipmentInfo);
if (element != null) {
addContingencyElement(element);
}
success = true;
} else if (db.hasContent(EquipmentInfo.DATA_FORMAT_LIST)) {
List<EquipmentInfo> equipmentInfoList = (List<EquipmentInfo>) db.getContent(EquipmentInfo.DATA_FORMAT_LIST);
for (EquipmentInfo equipmentInfo : equipmentInfoList) {
ContingencyElement element = createElement(equipmentInfo);
if (element != null) {
addContingencyElement(element);
}
}
success = true;
}
event.setDropCompleted(success);
event.consume();
});
setOnDragDetected(this::onDragDetected);
setOnDragOver(this::onDragOver);
setOnDragDropped(this::onDragDropped);
}

private void addContingencyElement(ContingencyElement element) {
private TreeItem<Object> getContingencyTreeItem() {
TreeItem<Object> contingencyItem = null;
if (getTreeItem() != null) {
if (getTreeItem().getValue() instanceof Contingency) {
Expand All @@ -84,6 +65,96 @@ private void addContingencyElement(ContingencyElement element) {
contingencyItem = getTreeItem().getParent();
}
}
return contingencyItem;
}

private ContingencyElement createElement(EquipmentInfo equipmentInfo) {
switch (equipmentInfo.getType()) {
case "BUSBAR_SECTION":
return new BusbarSectionContingency(equipmentInfo.getIdAndName().getId());

case "GENERATOR":
return new GeneratorContingency(equipmentInfo.getIdAndName().getId());

case "HVDC_LINE":
return new HvdcLineContingency(equipmentInfo.getIdAndName().getId());

case "LINE":
case "TWO_WINDINGS_TRANSFORMER":
case "BRANCH":
return new BranchContingency(equipmentInfo.getIdAndName().getId());

default:
return null;
}
}

private EquipmentInfo createEquipmentInfo(ContingencyElement contingencyElement) {
ContingencyElementType type = contingencyElement.getType();
if (type.equals(ContingencyElementType.BUSBAR_SECTION)) {
return new EquipmentInfo(new IdAndName(contingencyElement.getId(), contingencyElement.getId()), "BUSBAR_SECTION");
} else if (type.equals(ContingencyElementType.GENERATOR)) {
return new EquipmentInfo(new IdAndName(contingencyElement.getId(), contingencyElement.getId()), "GENERATOR");
} else if (type.equals(ContingencyElementType.HVDC_LINE)) {
return new EquipmentInfo(new IdAndName(contingencyElement.getId(), contingencyElement.getId()), "HVDC_LINE");
} else if (type.equals(ContingencyElementType.BRANCH)) {
return new EquipmentInfo(new IdAndName(contingencyElement.getId(), contingencyElement.getId()), "BRANCH");
} else {
return null;
}
}

private void onDragDetected(MouseEvent event) {
TreeItem<Object> item = contingencyTree.getSelectionModel().getSelectedItem();
if (item.getValue() instanceof ContingencyElement) {
Dragboard db = startDragAndDrop(TransferMode.COPY_OR_MOVE);
ClipboardContent content = new ClipboardContent();
content.put(EquipmentInfo.DATA_FORMAT, createEquipmentInfo((ContingencyElement) item.getValue()));
db.setContent(content);
event.consume();
}
}

private void onDragOver(DragEvent event) {
Dragboard db = event.getDragboard();
if (db.hasContent(EquipmentInfo.DATA_FORMAT)) {
acceptSingleDraggedElement(event);
} else if (db.hasContent(EquipmentInfo.DATA_FORMAT_LIST)) {
acceptMultipleDraggedElements(event);
}
event.consume();
}

private void onDragDropped(DragEvent event) {
Dragboard db = event.getDragboard();
boolean success = false;
if (db.hasContent(EquipmentInfo.DATA_FORMAT)) {
EquipmentInfo equipmentInfo = (EquipmentInfo) db.getContent(EquipmentInfo.DATA_FORMAT);
ContingencyElement element = createElement(equipmentInfo);
if (element != null) {
addContingencyElement(element);
}
success = true;
if (event.getTransferMode().equals(TransferMode.MOVE) &&
event.getGestureSource() instanceof ContingencyTreeCell) {
remove();
}
} else if (db.hasContent(EquipmentInfo.DATA_FORMAT_LIST)) {
List<EquipmentInfo> equipmentInfoList = (List<EquipmentInfo>) db.getContent(EquipmentInfo.DATA_FORMAT_LIST);
for (EquipmentInfo equipmentInfo : equipmentInfoList) {
ContingencyElement element = createElement(equipmentInfo);
if (element != null) {
addContingencyElement(element);
}
}
success = true;
}
event.setDropCompleted(success);
event.consume();
}

private void addContingencyElement(ContingencyElement element) {
TreeItem<Object> contingencyItem = getContingencyTreeItem();
if (contingencyItem != null) {
Contingency contingency = (Contingency) contingencyItem.getValue();
if (contingency.getElements().stream().noneMatch(element2 -> element2.getId().equals(element.getId()))) {
Expand All @@ -101,6 +172,44 @@ private void addContingency(Contingency contingency) {
saved.set(false);
}

private void acceptSingleDraggedElement(DragEvent event) {
EquipmentInfo equipmentInfo = (EquipmentInfo) event.getDragboard().getContent(EquipmentInfo.DATA_FORMAT);
ContingencyElement element = createElement(equipmentInfo);
TreeItem<Object> contingencyTreeItem = getContingencyTreeItem();
if (element != null) {
if (contingencyTreeItem != null) {
Contingency contingency = (Contingency) contingencyTreeItem.getValue();
if (!contingency.getElements().contains(element)) {
event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
}
} else {
event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
}
}
}

private void acceptMultipleDraggedElements(DragEvent event) {
List<ContingencyElement> contingencyElementList = new ArrayList<>();
List<EquipmentInfo> equipmentInfoList = (List<EquipmentInfo>) event.getDragboard().getContent(EquipmentInfo.DATA_FORMAT_LIST);
for (EquipmentInfo equipmentInfo : equipmentInfoList) {
ContingencyElement element = createElement(equipmentInfo);
if (element != null) {
contingencyElementList.add(element);
}
}
if (contingencyElementList.size() == equipmentInfoList.size()) {
TreeItem<Object> contingencyTreeItem = getContingencyTreeItem();
if (contingencyTreeItem != null) {
Contingency contingency = (Contingency) contingencyTreeItem.getValue();
if (!contingency.getElements().containsAll(contingencyElementList)) {
event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
}
} else {
event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
}
}
}

@Override
public void updateItem(Object value, boolean empty) {
super.updateItem(value, empty);
Expand All @@ -126,26 +235,6 @@ private static TreeItem<Object> createItem(Contingency contingency) {
return contingencyItem;
}

private static ContingencyElement createElement(EquipmentInfo equipmentInfo) {
switch (equipmentInfo.getType()) {
case "BUSBAR_SECTION":
return new BusbarSectionContingency(equipmentInfo.getIdAndName().getId());

case "GENERATOR":
return new GeneratorContingency(equipmentInfo.getIdAndName().getId());

case "HVDC_LINE":
return new HvdcLineContingency(equipmentInfo.getIdAndName().getId());

case "LINE":
case "TWO_WINDINGS_TRANSFORMER":
return new BranchContingency(equipmentInfo.getIdAndName().getId());

default:
return null;
}
}

public ContingencyStoreEditor(ContingencyStore store) {
this.store = Objects.requireNonNull(store);

Expand All @@ -163,7 +252,6 @@ public ContingencyStoreEditor(ContingencyStore store) {

contingencyTree.setCellFactory(param -> new ContingencyTreeCell());
contingencyTree.setShowRoot(false);
contingencyTree.setOnDragOver(this::onDragOver);

ContextMenu contingencyMenu = createContingencyMenu();
ContextMenu contingencyElementMenu = createContingencyElementMenu();
Expand Down Expand Up @@ -201,40 +289,6 @@ private void onKeyPressed(KeyEvent e) {
}
}

private static void acceptSingleDraggedElement(DragEvent event) {
EquipmentInfo equipmentInfo = (EquipmentInfo) event.getDragboard().getContent(EquipmentInfo.DATA_FORMAT);
ContingencyElement element = createElement(equipmentInfo);
if (element != null) {
event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
}
}

private static void acceptMultipleDraggedElements(DragEvent event) {
List<ContingencyElement> contingencyElementList = new ArrayList<>();
List<EquipmentInfo> equipmentInfoList = (List<EquipmentInfo>) event.getDragboard().getContent(EquipmentInfo.DATA_FORMAT_LIST);
for (EquipmentInfo equipmentInfo : equipmentInfoList) {
ContingencyElement element = createElement(equipmentInfo);
if (element != null) {
contingencyElementList.add(element);
}
}
if (contingencyElementList.size() == equipmentInfoList.size()) {
event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
}
}

private void onDragOver(DragEvent event) {
if (event.getGestureSource() != contingencyTree) {
Dragboard db = event.getDragboard();
if (db.hasContent(EquipmentInfo.DATA_FORMAT)) {
acceptSingleDraggedElement(event);
} else if (db.hasContent(EquipmentInfo.DATA_FORMAT_LIST)) {
acceptMultipleDraggedElements(event);
}
}
event.consume();
}

private void readContingencies() {
root.getChildren().setAll(store.read().stream()
.map(ContingencyStoreEditor::createItem)
Expand Down