Added duplicate selection (CTRL+D), undo and redo (CTRL+Z/Y) with scene history. #133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 9 commits
November 8, 2017 17:34
…odes as the performance was bad. Added OpenGL rendering for flow view.
…hat have no endpoint on selection
… data model to nodes when duplicating
|
My laptop is in repair and I was busy with our small baby last weeks. Thanks |
… performance benefits
# Conflicts: # src/FlowView.cpp # src/FlowView.hpp
Daguerreo
suggested changes
Apr 19, 2019
Daguerreo
reviewed
Apr 19, 2019
| @@ -126,6 +128,8 @@ class NODE_EDITOR_PUBLIC NodeDataModel | |||
| virtual | |||
| NodePainterDelegate* painterDelegate() const { return nullptr; } | |||
|
|
|||
| QString toolTipText(); | |||
There was a problem hiding this comment.
Should be const and inline as other getters
| @@ -39,3 +40,15 @@ setNodeStyle(NodeStyle const& style) | |||
| { | |||
| _nodeStyle = style; | |||
| } | |||
|
|
|||
|
|
|||
| void NodeDataModel::setToolTipText(QString text) | |||
include/nodes/internal/FlowScene.hpp
Outdated
| @@ -54,6 +59,10 @@ class NODE_EDITOR_PUBLIC FlowScene | |||
|
|
|||
| Node&restoreNode(QJsonObject const& nodeJson); | |||
|
|
|||
| QUuid pasteNode(QJsonObject &json); | |||
| _scene->UpdateHistory(); | ||
| } | ||
|
|
||
| void FlowView::duplicateSelectedNode() |
There was a problem hiding this comment.
a lot of implicit conversion warning float-double
src/FlowView.cpp
Outdated
|
|
||
| //create nodes | ||
| std::vector<Node*> createdNodes; | ||
| std::vector<Node*> couterpartNode; |
| @@ -123,6 +132,20 @@ restoreConnection(QJsonObject const &connectionJson) | |||
| return createConnection(*nodeIn, portIndexIn, *nodeOut, portIndexOut); | |||
| } | |||
|
|
|||
| void FlowScene::pasteConnection(QJsonObject const &connectionJson, QUuid newIn, QUuid newOut) | |||
| { | |||
| QUuid nodeInId = QUuid(connectionJson["in_id"].toString()); | |||
src/FlowView.cpp
Outdated
| if(j >=0 && k>=0 && j < couterpartNode.size() && k < couterpartNode.size()) | ||
| { | ||
| auto connection = _scene->createConnection(*createdNodes[j], portIndexIn, *createdNodes[k], portIndexOut); | ||
| auto& connectionRef = connection; |
|
This pull request has a plenty of unrelated features. Nevertheless, I took some coding samples from this work and implemented an Undo/Redo system and a Ctrl+D node duplication mechanism. I'll continlue looking through the code to take more features for master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.