Skip to content

Added propagation control functions and fix implicit string conversion in headers. #367

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
rayment wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Added propagation control functions and fix implicit string conversion in headers. #367

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e99eb3
Added propagation control functions.
rayment Jan 28, 2023
41957ea
Fixed unused variable.
rayment Jan 28, 2023
7f9d7ab
Wrapped header string constants in QLatin1String(...).
rayment Jan 29, 2023
bb42e8f
Changed propagation functions to protected virtual.
rayment Jan 29, 2023
1531218
Formatted changes with clang-format.
rayment Jan 31, 2023
bbd92b7
Merge branch 'master' into data-propagation
rayment Jan 31, 2023
0bdbd77
Made canPropagate a const method.
rayment Jul 29, 2023
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
Prev Previous commit
Next Next commit
Formatted changes with clang-format. 
Signed-off-by: Finn Rayment <finn@rayment.fr>
  • Loading branch information
@rayment
rayment committed Jan 31, 2023
commit 1531218ce10a515fa949401636cdae60b6665aef
9 changes: 5 additions & 4 deletions include/QtNodes/internal/ConnectionIdUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,11 @@ inline QJsonObject toJson(ConnectionId const &connId)

inline ConnectionId fromJson(QJsonObject const &connJson)
{
ConnectionId connId{static_cast<NodeId>(connJson[QLatin1String("outNodeId")].toInt(InvalidNodeId)),
static_cast<PortIndex>(connJson[QLatin1String("outPortIndex")].toInt(InvalidPortIndex)),
static_cast<NodeId>(connJson[QLatin1String("intNodeId")].toInt(InvalidNodeId)),
static_cast<PortIndex>(connJson[QLatin1String("inPortIndex")].toInt(InvalidPortIndex))};
ConnectionId connId{
static_cast<NodeId>(connJson[QLatin1String("outNodeId")].toInt(InvalidNodeId)),
static_cast<PortIndex>(connJson[QLatin1String("outPortIndex")].toInt(InvalidPortIndex)),
static_cast<NodeId>(connJson[QLatin1String("intNodeId")].toInt(InvalidNodeId)),
static_cast<PortIndex>(connJson[QLatin1String("inPortIndex")].toInt(InvalidPortIndex))};

return connId;
}
Expand Down
10 changes: 6 additions & 4 deletions src/DataFlowGraphModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ DataFlowGraphModel::DataFlowGraphModel(std::shared_ptr<NodeDelegateModelRegistry
std::unordered_set<NodeId> DataFlowGraphModel::allNodeIds() const
{
std::unordered_set<NodeId> nodeIds;
for_each(_models.begin(), _models.end(), [&nodeIds](auto const &p) {
nodeIds.insert(p.first);
});
for_each(_models.begin(), _models.end(), [&nodeIds](auto const &p) { nodeIds.insert(p.first); });

return nodeIds;
}
Expand Down Expand Up @@ -494,7 +492,11 @@ void DataFlowGraphModel::onOutPortDataUpdated(NodeId const nodeId, PortIndex con

for (auto const &cn : connected) {
if (canPropagate(cn)) {
setPortData(cn.inNodeId, PortType::In, cn.inPortIndex, portDataToPropagate, PortRole::Data);
setPortData(cn.inNodeId,
PortType::In,
cn.inPortIndex,
portDataToPropagate,
PortRole::Data);
}
}
}
Expand Down