Updated import statements for module

examples/config.yaml

-# - 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)

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):

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):

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
 
 

src/CaptDeviceControl/controller/mp_AD2Capture/AD2StateMPSetter.py

 from ctypes import c_int, c_byte
 
-from model.AD2Constants import AD2Constants
+from CaptDeviceControl.model.AD2Constants import AD2Constants
 
 class AD2State:
     def __init__(self):

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
 
 

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
 
 

src/CaptDeviceControl/model/AD2CaptDeviceProperties.py

-from generics.GenericProperties import GenericProperties
+from CaptDeviceControl.generics.GenericProperties import GenericProperties
 
 
 class AD2CaptDeviceProperties(GenericProperties):

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