forked from Slicer/Slicer
-
Notifications
You must be signed in to change notification settings - Fork 1
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
[pull] master from Slicer:master #376
Open
pull
wants to merge
15
commits into
pieper:master
Choose a base branch
from
Slicer:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit updates Slicer.crt certificate bundle with [make-ca.sh][1] script using the content of [certdata][2] associated with mozilla/gecko-dev@549b3f9, It was auto-generated by the [update-slicer-certificate-bundle][3] GitHub action workflow. [1]: https://github.com/Slicer/Slicer/blob/0f29c7c9a73e844cb2b1c74fad9bde9321c43d07/Base/QTCore/Resources/Certs/make-ca.sh [2]: https://github.com/mozilla/gecko-dev/blob/549b3f9615dc6b2841a906af72d8f7e78e050034/security/nss/lib/ckfw/builtins/certdata.txt?raw=true [3]: https://github.com/Slicer/Slicer/blob/0f29c7c9a73e844cb2b1c74fad9bde9321c43d07/.github/workflows/update-slicer-certificate-bundle.yml
This commit is a follow up of 192af07 (DOC: Update build instructions to include CentOS 7). There were two lines having a similar meaning.
QSignalSpy is intended for testing, therefore use qRestAPI's synchronous query instead to get extensions metadata from the server. To simplify the implementation of synchronous query, extension metadata is now always downloaded using a single query (by specifying `limit=0` query parameter). see #6437 Co-authored-by: Jean-Christophe Fillion-Robin <[email protected]>
Basic extension metadata was passed to extension download task (instead of files metadata), which did not contain archivename.
"Batch processing" mode is activated automatically when a large (10+ children) branch visibility is changed. In batch mode, item visibility change requests were mistakenly ignored. fixes #6445
This fixes all remaining pycodestyle E2 whitespace error codes. Bulk of updates performed using autopep8 CLI with the following command: autopep8 --in-place --select E201,E202,E203,E211,E221,E222,E225,E226,E227,E228,E231,E241,E251,E261,E262,E265,E266,E271 $(git ls-files '*.py') See https://github.com/hhatto/autopep8#readme References: * Whitespace after '(' See https://www.flake8rules.com/rules/E201.html * Whitespace before ')' See https://www.flake8rules.com/rules/E202.html * Whitespace before ':' See https://www.flake8rules.com/rules/E203.html * Whitespace before '(' See https://www.flake8rules.com/rules/E211.html * Multiple spaces before operator See https://www.flake8rules.com/rules/E221.html * Multiple spaces after operator See https://www.flake8rules.com/rules/E222.html * Missing whitespace around operator See https://www.flake8rules.com/rules/E225.html * Missing whitespace around arithmetic operator See https://www.flake8rules.com/rules/E226.html * Missing whitespace around bitwise or shift operator See https://www.flake8rules.com/rules/E227.html * Missing whitespace around modulo operator See https://www.flake8rules.com/rules/E228.html * Missing whitespace after ',', ';', or ':' See https://www.flake8rules.com/rules/E231.html * Multiple spaces after ',' See https://www.flake8rules.com/rules/E241.html * Unexpected spaces around keyword / parameter equals See https://www.flake8rules.com/rules/E251.html * At least two spaces before inline comment See https://www.flake8rules.com/rules/E261.html * Inline comment should start with '# ' See https://www.flake8rules.com/rules/E262.html * Block comment should start with '# ' See https://www.flake8rules.com/rules/E265.html * Too many leading '#' for block comment See https://www.flake8rules.com/rules/E266.html * Multiple spaces after keyword See https://www.flake8rules.com/rules/E271.html
This fixes all remaining pycodestyle E1 indentation error codes. Bulk of updates performed using autopep8 CLI with the following command: autopep8 --in-place --select E111,E114,E115,E116,E117,E121,E122,E123,E124,E125,E126,E127,E128,E129,E131 $(git ls-files '*.py') See https://github.com/hhatto/autopep8#readme References: * Indentation is not a multiple of four See https://www.flake8rules.com/rules/E111.html * Indentation is not a multiple of four (comment) See https://www.flake8rules.com/rules/E114.html * Expected an indented block (comment) See https://www.flake8rules.com/rules/E115.html * Unexpected indentation (comment) See https://www.flake8rules.com/rules/E116.html * Over-indented See https://www.flake8rules.com/rules/E117.html * Continuation line under-indented for hanging indent See https://www.flake8rules.com/rules/E121.html * Continuation line missing indentation or outdented See https://www.flake8rules.com/rules/E122.html * Closing bracket does not match indentation of opening bracket's line See https://www.flake8rules.com/rules/E123.html * Closing bracket does not match visual indentation See https://www.flake8rules.com/rules/E124.html * Continuation line with same indent as next logical line See https://www.flake8rules.com/rules/E125.html * Continuation line over-indented for hanging indent See https://www.flake8rules.com/rules/E126.html * Continuation line over-indented for visual indent See https://www.flake8rules.com/rules/E127.html * Continuation line under-indented for visual indent See https://www.flake8rules.com/rules/E128.html * Visually indented line with same indent as next logical line See https://www.flake8rules.com/rules/E129.html * Continuation line unaligned for hanging indent See https://www.flake8rules.com/rules/E131.html
This fixes many of the pycodestyle E7 statement error codes. Bulk of updates performed using autopep8 CLI with the following command: autopep8 --in-place --select E701,E703,E712,E713,E714,E741 $(git ls-files '*.py') See https://github.com/hhatto/autopep8#readme References: * Multiple statements on one line (colon) See https://www.flake8rules.com/rules/E701.html * Statement ends with a semicolon See https://www.flake8rules.com/rules/E703.html * Comparison to true should be 'if cond is true:' or 'if cond:' See https://www.flake8rules.com/rules/E712.html * Test for membership should be 'not in' See https://www.flake8rules.com/rules/E713.html * Test for object identity should be 'is not' See https://www.flake8rules.com/rules/E714.html * Do not use variables named 'I', 'O', or 'l' See https://www.flake8rules.com/rules/E741.html
…utation itkDCMTKFileReader was added in 2012 but it seems that current itkDCMTKFileReader in ITK works just as well. The 2012 version has a bug (it should use (0x5200, 0x9230) instead of (0x5200, 0x9239) tag - see https://discourse.slicer.org/t/image-position-patient-attribute-0020-0032-in-dicom-file-not-handled/23950/3) therefore it makes sense to switch to the ITK implementation.
Example: >>> loadModel(r'c:\Users\andra\OneDrive\Projects\SlicerTesting2022\20220622-EmptyPolyData\slicer5-fail-T_Sup-O_right.vtp') Traceback (most recent call last): File "<console>", line 1, in <module> File "C:\D\S4D\Slicer-build\bin\Python\slicer\util.py", line 820, in loadModel return loadNodeFromFile(filename, 'ModelFile', {}, returnNode) File "C:\D\S4D\Slicer-build\bin\Python\slicer\util.py", line 685, in loadNodeFromFile raise RuntimeError(errorMessage) RuntimeError: Failed to load node from file: c:\Users\andra\OneDrive\Projects\SlicerTesting2022\20220622-EmptyPolyData\slicer5-fail-T_Sup-O_right.vtp - Error: Loading c:\Users\andra\OneDrive\Projects\SlicerTesting2022\20220622-EmptyPolyData\slicer5-fail-T_Sup-O_right.vtp - ERROR: In C:\D\S4D\VTK\IO\XML\vtkXMLUnstructuredDataReader.cxx, line 393 vtkXMLPolyDataReader (00000254994D0CC0): No Points element available in first piece found in file. Reading file may fail. - Error: Loading c:\Users\andra\OneDrive\Projects\SlicerTesting2022\20220622-EmptyPolyData\slicer5-fail-T_Sup-O_right.vtp - Failed to read node slicer5-fail-T_Sup-O_right (vtkMRMLModelNode4) from filename='c:\Users\andra\OneDrive\Projects\SlicerTesting2022\20220622-EmptyPolyData\slicer5-fail-T_Sup-O_right.vtp' see #6447
Detailed file IO error/warning messages were displayed to the user but not logged. Now the messages are also added to the application log. see #6447
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )