diff --git a/src/pymodaq_plugins_daqmx/daq_move_plugins/daq_move_DAQmx.py b/src/pymodaq_plugins_daqmx/daq_move_plugins/daq_move_DAQmx.py index 9e21954..0fb267d 100644 --- a/src/pymodaq_plugins_daqmx/daq_move_plugins/daq_move_DAQmx.py +++ b/src/pymodaq_plugins_daqmx/daq_move_plugins/daq_move_DAQmx.py @@ -5,7 +5,7 @@ class DAQ_Move_DAQmx(DAQ_NIDAQmx_Actuator): """ ==================== ======================== **Attributes** **Type** - *data_grabed_signal* instance of pyqtSignal + *data_grabed_signal* instance of Signal *params* dictionnary list *task* ==================== ======================== diff --git a/src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_0D/daq_0Dviewer_DAQmx.py b/src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_0D/daq_0Dviewer_DAQmx.py index 3f8d3f1..1d8dea6 100644 --- a/src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_0D/daq_0Dviewer_DAQmx.py +++ b/src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_0D/daq_0Dviewer_DAQmx.py @@ -5,7 +5,7 @@ class DAQ_0DViewer_DAQmx(DAQ_NIDAQmx_Viewer): """ ==================== ======================== **Attributes** **Type** - *data_grabed_signal* instance of pyqtSignal + *data_grabed_signal* instance of Signal *params* dictionnary list *task* ==================== ======================== diff --git a/src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_1D/daq_1Dviewer_DAQmx.py b/src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_1D/daq_1Dviewer_DAQmx.py index 1cb6760..a8dc81d 100644 --- a/src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_1D/daq_1Dviewer_DAQmx.py +++ b/src/pymodaq_plugins_daqmx/daq_viewer_plugins/plugins_1D/daq_1Dviewer_DAQmx.py @@ -6,7 +6,7 @@ class DAQ_1DViewer_DAQmx(DAQ_NIDAQmx_Viewer): """ ==================== ======================== **Attributes** **Type** - *data_grabed_signal* instance of pyqtSignal + *data_grabed_signal* instance of Signal *params* dictionnary list *task* ==================== ======================== diff --git a/src/pymodaq_plugins_daqmx/hardware/national_instruments/daq_NIDAQmx.py b/src/pymodaq_plugins_daqmx/hardware/national_instruments/daq_NIDAQmx.py index 626cd36..04f7075 100644 --- a/src/pymodaq_plugins_daqmx/hardware/national_instruments/daq_NIDAQmx.py +++ b/src/pymodaq_plugins_daqmx/hardware/national_instruments/daq_NIDAQmx.py @@ -1,5 +1,5 @@ -from PyQt5 import QtWidgets, QtCore -from PyQt5.QtCore import pyqtSignal, QThread +from qtpy import QtWidgets, QtCore +from qtpy.QtCore import Signal, QThread from pymodaq.daq_utils.daq_utils import ThreadCommand, DataFromPlugins, Axis, getLineInfo import numpy as np from pymodaq.daq_viewer.utility_classes import DAQ_Viewer_base @@ -241,7 +241,7 @@ def addNew(self, typ): class DAQ_NIDAQmx_base(DAQmx): - data_grabed_signal = pyqtSignal(list) + data_grabed_signal = Signal(list) params =[{'title': 'Refresh hardware:', 'name': 'refresh_hardware', 'type': 'bool', 'value': False}, {'title': 'Signal type:', 'name': 'NIDAQ_type', 'type': 'list', 'values': DAQ_NIDAQ_source.names()}, @@ -461,7 +461,7 @@ class DAQ_NIDAQmx_Viewer(DAQ_Viewer_base, DAQ_NIDAQmx_base): """ ==================== ======================== **Attributes** **Type** - *data_grabed_signal* instance of pyqtSignal + *data_grabed_signal* instance of Signal *params* dictionnary list *task* ==================== ======================== @@ -471,7 +471,7 @@ class DAQ_NIDAQmx_Viewer(DAQ_Viewer_base, DAQ_NIDAQmx_base): refresh_hardware """ - data_grabed_signal = pyqtSignal(list) + data_grabed_signal = Signal(list) live_mode_available = True params = viewer_params + DAQ_NIDAQmx_base.params