Skip to content

ENH: Adds Support for Formula Curves + Formula Editor #161

Merged
YektaY merged 9 commits into
mainfrom
new_formula
Aug 22, 2025
Merged

ENH: Adds Support for Formula Curves + Formula Editor #161
YektaY merged 9 commits into
mainfrom
new_formula

Conversation

@YektaY

@YektaY YektaY commented Jun 12, 2025

Copy link
Copy Markdown
Collaborator

Description

This PR adds support for Formula Curves + Formula Editor

this pr also adds in a utilities file formula_validation.py which has helper functions to validate formulas in the control panel

Note:
to test this you need to be on this branch of PyDM: slaclab/pydm#1260

Work still needed on this before merging in:

  1. also need to fix an issue where data_insight_tool.py does not like that "FormulaCurveItem' object has no attribute 'address'"

screenshots

Screenshot 2025-07-24 at 3 35 24 PM

@YektaY YektaY marked this pull request as ready for review July 24, 2025 22:25
@YektaY YektaY requested a review from a team July 24, 2025 22:41

@zdomke zdomke left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

PR looks good. The functionality is there and it works for the most part. There are some things that could be changed like functions that don't ever seem to be used.

The only issues that we really need to fix are mean, ln, and ^ being marked as invalid func names in the validation step.
The rest of these issues would be nice to haves or things we can get back to later.

Comment thread trace/widgets/utilities/formula_validation.py Outdated
Comment thread trace/widgets/formula_dialog.py
Comment thread trace/widgets/formula_dialog.py Outdated
Comment thread trace/widgets/formula_dialog.py Outdated
Comment thread trace/widgets/formula_dialog.py
Comment thread trace/widgets/control_panel.py Outdated
Comment thread trace/widgets/control_panel.py
Comment thread trace/widgets/control_panel.py Outdated
Comment thread trace/widgets/control_panel.py Outdated
Comment thread trace/widgets/control_panel.py Outdated
@zdomke zdomke added this to the Trace 1.5 milestone Aug 7, 2025
@zdomke zdomke mentioned this pull request Aug 8, 2025
@zdomke

zdomke commented Aug 20, 2025

Copy link
Copy Markdown
Collaborator

You may need to rebase your branch or change the target branch since ui_redesign has been merged into main.

@YektaY YektaY changed the base branch from ui_redesign to main August 21, 2025 15:41
@zdomke

zdomke commented Aug 21, 2025

Copy link
Copy Markdown
Collaborator

Looks good 👍

YektaY and others added 9 commits August 21, 2025 16:27
… formula curves.

Made a slew of changes to get formula curves working. also fixed an issue with deleting curves.
Made changes to how variable names are generated and added in an invalid symbol when a formula is no longer valid.
Co-authored-by: Zach Domke <102621345+zdomke@users.noreply.github.com>
Co-authored-by: Zach Domke <102621345+zdomke@users.noreply.github.com>
Co-authored-by: Zach Domke <102621345+zdomke@users.noreply.github.com>
Co-authored-by: Zach Domke <102621345+zdomke@users.noreply.github.com>
Co-authored-by: Zach Domke <102621345+zdomke@users.noreply.github.com>
Co-authored-by: Zach Domke <102621345+zdomke@users.noreply.github.com>
Co-authored-by: Zach Domke <102621345+zdomke@users.noreply.github.com>
@YektaY YektaY merged commit c02ecd7 into main Aug 22, 2025
7 checks passed
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