From 5cc44b0373c61c24fc93fda8b5f589d211d30cba Mon Sep 17 00:00:00 2001
From: Christoph Schmidt <christoph.,schmidt@tugraz.at>
Date: Wed, 3 Jan 2024 19:55:11 +0100
Subject: [PATCH] Fixed import statements
---
src/CaptDeviceControl/controller/BaseAD2CaptDevice.py | 4 ++--
src/CaptDeviceControl/model/AD2CaptDeviceModel.py | 6 +++---
src/CaptDeviceControl/model/AD2CaptDeviceSignals.py | 4 +---
.../model/submodels/AD2CaptDeviceCapturingModel.py | 2 +-
.../model/submodels/AD2CaptDeviceInformationModel.py | 2 +-
src/CaptDeviceControl/view/AD2CaptDeviceView.py | 2 +-
6 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py b/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py
index 068904d..6b90a89 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 860f8b9..29fda1f 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 fad77f2..bcc5e8f 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 a5fb835..8e48974 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 c407fd3..0ba7c3f 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 f096209..669e5e4 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):
--
GitLab