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.

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

Merge 6.0.0 changes into main #3133

Merged
merged 225 commits into from
Jan 8, 2025
Merged
Changes from 1 commit
Commits
Show all changes
225 commits
Select commit Hold shift + click to select a range
70f4687
Update matrix.py
wpotrzebowski Jun 28, 2024
0623f5f
Update requirements.txt
wpotrzebowski Jun 28, 2024
98b4f61
move pinned imports to version-pinned section and add comments in `re…
tsole0 Jun 28, 2024
bbab0c8
revert positions of imports back into non-pinned section as it seems …
tsole0 Jun 28, 2024
67c3b00
Emit to the status bar when project loading begins and once it is com…
krzywon Jul 12, 2024
11f4acc
Merge release_6.0.0 into release_6.0.0-macos13 and resolve conflict i…
krzywon Jul 23, 2024
641bb2a
Allow empty densities in the SLD calculator tool to better match the …
krzywon Jul 23, 2024
e0a154f
More robust prechecks for the SLD panel to prevent unhandled exceptions
krzywon Jul 31, 2024
64f0f34
Update SLD calculator help file to match latest behavior
krzywon Jul 31, 2024
813242a
Give user feedback if density is required
krzywon Jul 31, 2024
cbcfd33
Merge branch 'release_6.0.0' into release_6.0.0-macos13
krzywon Aug 13, 2024
29dfdaa
Reset the x and y data transforms when creating new plots to prevent …
krzywon Aug 15, 2024
c726315
INNO installer - do not default to the previously installed directory
krzywon Aug 16, 2024
844f384
INNO installer - warn the user if the directory already exists and en…
krzywon Aug 16, 2024
688a2f4
Disable and ignore the density field if density is included in the fo…
krzywon Aug 19, 2024
4286fa1
Move try/catch around calculations to capture Assertion error when th…
krzywon Aug 19, 2024
b29222d
Check successful launch of sasview on CI (linux)
llimeht Aug 20, 2024
04ddbcb
Add additional Ubuntu packages for testing installer
llimeht Aug 20, 2024
82c5d3d
Set default settings to display mpl toolbar and hide PD plots
krzywon Aug 20, 2024
9907656
Merge pull request #3070 from SasView/2816-ci-installer-exit-codes
wpotrzebowski Aug 21, 2024
b1b5d95
Merge branch 'release_6.0.0' into release_6.0.0-macos13
wpotrzebowski Aug 21, 2024
cc21def
Fixed querying of the data dict at the removal step. Fixes #3015
rozyczko Aug 21, 2024
55b8ec9
Update matrix.py
wpotrzebowski Aug 21, 2024
ddc4434
Update matrix.py
wpotrzebowski Aug 21, 2024
a12316b
Update matrix.py
wpotrzebowski Aug 21, 2024
6021350
Update matrix.py
wpotrzebowski Aug 21, 2024
572debc
Update sasview.spec
wpotrzebowski Aug 21, 2024
55e1ec3
Update sasview.spec
wpotrzebowski Aug 21, 2024
2ebebcd
Merge pull request #3074 from SasView/3057-default-config-values
wpotrzebowski Aug 21, 2024
b7df8db
Update matrix.py
wpotrzebowski Aug 21, 2024
e65f190
Update matrix.py
wpotrzebowski Aug 21, 2024
15f704c
Update matrix.py
wpotrzebowski Aug 21, 2024
5610737
Update ci.yml
wpotrzebowski Aug 21, 2024
46d7e01
icon change, now in the right branch
juliuskarliczek Aug 21, 2024
65f24ac
Merge pull request #3042 from SasView/3029-default-install-directory
butlerpd Aug 21, 2024
4139904
Update ci.yml
wpotrzebowski Aug 21, 2024
ab2990c
Update ci.yml
wpotrzebowski Aug 21, 2024
595de51
remove/disable edit button
tsole0 Aug 21, 2024
6662b52
Update ci.yml
wpotrzebowski Aug 21, 2024
067059e
Update sasview.spec
wpotrzebowski Aug 21, 2024
4d25282
Update matrix.py
wpotrzebowski Aug 21, 2024
fc3b342
Update ci.yml
wpotrzebowski Aug 21, 2024
cc61cc8
Merge pull request #3022 from SasView/1783-new-plot-reset-transform
butlerpd Aug 21, 2024
fbaa344
better checks on result object
rozyczko Aug 21, 2024
4efaa5b
Attempt to delete all installation folder contents
krzywon Aug 21, 2024
af6e3b5
Attempt to delete all installation folder contents
krzywon Aug 21, 2024
a1c7b29
Use InstallDelete from INNO instead of code script
krzywon Aug 21, 2024
0c6af4e
Merge pull request #3078 from SasView/3058-whatsnew-preferences-release
krzywon Aug 21, 2024
86d8e49
Update checks to allow some component densities to be given in the fo…
krzywon Aug 21, 2024
82ae41d
Catch key errors for amino acid sequences
krzywon Aug 21, 2024
8e96d0e
Update documentation for density calculations
krzywon Aug 21, 2024
9ca5e0f
typo
krzywon Aug 21, 2024
5239ce9
Final documentation edits for SLD calculator
krzywon Aug 21, 2024
5b7585f
Override default INNO directory exists message to let user know the d…
krzywon Aug 21, 2024
e079f85
Merge branch 'release_6.0.0' into 2982-sld-calculator-density
krzywon Aug 21, 2024
9c929cc
grab h1 tags from current html page and format into window title
tsole0 Aug 21, 2024
ee68926
swap to using filepath instead of extracting title from html
tsole0 Aug 21, 2024
a629321
Take the original fix one step further
krzywon Aug 21, 2024
f22452a
check for empty arrays #3085
rozyczko Aug 22, 2024
ba87cd9
Merge pull request #3079 from SasView/2994-fitting-failshangs-on-some…
wpotrzebowski Aug 22, 2024
f19a41b
Remove unneeded carriage returns
krzywon Aug 22, 2024
8f01734
use setVisible to change visibility of edit button for 6.0.0 release
tsole0 Aug 22, 2024
99ebec7
use toLocalFile() method to convert QUrl to filepath; simplify try/ex…
tsole0 Aug 22, 2024
265b06d
remove one conditional level
rozyczko Aug 22, 2024
dd710d7
Merge pull request #3083 from SasView/3072-remove-edit-button
krzywon Aug 22, 2024
7e34f96
Merge pull request #3073 from SasView/2914-project-load-status
krzywon Aug 22, 2024
9bde0c6
Merge pull request #3087 from SasView/3085-changing-parameter-values-…
krzywon Aug 22, 2024
7355715
ouput for sphinx is now set to correct directory for models. Opens lo…
tsole0 Aug 22, 2024
68d4d3e
delete unnecessary imports/redundant function call
tsole0 Aug 22, 2024
46f20a1
Merge pull request #3082 from SasView/2nd-option-2832-documentation
krzywon Aug 22, 2024
3fc79b8
Merge pull request #3084 from SasView/3016-pd-changes
krzywon Aug 22, 2024
a397129
Merge pull request #3081 from SasView/3030-delete-installation-folder…
krzywon Aug 22, 2024
9ee98ad
Merge pull request #3089 from SasView/3015-deleting-data-from-the-dat…
krzywon Aug 23, 2024
0c39468
Use standard buttons for the message box to prompt the user all data …
krzywon Aug 26, 2024
2b15d11
fixes issues when generating TOC. makes some errors that occur when g…
tsole0 Aug 26, 2024
4fd9758
remove unneeded import
tsole0 Aug 26, 2024
bec4e0e
prevent multiple documentation regeneration attempts from happening a…
tsole0 Aug 26, 2024
030278d
fix import directory
tsole0 Aug 26, 2024
293bebe
try to force python to write its buffer to file
tsole0 Aug 26, 2024
d0536c9
changes do not seem to be effective; reverting
tsole0 Aug 26, 2024
22d6de0
Merge pull request #2917 from SasView/release_6.0.0-macos13
wpotrzebowski Aug 27, 2024
95437ad
Merge pull request #3093 from SasView/3091-project-load-no-button-cli…
wpotrzebowski Aug 27, 2024
ec3a066
re-added tests to macos
klytje May 10, 2024
f243d87
just run macos for debug
rozyczko May 21, 2024
007924a
back to all hosts
rozyczko May 22, 2024
72a11bf
Update ci.yml
wpotrzebowski May 22, 2024
2ca2473
Update ci.yml
klytje May 22, 2024
0dab666
moved ausaxs lib to binary spec section
klytje May 22, 2024
cac0dfe
temporarily removed first-time hook safety feature
klytje May 23, 2024
0ce6275
reverted files to main
klytje Aug 27, 2024
3665985
macos now fetching architecture-specific libs
klytje Aug 27, 2024
934d32c
revert ci.yml; re-enable upx for macos
klytje Aug 27, 2024
66c7e2b
refactor `regenmodel.py` to remove `run_sphinx` and replace with `mak…
tsole0 Aug 27, 2024
4cdfbc5
Fix subprocessing logging so the doc regen window updates as the rege…
krzywon Aug 27, 2024
7423d43
fix file processing in `generate_html`
tsole0 Aug 27, 2024
09e657b
detect deleted plugin models on docs regeneration and remove deleted …
tsole0 Aug 27, 2024
f5712e7
Update background and text colors of SLD calculator inputs to better …
krzywon Aug 28, 2024
9674dc7
make DocViewWidget independent window and fix GPUOptions help page.
tsole0 Aug 28, 2024
7d14db0
remove print statement
tsole0 Aug 28, 2024
f4c196e
dynamically create class variables to prevent old windows being erase…
tsole0 Aug 28, 2024
a0b93c9
Add new signals used by the doc generation process
krzywon Aug 28, 2024
c096a21
Emit a signal to other GUI elements when the main application is closed
krzywon Aug 28, 2024
7b8ae17
Add a signal to load the log while doc gen is running
krzywon Aug 28, 2024
afb6247
Return the subprocess runner from generate_html to allow parent proce…
krzywon Aug 28, 2024
fd831bb
Update doc gen thread runner to ensure lock and runner are released w…
krzywon Aug 28, 2024
bca284c
implement suggested code edits
tsole0 Aug 29, 2024
9de9458
re-implement missing help button in fitting options
tsole0 Aug 29, 2024
ceebafd
Remove unneeded if statement that was preventing beta calculation fro…
krzywon Aug 30, 2024
be1d45a
Attempt at fix
lucas-wilkins Sep 4, 2024
0e4c19a
Should work better now
lucas-wilkins Sep 4, 2024
bb0e34b
Use the calcthread lock instead of a separate lock
krzywon Sep 6, 2024
29979b0
Pass the target to the thread at run-time rather than on instantiation
krzywon Sep 6, 2024
6a7c03d
Remove unneeded code
krzywon Sep 6, 2024
c33d24b
Merge remote-tracking branch 'origin/release_6.0.0' into 2952-make-do…
tsole0 Sep 9, 2024
79e22f3
Merge pull request #2986 from SasView/2982-sld-calculator-density
krzywon Sep 10, 2024
0b54303
Merge branch 'release_6.0.0' into mac_test
krzywon Sep 13, 2024
f1f5092
Use GuiUtils instead of GuiManager calls for help
krzywon Sep 18, 2024
f6719a1
restore call to GuiManager.showhelp
krzywon Sep 18, 2024
324e1a6
Merge pull request #3097 from SasView/2952-make-documentation-viewer-…
krzywon Sep 18, 2024
5fab465
Merge pull request #3104 from SasView/3086-weird-plot-auto-scaling
krzywon Sep 18, 2024
a3b18a5
Merge branch 'release_6.0.0' into 3077-generate-user-model-docs
krzywon Sep 18, 2024
13ae59f
Fix circular import
krzywon Sep 19, 2024
b53e0d1
Use built-in window for orientation viewer help
krzywon Sep 19, 2024
395e20f
Merge pull request #3100 from SasView/3014-beta-approximation-does-no…
krzywon Sep 20, 2024
b0c1136
Create a global Communicate object that any window can access
krzywon Sep 23, 2024
3c8e792
Pass proper args and kwargs in doc view widget
krzywon Sep 23, 2024
ffdcf6e
Refresh doc log earlier in doc gen scheme
krzywon Sep 23, 2024
fe87e08
single_files could be empty string, empty list, or None - look for tr…
krzywon Sep 23, 2024
c3ad049
Close thread when program closes
krzywon Sep 24, 2024
4e8be14
Fix minor threading issue
krzywon Sep 25, 2024
3035dc7
Set sas opencl os variable prior to running GPU tests
krzywon Sep 25, 2024
89451b9
Cancel PDB file load on first major error
krzywon Sep 25, 2024
f7869dd
Merge pull request #3112 from SasView/various-6.0.0-fixes
krzywon Sep 27, 2024
3b7abf3
Merge pull request #3088 from SasView/3077-generate-user-model-docs
krzywon Sep 27, 2024
7abdb04
Update version for RC1
krzywon Sep 27, 2024
7c23989
Disable orientation viewer for Wayland
lucas-wilkins Sep 30, 2024
3571969
Remove 6.0-specific release notes
krzywon Sep 30, 2024
8e24f52
Merge pull request #3113 from SasView/version-for-rc1
pkienzle Oct 1, 2024
2d1ad6c
Reset version to match the expect form of 'X.Y.Z' and add a note for …
krzywon Oct 3, 2024
9ccf3a4
Set all versions to 6.0.0 for final release candidate
krzywon Oct 3, 2024
282f963
Setup android SDK for windows binary signing
krzywon Oct 3, 2024
38de3c9
Remove SDK installation since it is unnecessary
krzywon Oct 3, 2024
95b4fb8
Merge pull request #3117 from SasView/fix-rc1
krzywon Oct 4, 2024
2c8117c
Merge pull request #3115 from SasView/3114-orientation-viewer-doesnt-…
krzywon Oct 8, 2024
73d28ec
Include james in the contributors list
krzywon Oct 8, 2024
9e3cd58
Set the parent of whatsnew correctly.
jamescrake-merani Aug 23, 2024
ebada3b
Remove NaNs from any resulting fit, regardless of the source to ensur…
krzywon Oct 9, 2024
49ff47e
Use tags instead of release branches for sasdata and sasmodels
krzywon Oct 9, 2024
8acfbbe
Add logo with right format + size.
jamescrake-merani Oct 9, 2024
5ba25c6
Add metainfo file.
jamescrake-merani Oct 9, 2024
d64dcf8
Build on Ubuntu 22.04 as well.
jamescrake-merani Oct 9, 2024
78fa9d5
Added a desktop file.
jamescrake-merani Oct 9, 2024
08a6b0a
Fix the version.
jamescrake-merani Oct 9, 2024
4933ea1
Renamed the icon file.
jamescrake-merani Oct 9, 2024
121c58e
Missing comma on the os release list.
jamescrake-merani Oct 9, 2024
796c590
Format developer properly.
jamescrake-merani Oct 9, 2024
86c689f
Get fitting optimizer from config, not predefined value (I swear I di…
krzywon Oct 11, 2024
1d7e219
Merge branch 'release_6.0.0' into files-for-flatpak
lucas-wilkins Oct 11, 2024
7bdc438
Update description for flatpack and add links to repo, etc.
krzywon Oct 11, 2024
3dfbb59
Add status bar message when GSC opens waring users it may be behind t…
krzywon Oct 11, 2024
aa44852
Description must be in a paragraph.
jamescrake-merani Oct 14, 2024
2f2da62
Shorterned the summary.
jamescrake-merani Oct 14, 2024
b0c4cd2
Removed some whitespace.
jamescrake-merani Oct 14, 2024
3633ce5
Add a metadata licence.
jamescrake-merani Oct 14, 2024
9e31345
Linter was complaining about dot at end.
jamescrake-merani Oct 14, 2024
358a27d
Fixed a typo.
jamescrake-merani Oct 14, 2024
2f55a4b
Add release 6.
jamescrake-merani Oct 14, 2024
d27f4b2
Add a content rating.
jamescrake-merani Oct 14, 2024
74584d0
Added a screenshot for a basic fit.
jamescrake-merani Oct 14, 2024
5a5b0bb
Created dir 'application_metadata' in build_tools.
jamescrake-merani Oct 14, 2024
9b41ab0
Added a screenshot.
jamescrake-merani Oct 14, 2024
16db342
Fixed typo on screenshot.
jamescrake-merani Oct 14, 2024
e01a466
Fixed small schema error.
jamescrake-merani Oct 14, 2024
8204efe
Add new v6 tutorials to release_6.0.0 branch
smk78 Oct 15, 2024
251cd8f
Adding SciLifeLab logo to About box
wpotrzebowski Oct 15, 2024
17ea162
Merge pull request #3124 from SasView/release_6.0.0_scilifelab_logo
krzywon Oct 16, 2024
e928958
Remove image file and use image links from commits
krzywon Oct 16, 2024
5326cb0
Merge pull request #3122 from SasView/6.0.0-final-fixes
krzywon Oct 16, 2024
642b092
Dodgy avoidance of exception.
jamescrake-merani Oct 17, 2024
4534e46
Posistion should be updated even on right clicks.
jamescrake-merani Oct 17, 2024
fc86074
Use links directly from sasview.org for flatpak
krzywon Oct 17, 2024
e7fd72a
Removed the last screenshot.
jamescrake-merani Oct 17, 2024
8b0da66
Merge pull request #3121 from SasView/files-for-flatpak
krzywon Oct 17, 2024
3b9fcd1
Return early if the fit has errors
krzywon Oct 17, 2024
8b7f4da
Use different covariance calculation if only one parameter selected f…
krzywon Oct 17, 2024
1069fbe
Only update OpenCL environment when OpenCL changes are staged
krzywon Oct 17, 2024
50bbddf
Added some comments.
jamescrake-merani Oct 18, 2024
5b53850
Merge pull request #3128 from SasView/3127-adding-custom-text-to-a-gr…
krzywon Oct 18, 2024
8688088
Update release notes
krzywon Oct 18, 2024
73ac582
Fix new model information for v6.0.0 and v5.0.6
krzywon Oct 18, 2024
b83c074
fixed ausaxs filename bug
klytje Oct 21, 2024
6ac7d56
missing assign
klytje Oct 21, 2024
125ca72
update
klytje Oct 21, 2024
8ede875
bugfix
klytje Oct 21, 2024
60be519
updaet
klytje Oct 21, 2024
2e0a24d
more debug info
klytje Oct 21, 2024
2a5524d
disabled other builds
klytje Oct 21, 2024
9359b1a
compile w. universal
klytje Oct 21, 2024
3c8fe18
trigger recompile
klytje Oct 22, 2024
3bf1d50
recompile
klytje Oct 22, 2024
72fce07
Update RELEASE.rst
lucas-wilkins Oct 22, 2024
665ba0c
relaxed maximum deviation allowed in tests
klytje Oct 22, 2024
37cf2b8
Check if documentation path exists. Show 404 error if not found
krzywon Oct 22, 2024
07b68b9
reverted unnecessary changes
klytje Oct 22, 2024
82af689
reverted matrix
klytje Oct 22, 2024
a7236a3
Include inline documentation for the new GPUOptions class variable
krzywon Oct 22, 2024
8f1b246
Modify the covariance calculation based on reviews
krzywon Oct 22, 2024
a371f28
Remove print statement
krzywon Oct 22, 2024
2efaab9
Merge branch 'release_6.0.0' into mac_test
klytje Oct 22, 2024
a6c8361
Move weighting from Fitting Enhancement to New Features
smk78 Oct 23, 2024
b2fac8e
Minor furtling
smk78 Oct 23, 2024
cbd301b
Clarify name of new bulk ferromagnet model
smk78 Oct 23, 2024
56a839b
Merge pull request #3129 from SasView/3126-opencl-and-covariance-issues
krzywon Oct 23, 2024
b546ad8
Do not attempt to load plugin model documentation and fall back to ba…
krzywon Oct 23, 2024
22a78ff
Remove documentation generation from release notes (for now)
krzywon Oct 23, 2024
5d40983
Update model name in release notes to match name in SasView
krzywon Oct 23, 2024
0d887e0
Catch combined models when displaying documentation
krzywon Oct 24, 2024
68c8462
Update documentation window release notes to highlight the new doc wi…
krzywon Oct 24, 2024
fb5d45c
Merge pull request #2882 from SasView/mac_test
krzywon Oct 24, 2024
4cc7904
Merge pull request #3130 from SasView/final-release-notes
krzywon Oct 24, 2024
2e519c4
Merge pull request #3131 from SasView/mac-help-files-fix
krzywon Oct 24, 2024
8d006f8
merge main into release_6.0.0 and resolve conflicts
krzywon Oct 24, 2024
a64b582
Merge branch 'main' into merge-6-0-0-into-main
krzywon Dec 3, 2024
05847ba
Merge branch 'main' into merge-6-0-0-into-main
lucas-wilkins Jan 8, 2025
f050838
Removed test for linux installer - linux installer is no longer used …
lucas-wilkins Jan 8, 2025
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
Prev Previous commit
Next Next commit
prevent multiple documentation regeneration attempts from happening a…
…t the same time using locking
tsole0 committed Aug 26, 2024
commit bec4e0eae98eca55e2a1346de76e43def53f6186
13 changes: 10 additions & 3 deletions src/sas/qtgui/Utilities/DocViewWidget.py
Original file line number Diff line number Diff line change
@@ -48,11 +48,18 @@ def compute(self):
"""
Regen the docs in a separate thread
"""
from src.sas.qtgui.Utilities.GuiUtils import documentation_lock
try:
if self.target.exists():
make_documentation(self.target)
if documentation_lock.acquire(blocking=False):
try:
# Start a try/finally block to ensure that the lock is released if an exception is thrown
if self.target.exists():
make_documentation(self.target)
finally:
documentation_lock.release()
else:
return
logging.info('Documentation regeneration is already in process. '
'Please wait for it to complete before attempting again.')
except KeyboardInterrupt as msg:
logging.log(0, msg)

2 changes: 2 additions & 0 deletions src/sas/qtgui/Utilities/GuiUtils.py
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
import numpy
from io import BytesIO
from pathlib import Path
from threading import Lock

import numpy as np

@@ -58,6 +59,7 @@

logger = logging.getLogger(__name__)

documentation_lock = Lock() # Lock for preventing multiple documentation regenerations at once

def get_sensible_default_open_directory():
"""