[5.6] Fix scripted loadable module importing wrapped classes #7464
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
…nction This is a follow-up to f8fc53b (BUG: Ensure scripted module can depend on wrapped C++ classes from other modules). It eliminates duplicated code by re-using qSlicerScriptedUtils::importModulePythonExtensions in the loadable module factory. Additionally, unrelated cleanup is implemented by removing the use of Q_ASSERT in the modulePaths() function. (cherry picked from commit c23ab06)
This commit reuses the functionality introduced in 2ca77a8 (ENH: Support scripted module associated only with loadable logics) by extending it to the scripted loadable module factory (in additional of the loadable module factory). Now, Python-wrapped C++ classes implemented by loadable modules (Logic, MRML, MRMLDisplayableManager, VTKWidgets, PythonQt) can be imported in scripted modules, even when the loading of loadable modules is disabled. The commit addresses test failures related to the unavailability of the `slicer.vtkMRMLMarkupsCurveNode` type annotation during module discovery in tests such as: * py_nowarning_mainwindow_noloadableTest * py_nowarning_mainwindow_nocli_noloadableTest * py_nowarning_nomainwindow_noloadableTest * py_nowarning_nomainwindow_nocli_noloadableTest Additionally, unrelated cleanup is implemented by removing the use of Q_ASSERT in the modulePaths() function. (cherry picked from commit 389cd99)
(cherry picked from commit d9bf69c)
jcfr
deleted the
5.6-backport/fix-scripted-loadable-module-importing-wrapped-classes
branch
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.
Backports changes originally contributed to
mainthrough the following pull requests: