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.

Sign up for GitHub

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

Jump to bottom

Interpolation for operations #2782

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
+284 −127
Draft

Interpolation for operations #2782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6222864
added interpolation to data operations and interpolated points
caitwolf Jan 22, 2024
2d2d9a0
added preview functionality to data operations
caitwolf Jan 22, 2024
e4c2d3a
cleaning up code for interpolation
caitwolf Jan 22, 2024
697bfb9
changes to plots
caitwolf Jan 22, 2024
b262fe2
updated data operation plots and reversed format to A + B = C rather …
caitwolf Jan 22, 2024
08631e9
Update ci.yml to handle merge conflicts with rebase
caitwolf Jan 22, 2024
f9ed494
removed commented unused code and extra whitespace
caitwolf Jan 30, 2024
96a389f
added caution statement to data operations panel regarding interpolation
caitwolf Jan 31, 2024
3f2f1a8
cleaned up colors for data operation panel plots
caitwolf Jan 31, 2024
65e63e1
adding loggin message to indicate data operation was completed
caitwolf Jan 31, 2024
bdd88a0
added checks for empty datasets and graphs during onSave and also cle…
caitwolf Jan 31, 2024
74c455a
cleaning up code included extra spaces and commented sections
caitwolf Jan 31, 2024
b3eb240
Merge branch 'release_6.0.0' into interpolation_for_operations
caitwolf Mar 25, 2024
a6998f5
Merge branch 'release_6.0.0' into interpolation_for_operations
caitwolf Mar 25, 2024
2c091fa
fixed bug dropping isSesans attribute in Data1D object when it was lo…
Apr 2, 2024
907b757
enabled automatic update of data comboboxes when new data is loaded i…
Apr 2, 2024
5e42ae8
Merge branch 'release_6.0.0' into interpolation_for_operations
caitwolf Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:

- name: Fetch sources for sibling projects
run: |
git clone --depth=50 --branch=release_0.9.0 https://github.com/SasView/sasdata.git ../sasdata
git clone --depth=50 --branch=interpolations_for_data_operations https://github.com/SasView/sasdata.git ../sasdata
git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git ../sasmodels
git clone --depth=50 --branch=master https://github.com/bumps/bumps.git ../bumps

Expand Down
Loading
Loading