diff --git a/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py b/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py index 068904dd473a49b553c28e3f1054d5a459ceedee..6b90a89f73f8bc1f153dd5fedac124c1a06a5ea9 100644 --- a/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py +++ b/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py @@ -7,13 +7,13 @@ from collections import deque import cmp from PySide6.QtCore import QObject, QThreadPool, Signal - +from multiprocessing import Process, Queue, Value, Lock from numpy import ndarray from rich.logging import RichHandler from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceModel, AD2CaptDeviceSignals from CaptDeviceControl.model.AD2Constants import AD2Constants -from multiprocessing import Process, Queue, Value, Lock + from CaptDeviceControl.controller.mp_AD2Capture.MPCaptDeviceControl import MPCaptDeviceControl from CaptDeviceControl.controller.mp_AD2Capture.MPCaptDevice import MPCaptDevice diff --git a/src/CaptDeviceControl/model/AD2CaptDeviceModel.py b/src/CaptDeviceControl/model/AD2CaptDeviceModel.py index 860f8b917fdbc95cb95b2d510000deb544720eaa..29fda1f0fe034c0dd8718a773d962e7b317dd27a 100644 --- a/src/CaptDeviceControl/model/AD2CaptDeviceModel.py +++ b/src/CaptDeviceControl/model/AD2CaptDeviceModel.py @@ -4,9 +4,9 @@ from PySide6.QtCore import QObject, Signal from CaptDeviceControl.model.AD2Constants import AD2Constants from CaptDeviceControl.CaptDeviceConfig import CaptDeviceConfig as Config -from model.submodels.AD2CaptDeviceAnalogInModel import AD2CaptDeviceAnalogInModel -from model.submodels.AD2CaptDeviceCapturingModel import AD2CaptDeviceCapturingModel -from model.submodels.AD2CaptDeviceInformationModel import AD2CaptDeviceInformationModel +from CaptDeviceControl.model.submodels.AD2CaptDeviceAnalogInModel import AD2CaptDeviceAnalogInModel +from CaptDeviceControl.model.submodels.AD2CaptDeviceCapturingModel import AD2CaptDeviceCapturingModel +from CaptDeviceControl.model.submodels.AD2CaptDeviceInformationModel import AD2CaptDeviceInformationModel # from MeasurementData.Properties.AD2CaptDeviceProperties import AD2CaptDeviceProperties diff --git a/src/CaptDeviceControl/model/AD2CaptDeviceSignals.py b/src/CaptDeviceControl/model/AD2CaptDeviceSignals.py index fad77f2290b7065d725d6d2ac800d7ae396a0a0a..bcc5e8fb7078345d529a6b05885aa4691465ac3a 100644 --- a/src/CaptDeviceControl/model/AD2CaptDeviceSignals.py +++ b/src/CaptDeviceControl/model/AD2CaptDeviceSignals.py @@ -7,9 +7,7 @@ Package Version: from PySide6.QtCore import QObject, Signal from CaptDeviceConfig import CaptDeviceConfig as Config -from controller.DeviceInformation.HWDeviceInformation import HWDeviceInformation -from model.AD2Constants import AD2Constants - +from CaptDeviceControl.controller.DeviceInformation.HWDeviceInformation import HWDeviceInformation class AD2CaptDeviceSignals(QObject): def __init__(self, parent=None): diff --git a/src/CaptDeviceControl/model/submodels/AD2CaptDeviceCapturingModel.py b/src/CaptDeviceControl/model/submodels/AD2CaptDeviceCapturingModel.py index a5fb8350e6bb1284b488560665a83a7c2221a78a..8e48974d633b38b4d299a356807f5e0fc56548a8 100644 --- a/src/CaptDeviceControl/model/submodels/AD2CaptDeviceCapturingModel.py +++ b/src/CaptDeviceControl/model/submodels/AD2CaptDeviceCapturingModel.py @@ -3,7 +3,7 @@ from ctypes import c_int, Array from PySide6.QtCore import QObject, Signal from CaptDeviceConfig import CaptDeviceConfig -from model.AD2Constants import AD2Constants +from CaptDeviceControl.model.AD2Constants import AD2Constants class AD2CaptDeviceCapturingSignals(QObject): diff --git a/src/CaptDeviceControl/model/submodels/AD2CaptDeviceInformationModel.py b/src/CaptDeviceControl/model/submodels/AD2CaptDeviceInformationModel.py index c407fd3d9b2c73c852eb2f198fa452588b063e32..0ba7c3ffe44597537a2b59890c3a711fae766338 100644 --- a/src/CaptDeviceControl/model/submodels/AD2CaptDeviceInformationModel.py +++ b/src/CaptDeviceControl/model/submodels/AD2CaptDeviceInformationModel.py @@ -3,7 +3,7 @@ from ctypes import c_int, Array from PySide6.QtCore import QObject, Signal from CaptDeviceConfig import CaptDeviceConfig -from model.AD2Constants import AD2Constants +from CaptDeviceControl.model.AD2Constants import AD2Constants class AD2CaptDeviceInformationSignals(QObject): diff --git a/src/CaptDeviceControl/view/AD2CaptDeviceView.py b/src/CaptDeviceControl/view/AD2CaptDeviceView.py index f096209787ac820ecd93158957d5acf6b058f672..669e5e41b96af6a328451d149f20f2655eb76314 100644 --- a/src/CaptDeviceControl/view/AD2CaptDeviceView.py +++ b/src/CaptDeviceControl/view/AD2CaptDeviceView.py @@ -17,7 +17,7 @@ from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceModel from CaptDeviceControl.model.AD2Constants import AD2Constants from CaptDeviceControl.view.Ui_AD2ControlWindowNew import Ui_AD2ControlWindowNew from CaptDeviceControl.view.widget.WidgetCapturingInformation import WidgetCapturingInformation, WidgetDeviceInformation -from model.submodels.AD2CaptDeviceAnalogInModel import AD2CaptDeviceAnalogInModel +from CaptDeviceControl.model.submodels.AD2CaptDeviceAnalogInModel import AD2CaptDeviceAnalogInModel class ControlWindow(QMainWindow):