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

2996 developer menu #2997

Merged
merged 195 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
195 commits
Select commit Hold shift + click to select a range
78ded32
Simplify smearing selector, combining nested if/else checks into a si…
krzywon Apr 1, 2024
632e064
Fix issue in smearing widget where 'None' is not selected by default …
krzywon Apr 1, 2024
de28a52
Allow custom pinhole and slit smearing on theory plots (but not SESAN…
krzywon Apr 1, 2024
12f6eb3
Only smear data fit once data (real or theoretical) is present, but u…
krzywon Apr 2, 2024
84d8ed4
Use contents-directory pyinstaller option to not create '_internal' d…
krzywon Apr 24, 2024
981c98e
Put contents directory in EXE command as intended
krzywon Apr 24, 2024
ad7faba
Underscored name, not dash
krzywon Apr 24, 2024
5b810a3
Merge branch 'release_6.0.0' into pyinstaller-part-deux
krzywon Apr 26, 2024
f69b809
Filling in What's New - Some change in the logic
lucas-wilkins May 9, 2024
45fafa8
Images and CSS works now, first two done
lucas-wilkins May 9, 2024
856f2e2
Formatting
lucas-wilkins May 9, 2024
ecac1d6
Update plotting enhancements in What's New window
krzywon May 21, 2024
3e223dc
Add slicer enhancements to What's New window
krzywon May 21, 2024
ae021b3
Move all doc files into user directory on installation
krzywon May 21, 2024
d1f6ac2
Fix syntax error in installer.iss
krzywon May 21, 2024
ae42a24
Merge branch 'release_6.0.0' into sasdata-66-dQ-options
krzywon May 22, 2024
a865d83
Merge branch 'release_6.0.0' into 2732-fill-in-whats-new-boxes-for-re…
lucas-wilkins May 23, 2024
770824e
Update slicer images for what's new box
krzywon Jun 4, 2024
3b49d97
Tidy up of messages
lucas-wilkins Jun 6, 2024
2c5e245
Populate the full changelist
krzywon Jun 6, 2024
8a7179c
Updated about box
lucas-wilkins Jun 11, 2024
4336861
Reworded: Acknowledge -> Cite SasView
lucas-wilkins Jun 11, 2024
f874bd2
Added css to installer
lucas-wilkins Jun 18, 2024
f307bd0
Merge branch 'release_6.0.0' into 2732-fill-in-whats-new-boxes-for-re…
lucas-wilkins Jun 18, 2024
0cc6c06
Added images to installer .spec
lucas-wilkins Jun 18, 2024
98e6dcf
Merge branch 'release_6.0.0' into 2885-logos-do-not-appear-in-about-b…
lucas-wilkins Jun 18, 2024
7978f56
Merge branch 'release_6.0.0' into 2885-logos-do-not-appear-in-about-b…
lucas-wilkins Jun 20, 2024
b4fd1b4
Merge branch 'release_6.0.0' into 2732-fill-in-whats-new-boxes-for-re…
lucas-wilkins Jun 20, 2024
85b0c15
Missing comma in .spec
lucas-wilkins Jun 20, 2024
5a3a58e
hover feedback
lucas-wilkins Jun 21, 2024
efabd7a
Merge branch '2885-logos-do-not-appear-in-about-box-1' of https://git…
lucas-wilkins Jun 21, 2024
293d15b
Fix version in installer
krzywon Jun 21, 2024
0cf1ba6
Merge branch 'release_6.0.0' into 2898-version
krzywon Jun 21, 2024
c7b702f
Add files via upload
wpotrzebowski Jun 30, 2024
85cf5ca
Update requirements.txt
wpotrzebowski Jun 30, 2024
4abdb99
Add files via upload
wpotrzebowski Jun 30, 2024
1a7af25
Add files via upload
wpotrzebowski Jun 30, 2024
6d495a3
Update config.py
wpotrzebowski Jul 1, 2024
c46d806
Add files via upload
wpotrzebowski Jul 1, 2024
4b5caf2
Add files via upload
wpotrzebowski Jul 1, 2024
0610778
Update config.py
wpotrzebowski Jul 1, 2024
4206572
Fixed things mentioned
lucas-wilkins Jul 1, 2024
15cf229
Removed empty \text tag
lucas-wilkins Jul 1, 2024
c2b1d64
Pin scipy version to 1.13.1
lucas-wilkins Jul 1, 2024
23a215b
Renamed trapz and cumtrapz
lucas-wilkins Jul 1, 2024
0203068
Pin scipy to 1.14
lucas-wilkins Jul 1, 2024
98d6b16
1.14.0
lucas-wilkins Jul 1, 2024
26fb7ec
More [cum]trapz
lucas-wilkins Jul 1, 2024
1f461ce
Merge pull request #2923 from SasView/2922-scipy-114-introduces-break…
krzywon Jul 1, 2024
f639128
Unpin scipy
lucas-wilkins Jul 1, 2024
d950aee
Merge branch 'release_6.0.0' into 2913-corfunc-technical-needs-attention
lucas-wilkins Jul 1, 2024
421ace1
Merge branch 'release_6.0.0' into 2922-scipy-114-introduces-breaking-…
lucas-wilkins Jul 1, 2024
c72e401
Fixed GPU help button resolution
lucas-wilkins Jul 1, 2024
9872fba
Merge branch 'release_6.0.0' into release_6.0.0_splash_screen
wpotrzebowski Jul 1, 2024
29acb7b
Merge branch 'release_6.0.0' into pyinstaller-part-deux
krzywon Jul 1, 2024
6871cb3
Remove redundant line in iss file and remove user directory write
krzywon Jul 1, 2024
3811500
Changed to open in browser
lucas-wilkins Jul 2, 2024
bb0c8eb
Merge pull request #2924 from SasView/2922-scipy-114-introduces-break…
butlerpd Jul 2, 2024
c703ae4
Merge pull request #2921 from SasView/2913-corfunc-technical-needs-at…
butlerpd Jul 2, 2024
9464834
Merge branch 'release_6.0.0' into 2908-links-in-tutorialrst-dont-resolve
lucas-wilkins Jul 2, 2024
2840935
Merge branch 'release_6.0.0' into sasdata-66-dQ-options
lucas-wilkins Jul 2, 2024
6610e23
Point to web docs instead
lucas-wilkins Jul 2, 2024
def7ead
Merge branch 'release_6.0.0' into pyinstaller-part-deux
wpotrzebowski Jul 2, 2024
9009914
Merge pull request #2927 from SasView/2908-links-in-tutorialrst-dont-…
smk78 Jul 3, 2024
71d841b
Remove tutorials from working.rst
smk78 Jul 3, 2024
72b65cc
Delete docs/sphinx-docs/source/user/tutorial.rst
smk78 Jul 3, 2024
a8464d7
Merge branch 'release_6.0.0' into release_6.0.0_splash_screen
lucas-wilkins Jul 3, 2024
9a60432
Load splash image using importlib.resources, not relative path
lucas-wilkins Jul 3, 2024
477ad3c
Added image path alias to .spec
lucas-wilkins Jul 4, 2024
0dc7e38
Add files via upload
wpotrzebowski Jul 4, 2024
7d57746
Add files via upload
wpotrzebowski Jul 4, 2024
653c81a
Add files via upload
wpotrzebowski Jul 4, 2024
dd7d70d
Link to web for reliability
lucas-wilkins Jul 4, 2024
c87148e
Add contributos list to release 6.0
butlerpd Jul 5, 2024
c381db9
Merge branch 'release_6.0.0' into contributors_list_6.0.0
butlerpd Jul 5, 2024
891e2ef
reorder new pinned requirements and add comments.
butlerpd Jul 5, 2024
98a8577
Update contributors.tsv
butlerpd Jul 5, 2024
e8a959b
Merge pull request #2943 from SasView/contributors_list_6.0.0
butlerpd Jul 5, 2024
5bbe762
Use console in Windows executable (to hopefully fix iPython console i…
krzywon Jul 9, 2024
cdf4c40
Hide console window in windows executable
krzywon Jul 10, 2024
b472a52
Use proper hide_console syntax
krzywon Jul 10, 2024
9b2ee51
Use proper hide_console syntax
krzywon Jul 10, 2024
797bc2e
dash not underscore
krzywon Jul 10, 2024
4ffe142
Look for Mac docs in bundled app
krzywon Jul 10, 2024
534b347
Generate documentation folders if they do not exist when opening doc …
krzywon Jul 10, 2024
130f61f
Use more generic restart sequence to (hopefully) fix the issue with r…
krzywon Jul 11, 2024
40a3ad0
Merge pull request #2894 from SasView/2885-logos-do-not-appear-in-abo…
krzywon Jul 12, 2024
a412774
Merge pull request #2920 from SasView/release_6.0.0_splash_screen
krzywon Jul 12, 2024
69d23c2
Potential fix for slider error
lucas-wilkins Jul 12, 2024
1bd4e83
Merge branch 'release_6.0.0' into 2912-moving-sliders-in-corfunc-thro…
lucas-wilkins Jul 12, 2024
c1587d5
Assign ID to GSC generated data.
rozyczko Jul 13, 2024
89ab203
Try this
lucas-wilkins Jul 13, 2024
1f3be40
Merge branch '2912-moving-sliders-in-corfunc-throws-errors' of https:…
lucas-wilkins Jul 13, 2024
7928239
Merge branch 'release_6.0.0' into 2910-restart-issues
lucas-wilkins Jul 14, 2024
594a97c
Remove debugging pass statements
krzywon Jul 15, 2024
b4b047e
Ensure config is updated when files are loaded to ensure default file…
krzywon May 8, 2024
84f61a6
Remove file dialog options and use native file dialogs
krzywon May 8, 2024
572a36f
Set private default load location during data explorer init so the co…
krzywon May 9, 2024
2c06fd9
Only use the config value when setting/getting the default load locat…
krzywon May 9, 2024
eb8ac1e
Remove File Dialog options from tools
krzywon Jul 15, 2024
07e341f
Remove File Dialog options from data explorer
krzywon Jul 15, 2024
b11c787
Remove File Dialog options from fitting
krzywon Jul 15, 2024
c6aa24d
Remove File Dialog options from utilities
krzywon Jul 15, 2024
ca9f84e
Merge branch 'release_6.0.0' into sasdata-66-dQ-options
lucas-wilkins Jul 16, 2024
b21ac3c
Update css path
lucas-wilkins Jul 16, 2024
e679d3e
Merge branch 'release_6.0.0' into 2732-fill-in-whats-new-boxes-for-re…
lucas-wilkins Jul 16, 2024
d63f56e
Merge pull request #2925 from SasView/2909-gpu-options-help-button-th…
lucas-wilkins Jul 16, 2024
7a7d3ad
Merge pull request #2939 from SasView/2926-Fix-broken-tutorial-links-…
krzywon Jul 16, 2024
628d599
Merge pull request #2880 from SasView/2732-fill-in-whats-new-boxes-fo…
lucas-wilkins Jul 16, 2024
69d9864
Merge branch 'release_6.0.0' into 2898-version
lucas-wilkins Jul 16, 2024
d3171b6
Merge branch 'release_6.0.0' into sasdata-66-dQ-options
lucas-wilkins Jul 16, 2024
3e1840f
Merge branch 'release_6.0.0' into KeepRequirementsFileCatergories
lucas-wilkins Jul 16, 2024
91c3013
Merge branch 'release_6.0.0' into 2912-moving-sliders-in-corfunc-thro…
lucas-wilkins Jul 16, 2024
061bf84
Merge branch 'release_6.0.0' into 2903-ipython-console
butlerpd Jul 16, 2024
77f071f
Merge pull request #2948 from SasView/2903-ipython-console
butlerpd Jul 17, 2024
c31791b
added id's to other locally generated plots
rozyczko Jul 17, 2024
64802a5
Merge branch 'release_6.0.0' into 2912-moving-sliders-in-corfunc-thro…
lucas-wilkins Jul 17, 2024
c5e5b99
Merge branch 'release_6.0.0' into 2669-redo
lucas-wilkins Jul 17, 2024
0f61149
Merge branch 'release_6.0.0' into 2798-saving-project-with-the-genera…
lucas-wilkins Jul 17, 2024
66d5b3f
Merge pull request #2944 from SasView/KeepRequirementsFileCatergories
lucas-wilkins Jul 17, 2024
84aaf17
Merge branch 'release_6.0.0' into 2912-moving-sliders-in-corfunc-thro…
lucas-wilkins Jul 17, 2024
476150a
Merge pull request #2954 from SasView/2912-moving-sliders-in-corfunc-…
krzywon Jul 17, 2024
b7eb797
Merge branch 'release_6.0.0' into 2669-redo
lucas-wilkins Jul 17, 2024
ff18178
Set missing icons
lucas-wilkins Jul 17, 2024
63e392c
Merge branch 'release_6.0.0' into 2798-saving-project-with-the-genera…
lucas-wilkins Jul 17, 2024
385433f
Merge branch 'release_6.0.0' into sasdata-66-dQ-options
lucas-wilkins Jul 17, 2024
8d8a870
Merge pull request #2959 from SasView/2669-redo
lucas-wilkins Jul 17, 2024
139576a
Merge pull request #2899 from SasView/2898-version
krzywon Jul 17, 2024
de720c2
Merge branch 'release_6.0.0' into 2798-saving-project-with-the-genera…
butlerpd Jul 17, 2024
323980f
Merge pull request #2955 from SasView/2798-saving-project-with-the-ge…
butlerpd Jul 17, 2024
753c38a
Merge branch 'release_6.0.0' into 2947-check-all-windows-have-the-sas…
lucas-wilkins Jul 18, 2024
22aba85
More icons
lucas-wilkins Jul 18, 2024
fc3d580
Merge pull request #2950 from SasView/2910-restart-issues
krzywon Jul 18, 2024
ebe792f
Merge pull request #2839 from SasView/sasdata-66-dQ-options
krzywon Jul 18, 2024
c8d5dc5
Merge pull request #2964 from SasView/2947-check-all-windows-have-the…
krzywon Jul 18, 2024
c6fa1ba
3D Plot window takes focus
lucas-wilkins Jul 18, 2024
ef86da1
Focus to window, also icon
lucas-wilkins Jul 18, 2024
9ef0bc6
Default scaling derived from data, not axes
lucas-wilkins Jul 18, 2024
5ce1d42
indexing to enumeration
lucas-wilkins Jul 18, 2024
3636899
We can assume MPL > 3.3
lucas-wilkins Jul 18, 2024
e7b4437
Cleaned up code
lucas-wilkins Jul 18, 2024
aef538d
Note
lucas-wilkins Jul 18, 2024
41963c5
Fixes arrows
lucas-wilkins Jul 18, 2024
68ab590
Neaten arrow text
lucas-wilkins Jul 18, 2024
7196c3c
Clean up text in GSC
lucas-wilkins Jul 18, 2024
e4bb5fd
Clean up and hopefully fix PDB reader
lucas-wilkins Jul 18, 2024
77e27d2
Add HETATM parsing
lucas-wilkins Jul 18, 2024
be033b4
Fixed GSC crashing
lucas-wilkins Jul 18, 2024
eeeddb1
Disable HETATM
lucas-wilkins Jul 18, 2024
b9a3130
Help button
lucas-wilkins Jul 18, 2024
e0cbd32
Merge branch 'release_6.0.0' into 2916-gsc-plot-windows-can-open-hidden
lucas-wilkins Jul 18, 2024
5b27bbe
Merge pull request #2966 from SasView/2916-gsc-plot-windows-can-open-…
lucas-wilkins Jul 18, 2024
be3a0e6
Merge branch 'release_6.0.0' into 2905-orientation-viewer-tool-needs-…
lucas-wilkins Jul 19, 2024
1ffe82e
Merge pull request #2862 from SasView/pyinstaller-part-deux
krzywon Jul 19, 2024
d6799ba
Use beta2 instead of beta1
krzywon Jul 19, 2024
8550179
Merge pull request #2973 from SasView/release_6.0.0-beta2
lucas-wilkins Jul 19, 2024
bc9edd7
Merge branch 'release_6.0.0' into 2831-new-bugs-introduced-into-gsc-s…
lucas-wilkins Jul 21, 2024
480b95c
Set seed in test
lucas-wilkins Jul 21, 2024
23752d9
Generator
lucas-wilkins Jul 22, 2024
216d59f
Ensure the multiplicity row is set to a value that is not in the para…
krzywon Jul 22, 2024
7bf9b95
Merge pull request #2977 from SasView/2976-aptsas-has-nondeterminstic…
krzywon Jul 23, 2024
bd7436f
Change the deletion mechanism for P(r) to prevent parallelization tha…
krzywon Jul 23, 2024
4e68861
Remove unnecessary signals in density panel to prevent error when usi…
krzywon Jul 23, 2024
ad84f00
Merge pull request #2971 from SasView/2905-orientation-viewer-tool-ne…
krzywon Jul 24, 2024
aa5cd20
Check if the fit button should be enabled when sending data to a fit tab
krzywon Jul 24, 2024
942ac27
Merge pull request #2969 from SasView/2831-new-bugs-introduced-into-g…
krzywon Jul 24, 2024
0d24582
Assign npts and nsigmas to the appropriate poly_params instead of onl…
krzywon Jul 25, 2024
fe8be52
Remove print statements
krzywon Jul 25, 2024
d5895d6
Fix units in plots
lucas-wilkins Jul 26, 2024
aa35a14
Merge pull request #2987 from SasView/2981-density-tool-error
wpotrzebowski Jul 29, 2024
9d2dca2
Fix spurious unintentional changes
lucas-wilkins Jul 29, 2024
6d3437c
Merge branch 'release_6.0.0' into 2990-6.0.0-error-propagation-is-inc…
lucas-wilkins Jul 29, 2024
23fbedc
Merge pull request #2992 from SasView/2990-6.0.0-error-propagation-is…
lucas-wilkins Jul 29, 2024
1edbca0
Merge branch 'release_6.0.0' into 2904-graph-is-not-getting-the-corre…
lucas-wilkins Jul 29, 2024
d932894
Add dev menu
lucas-wilkins Jul 30, 2024
b1f0b0f
Make menu show when config setting made
lucas-wilkins Jul 30, 2024
0c561e7
Single control variable
lucas-wilkins Jul 30, 2024
8b557bc
delay import of GSC
rozyczko Jul 30, 2024
d4c2cc0
fixed lifetime
rozyczko Jul 30, 2024
4a0c651
overwrite GSC's closeEvent() to only hide the window, thus retaining the
rozyczko Jul 31, 2024
554666a
make sure the event itself is dealt with.
rozyczko Jul 31, 2024
6f824d2
Merge pull request #3000 from SasView/2999-startup-is-slooow-again
lucas-wilkins Jul 31, 2024
ce9a1fb
Fix default value for associations dict
krzywon Jul 31, 2024
72ad7bb
Merge pull request #2989 from SasView/release_6.0.0_enable_fit
krzywon Jul 31, 2024
55754d6
Move enable buttons call within if block to prevent duplicate code run
krzywon Jul 31, 2024
4c8d3e0
try setting the default values to -1
rozyczko Aug 1, 2024
3afe88b
correct the lambda expression for connect
rozyczko Aug 1, 2024
5a71495
Merge pull request #2991 from SasView/2741-pd-params
krzywon Aug 2, 2024
62bdff7
Merge pull request #2985 from SasView/release_6.0.0_remove_inversion_…
krzywon Aug 2, 2024
b1faffd
Merge pull request #2980 from SasView/2979-scale-param-load
krzywon Aug 2, 2024
eb7263a
Merge pull request #2967 from SasView/2904-graph-is-not-getting-the-c…
krzywon Aug 2, 2024
790d628
Merge pull request #3002 from SasView/2837-guimanangeraddplotitems
krzywon Aug 2, 2024
c45374c
merge main into release_6.0.0 and resolve conflicts
krzywon Aug 2, 2024
d483235
Merge pull request #3004 from SasView/release_6.0.0_merge_branch
lucas-wilkins Aug 5, 2024
fa64c94
Merge branch 'main' into 2996-developer-menu
lucas-wilkins Aug 5, 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
16 changes: 16 additions & 0 deletions src/sas/qtgui/MainWindow/GuiManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,11 @@ def addTriggers(self):
self._workspace.actionWelcomeWidget.triggered.connect(self.actionWelcome)
self._workspace.actionCheck_for_update.triggered.connect(self.actionCheck_for_update)
self._workspace.actionWhat_s_New.triggered.connect(self.actionWhatsNew)
# Dev
self._workspace.menuDev.menuAction().setVisible(config.DEV_MENU)
self._workspace.actionParticle_Editor.triggered.connect(self.particleEditor)
self._workspace.actionAscii_Loader.triggered.connect(self.asciiLoader)


self.communicate.sendDataToGridSignal.connect(self.showBatchOutput)
self.communicate.resultPlotUpdateSignal.connect(self.showFitResults)
Expand Down Expand Up @@ -1365,3 +1370,14 @@ def saveCustomConfig(self):
Save the config file based on current session values
"""
config.save()


# ============= DEV =================

def particleEditor(self):
from sas.qtgui.Perspectives.ParticleEditor.DesignWindow import show_particle_editor
show_particle_editor()


def asciiLoader(self):
pass
27 changes: 26 additions & 1 deletion src/sas/qtgui/MainWindow/UI/MainWindowUI.ui
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<x>0</x>
<y>0</y>
<width>915</width>
<height>26</height>
<height>20</height>
lucas-wilkins marked this conversation as resolved.
Show resolved Hide resolved
</rect>
</property>
<widget class="QMenu" name="menu_File">
Expand Down Expand Up @@ -160,6 +160,15 @@
<addaction name="actionCheck_for_update"/>
<addaction name="actionWhat_s_New"/>
</widget>
<widget class="QMenu" name="menuDev">
<property name="title">
<string>Dev</string>
</property>
<addaction name="actionAscii_Loader"/>
<addaction name="actionParticle_Editor"/>
<addaction name="separator"/>
<addaction name="actionDev_Tools"/>
</widget>
<addaction name="menu_File"/>
<addaction name="menuEdit"/>
<addaction name="menuView"/>
Expand All @@ -168,6 +177,7 @@
<addaction name="menuFitting"/>
<addaction name="menuWindow"/>
<addaction name="menuHelp"/>
<addaction name="menuDev"/>
</widget>
<widget class="QStatusBar" name="statusbar">
<property name="sizePolicy">
Expand Down Expand Up @@ -625,6 +635,21 @@
<string>What's New</string>
</property>
</action>
<action name="actionAscii_Loader">
<property name="text">
<string>Ascii Loader</string>
</property>
</action>
<action name="actionParticle_Editor">
<property name="text">
<string>Particle Editor</string>
</property>
</action>
<action name="actionDev_Tools">
<property name="text">
<string>Dev Tools</string>
</property>
</action>
</widget>
<resources/>
<connections/>
Expand Down
7 changes: 7 additions & 0 deletions src/sas/qtgui/Perspectives/ParticleEditor/DesignWindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,13 @@ def qSampling(self) -> QSample:

return QSample(min_q, max_q, n_samples, is_log)

particle_editor_window = None
def show_particle_editor():
global particle_editor_window

particle_editor_window = DesignWindow()
particle_editor_window.show()


def main():
""" Demo/testing window"""
Expand Down
5 changes: 3 additions & 2 deletions src/sas/system/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,6 @@ def __init__(self):

self.SHOW_WELCOME_PANEL = False



# OpenCL option - should be a string, either, "none", a number, or pair of form "A:B"
self.SAS_OPENCL = "none"

Expand Down Expand Up @@ -211,6 +209,9 @@ def __init__(self):
# What's New variables
self.LAST_WHATS_NEW_HIDDEN_VERSION = "5.0.0"

# Developer menu
self.DEV_MENU = False

#
# Lock the class down, this is necessary both for
# securing the class, and for setting up reading/writing files
Expand Down
Loading