Skip to content

feat:Display enum parameters - #2210

Merged
rprospero merged 23 commits into
develop2from
enum_parameter
Aug 4, 2025
Merged

feat:Display enum parameters#2210
rprospero merged 23 commits into
develop2from
enum_parameter

Conversation

@rprospero

@rprospero rprospero commented Jul 25, 2025

Copy link
Copy Markdown
Contributor

This PR presents the user with a drop down for selecting enum values. This requires that the enum is included in the EnumRegistry.

As a side benefit of this PR, the options are now editable (they were previously read only). Additionally, it disables building the legacy GUI, though the tests remain.

@rprospero
rprospero changed the base branch from develop to develop2 July 25, 2025 12:25
@rprospero
rprospero marked this pull request as draft July 25, 2025 12:27

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: bec6b9c Previous: fd90374 Ratio
BM_HistogramBinning_1d/16777216 24.554909903696107 ns/iter 10.444396356764424 ns/iter 2.35

This comment was automatically generated by workflow using github-action-benchmark.

CC: @disorderedmaterials/dissolve-devs

@trisyoungs trisyoungs left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This has come together really nicely, and I kinda like the centralised storage of models for different EnumOptions. Couple of minor suggesetions / comments, but otherwise all good.

#include "gui/models/nodeGraph/enumOptionsModel.h"
#include "base/enumOptionsBase.h"

// Set source AtomType data

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

No prizes for guessing where this code originated! :)

Comment thread src/gui/models/nodeGraph/enumRegistry.cpp Outdated
Comment thread src/gui/models/nodeGraph/parameterModel.cpp Outdated
Comment thread src/nodes/parameter.h Outdated
Comment thread src/nodes/parameter.h Outdated
Comment thread src/nodes/parameter.h Outdated
rprospero and others added 9 commits July 29, 2025 08:41
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
@rprospero
rprospero marked this pull request as ready for review August 1, 2025 10:06
@rprospero
rprospero requested a review from trisyoungs August 1, 2025 10:07
@rprospero

Copy link
Copy Markdown
Contributor Author

@trisyoungs I thought it might be worth a second review before I merge to get a glimpse of the changes I made to disable the packaging.

@rprospero
rprospero merged commit 6d66788 into develop2 Aug 4, 2025
9 checks passed
@rprospero
rprospero deleted the enum_parameter branch August 4, 2025 08:33
rprospero added a commit that referenced this pull request Sep 5, 2025
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
trisyoungs added a commit that referenced this pull request Sep 10, 2025
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
RobBuchananCompPhys pushed a commit that referenced this pull request Sep 12, 2025
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
RobBuchananCompPhys pushed a commit that referenced this pull request Sep 25, 2025
Co-authored-by: Tristan Youngs <tristan.youngs@stfc.ac.uk>
rprospero added a commit that referenced this pull request Feb 4, 2026
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