Skip to content

Overview Tab - Layers#1659

Merged
jws-1 merged 31 commits intodevelopfrom
overview-tab-layers
Sep 12, 2023
Merged

Overview Tab - Layers#1659
jws-1 merged 31 commits intodevelopfrom
overview-tab-layers

Conversation

@jws-1
Copy link
Member

@jws-1 jws-1 commented Sep 5, 2023

This small PR adds ModuleLayers to the OverviewTab, as well as displaying (but not offering means to edit) their corresponding Modules. Future work (see #1652) will make this view more aesthetically pleasing (for example, ensuring that Nodes are sized to fit their contents), as well as providing means to edit ModuleLayers and control their Modules. Furthermore, the ModuleListView currently cannot be navigated, but this will be dealt with in a future PR along with the previously described visual improvements.

@jws-1 jws-1 force-pushed the overview-tab-layers branch from 1f0187b to 55b8fc7 Compare September 5, 2023 14:56
@jws-1 jws-1 mentioned this pull request Sep 5, 2023
14 tasks
@jws-1 jws-1 marked this pull request as ready for review September 12, 2023 08:07
Copy link
Member

@trisyoungs trisyoungs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from the ugliness this is looking pretty good!

dissolveModel_ = dissolveModel;
}

QImage DissolveModelImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Perhaps a contender for my new most-despised Qt override!

Comment on lines +51 to +54
return QString::fromStdString(std::string(data->name()));
case (Qt::UserRole):
return QVariant::fromValue(rawData(index));
return QVariant::fromValue(data);
case (Qt::UserRole + 1):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we definitely need a custom enum using Qt::UserRole as the base here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yep, I meant to do that but forgot to come back!

Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
@jws-1 jws-1 added the 8 DIfficulty: 8 label Sep 12, 2023
@jws-1 jws-1 removed the 8 DIfficulty: 8 label Sep 12, 2023
@jws-1 jws-1 merged commit 50ae5a4 into develop Sep 12, 2023
@jws-1 jws-1 deleted the overview-tab-layers branch September 12, 2023 11:54
rprospero pushed a commit that referenced this pull request Mar 11, 2024
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
rprospero pushed a commit that referenced this pull request Apr 8, 2024
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
rprospero pushed a commit that referenced this pull request Apr 9, 2024
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
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.

2 participants