Add basic drag and drop support in the model designer #60664
+971
−12
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
🪟 Windows buildsDownload Windows builds of this PR for testing. 🪟 Windows Qt6 buildsDownload Windows Qt6 builds of this PR for testing. |
troopa81
reviewed
Feb 19, 2025
| // painter->restore(); | ||
| } | ||
|
|
||
| void QgsModelDesignerSocketGraphicItem::mousePressEvent( QGraphicsSceneMouseEvent *event ) |
There was a problem hiding this comment.
You don't need to override it if you don't mean to change anything
|
|
||
| void QgsModelDesignerSocketGraphicItem::modelPressEvent( QgsModelViewMouseEvent *event ) | ||
| { | ||
| QgsModelDesignerFlatButtonGraphicItem::modelPressEvent( event ); |
|
|
||
| painter->setRenderHint( QPainter::Antialiasing ); | ||
|
|
||
| float display_size = 3.2; |
There was a problem hiding this comment.
maybe a static constant ?
Comment on lines
183
to
192
| if ( mHoverState ) | ||
| { | ||
| painter->setPen( QPen() ); | ||
| painter->setBrush( QBrush( QColor( 0, 0, 0, 200 ), Qt::SolidPattern ) ); | ||
| } | ||
| else | ||
| { | ||
| painter->setPen( QPen() ); | ||
| painter->setBrush( QBrush( QColor( 0, 0, 0, 33 ), Qt::SolidPattern ) ); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if ( mHoverState ) | |
| { | |
| painter->setPen( QPen() ); | |
| painter->setBrush( QBrush( QColor( 0, 0, 0, 200 ), Qt::SolidPattern ) ); | |
| } | |
| else | |
| { | |
| painter->setPen( QPen() ); | |
| painter->setBrush( QBrush( QColor( 0, 0, 0, 33 ), Qt::SolidPattern ) ); | |
| } | |
| painter->setPen( QPen() ); | |
| painter->setBrush( QBrush( QColor( 0, 0, 0, mHoverState ? 200 : 33 ), Qt::SolidPattern ) ); |
| /** | ||
| * Gets the button's position. | ||
| */ | ||
| const QPointF getPosition() { return mPosition; }; |
There was a problem hiding this comment.
Suggested change
| const QPointF getPosition() { return mPosition; }; | |
| QPointF getPosition() { return mPosition; }; |
| @@ -91,12 +98,12 @@ class GUI_EXPORT QgsModelDesignerFlatButtonGraphicItem : public QGraphicsObject | |||
| * Sets the \a picture to render for the button graphics. | |||
| */ | |||
| void setPicture( const QPicture &picture ); | |||
| bool mHoverState = false; | |||
|
This is great! 🥳 I haven't done a code review yet, but just a couple of quick thoughts based on the screencasts:
|
for more information, see https://pre-commit.ci
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.
Introduction
This PR add the new way to edit a model using a drag and drop interface. This is part of long waited improvements in the model designer capabilities.
The design is based of the Google Summer of code proposal I did last year, and that we discussed on the mailling list. Compared to the original proposal the UI looks more similar to the current modeler interface
I encourage anyone to open your existing models and give it a try !
Thanks to the Hauts-de-France region for sponsorising this work
How does it works ?
New sockets were added around each parameter and algorithm used in a model.
sockets.example.mp4
Those are interactive and are used to connect component between them. To connect component drag any output socket regardless of it's from a model parameter or a algorithm into an input socket. You can also remove a connection by dragging an edge out of the socket.
peek.drag.and.drop.mp4
Theses new capabilities have been added as part of the select/edit tool. No needs to switch to a new tool when you want to edit connection in your model. The icon has been updated in consequence.
This PR remain fully compatible with the previous user interface. When you connect sockets by drag and drop. The dialog used when opening an algorithm is updated as well.
retro.compatible.mp4