Skip to content
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.

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

Fixes drop on wire issues #110

Closed
wants to merge 10 commits into from
Closed

Fixes drop on wire issues #110

wants to merge 10 commits into from

Conversation

j8sr0230
Copy link

@j8sr0230 j8sr0230 commented Jul 7, 2022

The Pyflow documentation describes the drop on wire functionality. However, this does not work in the current version. This commit fixes the problem by making additions to the mouseReleaseEvent of the BlueprintCanvas class.

The Pyflow documentation describes the drop on wire functionality. However, this does not work in the current version. This commit fixes the problem by making additions to the mouseReleaseEvent of the BlueprintCanvas class.
@luzpaz
Copy link
Contributor

luzpaz commented Jul 22, 2022

@AbdelazizSharaf001 do you mind reviewing this PR ?

@j8sr0230
Copy link
Author

I noticed this morning that it's actually not a fix, but a new feature. My code adds the functionality Drop on Wire from nodes that are already on the canvas and are dragged onto a wire. In the video documentation Drop On Wire is shown from the nodebox onto a wire, which unfortunately does not work either. For this I have coded an actual fix (see my fork). In my fork, Drop on Wire works out of Canvas and out of Nodebox. In addition, there is now also Drop On Pin, which you can not see at all in the video documentation :)
@AbdelazizSharaf001 If requested, I will be happy to create a pull request with the mentioned additions.

@j8sr0230
Copy link
Author

In my fork of AnimationFreeCAD to be precise: https://github.com/j8sr0230/AnimationFreeCAD. Just let me know if you want me to put it in the PyFlow upstream.

@Sharaf5
Copy link
Contributor

Sharaf5 commented Jul 25, 2022

Seems you are better than me @j8sr0230
I tested the drop on wire fix for standalone, and it works out of the box
But I should note that you are using hard coded path for macro dir, we need it to run on every platform so this should be able to change depending on the os type
Thanks for adjusting btn order, I was going modify it and add a merge request, but I see you did here

@j8sr0230
Copy link
Author

Interesting, actually I only wanted to make a pull request regarding the drop on wire functionality. All other commits I did in my own fork of PyFlow. I didn't know that all commits are sent upstream. Is there any way to prevent this so that I only push my changes into my fork initially?

@j8sr0230 j8sr0230 closed this Jul 25, 2022
@j8sr0230
Copy link
Author

@AbdelazizSharaf001 Thanks for rating. I have done some more research. As long as a pull request is open, all further commits in my fork are automatically merged. Of course, that was not my intention. The clean solution is to create a separate branch for each pull to control exactly what should be merged. For this reason, I am closing this pull and continuing to work in my own fork until I have enough input for a meaningful pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants