forked from awendt/pyrelacs
adding threading to fix segementation fault
This commit is contained in:
parent
25cd1c0585
commit
e19c147059
@ -1,8 +1,9 @@
|
|||||||
from PyQt6.QtGui import QAction
|
from PyQt6.QtGui import QAction
|
||||||
import sys
|
import sys
|
||||||
import pathlib
|
import pathlib
|
||||||
|
import ctypes
|
||||||
|
|
||||||
from PyQt6.QtCore import QSize, Qt
|
from PyQt6.QtCore import QSize, QThreadPool, Qt
|
||||||
from PyQt6.QtWidgets import (
|
from PyQt6.QtWidgets import (
|
||||||
QApplication,
|
QApplication,
|
||||||
QGridLayout,
|
QGridLayout,
|
||||||
@ -17,6 +18,7 @@ from IPython import embed
|
|||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
||||||
from pyrelacs.util.logging import config_logging
|
from pyrelacs.util.logging import config_logging
|
||||||
|
from pyrelacs.daq_thread import Worker
|
||||||
|
|
||||||
log = config_logging()
|
log = config_logging()
|
||||||
|
|
||||||
@ -25,6 +27,7 @@ class PyRelacs(QMainWindow):
|
|||||||
def __init__(self):
|
def __init__(self):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.setWindowTitle("PyRelacs")
|
self.setWindowTitle("PyRelacs")
|
||||||
|
self.threadpool = QThreadPool()
|
||||||
|
|
||||||
self.daq_connect_button = QPushButton("Connect Daq")
|
self.daq_connect_button = QPushButton("Connect Daq")
|
||||||
self.daq_connect_button.setCheckable(True)
|
self.daq_connect_button.setCheckable(True)
|
||||||
@ -92,22 +95,53 @@ class PyRelacs(QMainWindow):
|
|||||||
self.toolbar.addAction(individual_repro_button)
|
self.toolbar.addAction(individual_repro_button)
|
||||||
|
|
||||||
def run_repro(self):
|
def run_repro(self):
|
||||||
|
daq_thread = Worker(self.read_daq)
|
||||||
|
self.threadpool.start(daq_thread)
|
||||||
|
|
||||||
|
def on_scan_finished(self):
|
||||||
|
log.debug("Scan finished")
|
||||||
|
|
||||||
|
def read_daq(self, progress_callback):
|
||||||
log.debug("running repro")
|
log.debug("running repro")
|
||||||
time = np.arange(
|
time = np.arange(0, 10, 1 / 30_000.0)
|
||||||
0, self.config["Sinus"]["duration"], 1 / self.config["Sinus"]["fs"]
|
data = 2 * np.sin(2 * np.pi * 10 * time)
|
||||||
)
|
|
||||||
data = self.config["Sinus"]["amplitude"] * np.sin(
|
buffer = ctypes.c_double * len(time)
|
||||||
2 * np.pi * self.config["Sinus"]["freq"] * time
|
buffer_ai = uldaq.create_float_buffer(1, len(time))
|
||||||
)
|
data_c = buffer(*data)
|
||||||
|
log.debug(f"Created C_double data {data_c}")
|
||||||
|
|
||||||
ao_device = self.daq_device.get_ao_device()
|
ao_device = self.daq_device.get_ao_device()
|
||||||
ao_info = ao_device.get_info()
|
ai_device = self.daq_device.get_ai_device()
|
||||||
try:
|
|
||||||
err = ao_device.a_out_list(
|
er = ai_device.a_in_scan(
|
||||||
0, 0, [uldaq.Range.BIP2VOLTS], uldaq.AOutListFlag.DEFAULT, data
|
1,
|
||||||
)
|
1,
|
||||||
except uldaq.ULException as e:
|
uldaq.AiInputMode.SINGLE_ENDED,
|
||||||
print(e)
|
uldaq.Range.BIP10VOLTS,
|
||||||
|
int(len(data)),
|
||||||
|
30_000.0,
|
||||||
|
uldaq.ScanOption.EXTTRIGGER,
|
||||||
|
uldaq.AInScanFlag.DEFAULT,
|
||||||
|
data=buffer_ai,
|
||||||
|
)
|
||||||
|
# ai_device.scan_wait(uldaq.WaitType.WAIT_UNTIL_DONE, timeout=-1)
|
||||||
|
|
||||||
|
err = ao_device.a_out_scan(
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
uldaq.Range.BIP10VOLTS,
|
||||||
|
int(len(data)),
|
||||||
|
30_000.0,
|
||||||
|
uldaq.ScanOption.DEFAULTIO,
|
||||||
|
uldaq.AOutScanFlag.DEFAULT,
|
||||||
|
data_c,
|
||||||
|
)
|
||||||
|
# INFO: Need to wait for the acquistion
|
||||||
|
self.daq_disconnect_button.setDisabled(True)
|
||||||
|
self.daq_connect_button.setEnabled(True)
|
||||||
|
embed()
|
||||||
|
exit()
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
84
pyrelacs/daq_thread.py
Normal file
84
pyrelacs/daq_thread.py
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
import pathlib
|
||||||
|
|
||||||
|
import tomli
|
||||||
|
from PyQt6.QtCore import QRunnable, QThread, pyqtSignal, pyqtSlot, QObject
|
||||||
|
import ctypes
|
||||||
|
import uldaq
|
||||||
|
import numpy as np
|
||||||
|
from IPython import embed
|
||||||
|
import traceback, sys
|
||||||
|
|
||||||
|
from pyrelacs.util.logging import config_logging
|
||||||
|
|
||||||
|
log = config_logging()
|
||||||
|
|
||||||
|
|
||||||
|
class WorkerSignals(QObject):
|
||||||
|
"""
|
||||||
|
Defines the signals available from a running worker thread.
|
||||||
|
|
||||||
|
Supported signals are:
|
||||||
|
|
||||||
|
finished
|
||||||
|
No data
|
||||||
|
|
||||||
|
error
|
||||||
|
tuple (exctype, value, traceback.format_exc() )
|
||||||
|
|
||||||
|
result
|
||||||
|
object data returned from processing, anything
|
||||||
|
|
||||||
|
progress
|
||||||
|
int indicating % progress
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
finished = pyqtSignal()
|
||||||
|
error = pyqtSignal(tuple)
|
||||||
|
result = pyqtSignal(object)
|
||||||
|
progress = pyqtSignal(int)
|
||||||
|
|
||||||
|
|
||||||
|
class Worker(QRunnable):
|
||||||
|
"""
|
||||||
|
Worker thread
|
||||||
|
|
||||||
|
Inherits from QRunnable to handler worker thread setup, signals and wrap-up.
|
||||||
|
|
||||||
|
:param callback: The function callback to run on this worker thread. Supplied args and
|
||||||
|
kwargs will be passed through to the runner.
|
||||||
|
:type callback: function
|
||||||
|
:param args: Arguments to pass to the callback function
|
||||||
|
:param kwargs: Keywords to pass to the callback function
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, fn, *args, **kwargs):
|
||||||
|
super(Worker, self).__init__()
|
||||||
|
|
||||||
|
# Store constructor arguments (re-used for processing)
|
||||||
|
self.fn = fn
|
||||||
|
self.args = args
|
||||||
|
self.kwargs = kwargs
|
||||||
|
self.signals = WorkerSignals()
|
||||||
|
|
||||||
|
# Add the callback to our kwargs
|
||||||
|
self.kwargs["progress_callback"] = self.signals.progress
|
||||||
|
|
||||||
|
@pyqtSlot()
|
||||||
|
def run(self):
|
||||||
|
"""
|
||||||
|
Initialise the runner function with passed args, kwargs.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Retrieve args/kwargs here; and fire processing using them
|
||||||
|
try:
|
||||||
|
result = self.fn(*self.args, **self.kwargs)
|
||||||
|
except:
|
||||||
|
traceback.print_exc()
|
||||||
|
exctype, value = sys.exc_info()[:2]
|
||||||
|
self.signals.error.emit((exctype, value, traceback.format_exc()))
|
||||||
|
else:
|
||||||
|
self.signals.result.emit(result) # Return the result of the processing
|
||||||
|
finally:
|
||||||
|
self.signals.finished.emit() # Done
|
Loading…
Reference in New Issue
Block a user