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

[5.6] Fix scripted loadable module importing wrapped classes #7464

Merged
merged 3 commits into from
Dec 11, 2023
Merged

[5.6] Fix scripted loadable module importing wrapped classes #7464

merged 3 commits into from
Dec 11, 2023

Commits on Dec 11, 2023

  1. ENH: Simplify loadable module factory reusing qSlicerScriptedUtils fu… 

    …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)
    @jcfr
    jcfr committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    5eb376b View commit details
    Browse the repository at this point in the history

  2. BUG: Ensure scripted modules can always import wrapped C++ classes 

    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)
    @jcfr
    jcfr committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    bff5130 View commit details
    Browse the repository at this point in the history

  3. BUG: Fix Endoscopy module dependency adding "Markups" 

    (cherry picked from commit d9bf69c)
    @jcfr
    jcfr committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    d61e237 View commit details
    Browse the repository at this point in the history