Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ package-url = 'https://github.com/IumiShaping/pymodaq_plugins_optical_2D_shaping
name = "pymodaq_plugins_beam_shaping"
description = "PyMoDAQ's extension plugin to run optical shaping from various shapers (focusing on amplitude and phase shaping) and the image propagation"
dependencies = [
"pymodaq>=5.3.2",
"pymodaq_utils>=5.3.1",
"pymodaq_gui>=5.3.0",
"pymodaq_data>=5.3.0",
"pymodaq>5.2.8",
'pyfftw',
'scikit-image',
'opencv-python',
'pymodaq_gui>5.0.11',
'zernpy',
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,11 @@ def _quit_fun(self) -> bool:
QtWidgets.QApplication.processEvents() # allows the dashboard modules to close properly
return True

if not hasattr(CustomExt, '_quit_fun'): # pymodaq < 5.3 only calls quit_fun, pymodaq >= 5.3 calls _quit_fun
def quit_fun(self):
self._quit_fun()
super().quit_fun()


def main():
import sys
Expand Down
Loading