From a2eea1489246d6457b6234c2d9731d9c3718cbfe Mon Sep 17 00:00:00 2001
From: Christoph Schmidt <christoph.,schmidt@tugraz.at>
Date: Thu, 23 Nov 2023 15:19:14 +0100
Subject: [PATCH] Updated import statements for module
---
examples/config.yaml | 2 +-
.../controller/AD2CaptDeviceController.py | 8 +++++---
.../controller/AD2CaptDeviceSimulator.py | 4 ++--
.../controller/BaseAD2CaptDevice.py | 8 ++++----
.../controller/mp_AD2Capture/AD2StateMPSetter.py | 2 +-
.../controller/mp_AD2Capture/MPDeviceControl.py | 6 +++---
src/CaptDeviceControl/model/AD2CaptDeviceModel.py | 4 ++--
.../model/AD2CaptDeviceProperties.py | 2 +-
src/CaptDeviceControl/view/AD2CaptDeviceView.py | 12 ++++++------
9 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/examples/config.yaml b/examples/config.yaml
index c2cf54e..c81521f 100644
--- a/examples/config.yaml
+++ b/examples/config.yaml
@@ -1,4 +1,4 @@
-# - Configuration file stored 2023-11-21 16:06:33.434192 -
+# - Configuration file stored 2023-11-22 12:48:19.708315 -
CaptDeviceConfig: #!!python/object:controller.CaptDeviceConfig
sample_rate: 50000 # Sample rate: Sample rate of the device
streaming_rate: 500 # Streaming rate: Streaming rate in Hz (should be below 1kHz)
diff --git a/src/CaptDeviceControl/controller/AD2CaptDeviceController.py b/src/CaptDeviceControl/controller/AD2CaptDeviceController.py
index 201bc06..ef7ed1a 100644
--- a/src/CaptDeviceControl/controller/AD2CaptDeviceController.py
+++ b/src/CaptDeviceControl/controller/AD2CaptDeviceController.py
@@ -2,10 +2,12 @@
from ctypes import c_int, byref, create_string_buffer, cdll, c_int32, c_uint, c_double
-from controller.BaseAD2CaptDevice import BaseAD2CaptDevice
-from model.AD2CaptDeviceModel import AD2CaptDeviceModel
+from CaptDeviceControl.controller.BaseAD2CaptDevice import BaseAD2CaptDevice
+from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceModel
+#from .controller.BaseAD2CaptDevice import BaseAD2CaptDevice
+#from .model.AD2CaptDeviceModel import AD2CaptDeviceModel
-from constants.dwfconstants import enumfilterUSB, enumfilterType, enumfilterDemo
+from CaptDeviceControl.constants.dwfconstants import enumfilterUSB, enumfilterType, enumfilterDemo
class AD2CaptDeviceController(BaseAD2CaptDevice):
diff --git a/src/CaptDeviceControl/controller/AD2CaptDeviceSimulator.py b/src/CaptDeviceControl/controller/AD2CaptDeviceSimulator.py
index 1edca5d..98bbd5f 100644
--- a/src/CaptDeviceControl/controller/AD2CaptDeviceSimulator.py
+++ b/src/CaptDeviceControl/controller/AD2CaptDeviceSimulator.py
@@ -4,8 +4,8 @@ from datetime import datetime
import scipy
from PySide6.QtCore import Slot
-from controller.BaseAD2CaptDevice import BaseAD2CaptDevice
-from model.AD2CaptDeviceModel import AD2CaptDeviceModel
+from CaptDeviceControl.controller.BaseAD2CaptDevice import BaseAD2CaptDevice
+from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceModel
class AD2CaptDeviceSimulator(BaseAD2CaptDevice):
diff --git a/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py b/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py
index 58a889e..2dce3bd 100644
--- a/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py
+++ b/src/CaptDeviceControl/controller/BaseAD2CaptDevice.py
@@ -5,10 +5,10 @@ from collections import deque
from PySide6.QtCore import QObject, QThreadPool
-from controller.mp_AD2Capture.AD2StateMPSetter import AD2State
-from controller.mp_AD2Capture.MPDeviceControl import mp_capture
-from model.AD2CaptDeviceModel import AD2CaptDeviceModel, AD2CaptDeviceSignals
-from model.AD2Constants import AD2Constants
+from CaptDeviceControl.controller.mp_AD2Capture.AD2StateMPSetter import AD2State
+from CaptDeviceControl.controller.mp_AD2Capture.MPDeviceControl import mp_capture
+from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceModel, AD2CaptDeviceSignals
+from CaptDeviceControl.model.AD2Constants import AD2Constants
from multiprocessing import Process, Queue, Value, Lock
diff --git a/src/CaptDeviceControl/controller/mp_AD2Capture/AD2StateMPSetter.py b/src/CaptDeviceControl/controller/mp_AD2Capture/AD2StateMPSetter.py
index f61286c..b92f8dd 100644
--- a/src/CaptDeviceControl/controller/mp_AD2Capture/AD2StateMPSetter.py
+++ b/src/CaptDeviceControl/controller/mp_AD2Capture/AD2StateMPSetter.py
@@ -1,6 +1,6 @@
from ctypes import c_int, c_byte
-from model.AD2Constants import AD2Constants
+from CaptDeviceControl.model.AD2Constants import AD2Constants
class AD2State:
def __init__(self):
diff --git a/src/CaptDeviceControl/controller/mp_AD2Capture/MPDeviceControl.py b/src/CaptDeviceControl/controller/mp_AD2Capture/MPDeviceControl.py
index cfa4139..05c9b16 100644
--- a/src/CaptDeviceControl/controller/mp_AD2Capture/MPDeviceControl.py
+++ b/src/CaptDeviceControl/controller/mp_AD2Capture/MPDeviceControl.py
@@ -11,9 +11,9 @@ import sys
import time
from ctypes import c_int, byref, c_double, cdll, create_string_buffer, c_int32
-from controller.mp_AD2Capture.AD2StateMPSetter import AD2StateMPSetter
-from model.AD2Constants import AD2Constants
-from constants.dwfconstants import acqmodeRecord, DwfStateConfig, DwfStatePrefill, DwfStateArmed, enumfilterType, \
+from CaptDeviceControl.controller.mp_AD2Capture.AD2StateMPSetter import AD2StateMPSetter
+from CaptDeviceControl.model.AD2Constants import AD2Constants
+from CaptDeviceControl.constants.dwfconstants import acqmodeRecord, DwfStateConfig, DwfStatePrefill, DwfStateArmed, enumfilterType, \
enumfilterUSB, enumfilterDemo
diff --git a/src/CaptDeviceControl/model/AD2CaptDeviceModel.py b/src/CaptDeviceControl/model/AD2CaptDeviceModel.py
index 4e11ae3..fdf7485 100644
--- a/src/CaptDeviceControl/model/AD2CaptDeviceModel.py
+++ b/src/CaptDeviceControl/model/AD2CaptDeviceModel.py
@@ -2,8 +2,8 @@ from ctypes import c_int, Array, c_byte
from PySide6.QtCore import QObject, Signal
-from model.AD2Constants import AD2Constants
-from CaptDeviceConfig import CaptDeviceConfig as Config
+from CaptDeviceControl.model.AD2Constants import AD2Constants
+from CaptDeviceControl.CaptDeviceConfig import CaptDeviceConfig as Config
#from MeasurementData.Properties.AD2CaptDeviceProperties import AD2CaptDeviceProperties
diff --git a/src/CaptDeviceControl/model/AD2CaptDeviceProperties.py b/src/CaptDeviceControl/model/AD2CaptDeviceProperties.py
index 689cb03..251327b 100644
--- a/src/CaptDeviceControl/model/AD2CaptDeviceProperties.py
+++ b/src/CaptDeviceControl/model/AD2CaptDeviceProperties.py
@@ -1,4 +1,4 @@
-from generics.GenericProperties import GenericProperties
+from CaptDeviceControl.generics.GenericProperties import GenericProperties
class AD2CaptDeviceProperties(GenericProperties):
diff --git a/src/CaptDeviceControl/view/AD2CaptDeviceView.py b/src/CaptDeviceControl/view/AD2CaptDeviceView.py
index c74ebb0..1e3974a 100644
--- a/src/CaptDeviceControl/view/AD2CaptDeviceView.py
+++ b/src/CaptDeviceControl/view/AD2CaptDeviceView.py
@@ -10,13 +10,13 @@ from pyqtgraph.dockarea import DockArea, Dock
import pyqtgraph as pg
-from controller.AD2CaptDeviceController import AD2CaptDeviceController
-from model.AD2CaptDeviceModel import AD2CaptDeviceModel
-from model.AD2Constants import AD2Constants
-from view.Ui_AD2ControlWindow import Ui_AD2ControlWindow
-from view.widget.WidgetCapturingInformation import WidgetCapturingInformation, WidgetDeviceInformation
+from CaptDeviceControl.controller.AD2CaptDeviceController import AD2CaptDeviceController
+from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceModel
+from CaptDeviceControl.model.AD2Constants import AD2Constants
+from CaptDeviceControl.view.Ui_AD2ControlWindow import Ui_AD2ControlWindow
+from CaptDeviceControl.view.widget.WidgetCapturingInformation import WidgetCapturingInformation, WidgetDeviceInformation
-from constants.dwfconstants import DwfStateReady, DwfStateConfig, DwfStatePrefill, DwfStateArmed, DwfStateWait, \
+from CaptDeviceControl.constants.dwfconstants import DwfStateReady, DwfStateConfig, DwfStatePrefill, DwfStateArmed, DwfStateWait, \
DwfStateTriggered, DwfStateRunning, DwfStateDone
from fswidgets import PlayPushButton
--
GitLab