Skip to content

Fix unwanted copy/paste behavior in nodes #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
g-abilio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix unwanted copy/paste behavior in nodes #527

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 21 additions & 13 deletions src/UndoCommands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "BasicGraphicsScene.hpp"
#include "ConnectionGraphicsObject.hpp"
#include "ConnectionIdUtils.hpp"
#include "ConnectionIdHash.hpp"
#include "Definitions.hpp"
#include "GroupGraphicsObject.hpp"
#include "NodeGraphicsObject.hpp"
Expand All @@ -24,6 +25,7 @@ static QJsonObject serializeSelectedItems(BasicGraphicsScene *scene)
auto &graphModel = scene->graphModel();

std::unordered_set<NodeId> selectedNodes;
std::unordered_set<ConnectionId> selectedConnections;

QJsonArray nodesJsonArray;
QJsonArray groupsJsonArray;
Expand All @@ -43,21 +45,13 @@ static QJsonObject serializeSelectedItems(BasicGraphicsScene *scene)
if (auto group = qgraphicsitem_cast<GroupGraphicsObject *>(item)) {
for (auto *node : group->group().childNodes()) {
appendNode(node);

for (auto const &connectionId : graphModel.allConnectionIds(node->nodeId())) {
connJsonArray.append(toJson(connectionId));
}
}
}
}

for (QGraphicsItem *item : scene->selectedItems()) {
if (auto ngo = qgraphicsitem_cast<NodeGraphicsObject *>(item)) {
appendNode(ngo);

for (auto const &connectionId : graphModel.allConnectionIds(ngo->nodeId())) {
connJsonArray.append(toJson(connectionId));
}
}
}

Expand All @@ -79,13 +73,27 @@ static QJsonObject serializeSelectedItems(BasicGraphicsScene *scene)
}
}

auto appendConnection = [&](ConnectionId const &connectionId) {
if (selectedNodes.count(connectionId.outNodeId) == 0
|| selectedNodes.count(connectionId.inNodeId) == 0) {
return;
}

auto const inserted = selectedConnections.insert(connectionId);
if (inserted.second) {
connJsonArray.append(toJson(connectionId));
}
};

for (NodeId nodeId : selectedNodes) {
for (auto const &connectionId : graphModel.allConnectionIds(nodeId)) {
appendConnection(connectionId);
}
}

for (QGraphicsItem *item : scene->selectedItems()) {
if (auto c = qgraphicsitem_cast<ConnectionGraphicsObject *>(item)) {
auto const &cid = c->connectionId();

if (selectedNodes.count(cid.outNodeId) > 0 && selectedNodes.count(cid.inNodeId) > 0) {
connJsonArray.append(toJson(cid));
}
appendConnection(c->connectionId());
}
}

Expand Down
Loading