Optimized imports. Updated to Version 1.0.0

pyproject.toml

 [project]
 name = "captdevicecontrol"
-version = "0.2.3"
+version = "1.0.0"
 authors = [
   { name="Christoph Schmidt", email="cschmidt.fs@gmail.com" },
 ]

src/CaptDeviceControl/__init__.py

@@ -4,8 +4,3 @@ Author(s): Christoph Schmidt <christoph.schmidt@tugraz.at>
 Created: 2023-10-19 12:35
 Package Version: 
 """
-import sys
-from .CaptDeviceConfig import CaptDeviceConfig as Config
-from .controller.BaseAD2CaptDevice import BaseAD2CaptDevice as Controller
-from .model.AD2CaptDeviceModel import AD2CaptDeviceModel as Model
-from .view.AD2CaptDeviceView import ControlWindow as View
\ No newline at end of file

src/CaptDeviceControl/controller/BaseAD2CaptDevice.py

 import logging
-import os
-import sys
 import time
 from abc import abstractmethod
 from collections import deque
+from multiprocessing import Queue, Value, Lock
 
 import cmp
-from PySide6.QtCore import QObject, QThreadPool, Signal
-from multiprocessing import Process, Queue, Value, Lock
+from PySide6.QtCore import QThreadPool, Signal
 from numpy import ndarray
-from rich.logging import RichHandler
 
-from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceModel, AD2CaptDeviceSignals
-from CaptDeviceControl.model.AD2Constants import AD2Constants
-
-from CaptDeviceControl.controller.mp_AD2Capture.MPCaptDeviceControl import MPCaptDeviceControl
 from CaptDeviceControl.controller.mp_AD2Capture.MPCaptDevice import MPCaptDevice
+from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceModel
+from CaptDeviceControl.model.AD2Constants import AD2Constants
 
 
 class BaseAD2CaptDevice(cmp.CProcessControl):

src/CaptDeviceControl/controller/DeviceInformation/HWConnectedDeviceInformation.py

@@ -6,8 +6,8 @@ Package Version:
 """
 from ctypes import CDLL
 
-from controller.DeviceInformation.dataclasses.AnalogInChannelInfo import AnalogInChannels
 from controller.DeviceInformation.AnalogOutChannel import AnalogOutChannels
+from controller.DeviceInformation.dataclasses.AnalogInChannelInfo import AnalogInChannels
 
 
 class HWConnectedDeviceInformation:

src/CaptDeviceControl/controller/DeviceInformation/HWDeviceBase.py

@@ -4,9 +4,7 @@ Author(s): Christoph Schmidt <christoph.schmidt@tugraz.at>
 Created: 2023-10-19 12:35
 Package Version: 
 """
-from ctypes import CDLL, c_int, create_string_buffer, c_int32, byref
-
-from constants.dwfconstants import enumfilterType, enumfilterUSB, enumfilterDemo
+from ctypes import CDLL, c_int, create_string_buffer
 
 
 class HWDeviceBase:

src/CaptDeviceControl/controller/DeviceInformation/HWDeviceInformation.py

@@ -4,7 +4,7 @@ Author(s): Christoph Schmidt <christoph.schmidt@tugraz.at>
 Created: 2023-10-19 12:35
 Package Version: 
 """
-from ctypes import c_int, create_string_buffer, CDLL, byref
+from ctypes import CDLL
 
 from controller.DeviceInformation.WaveFormsAPI import WFAPIDeviceEnumeration, WFAPIDeviceControl, WFAPIChannels
 from controller.DeviceInformation.dataclasses.AnalogInChannelInfo import AnalogInChannelInfo, AnalogInChannelRetriever

src/CaptDeviceControl/controller/DeviceInformation/WaveFormsAPI.py

@@ -6,7 +6,6 @@ Package Version:
 """
 import logging
 import sys
-from abc import abstractmethod
 from ctypes import c_int, byref, c_double, CDLL, create_string_buffer, cdll, c_int32
 
 from constants.dwfconstants import enumfilterType, enumfilterDemo, enumfilterUSB

src/CaptDeviceControl/controller/DeviceInformation/dataclasses/AnalogInChannelInfo.py

@@ -4,10 +4,9 @@ Author(s): Christoph Schmidt <christoph.schmidt@tugraz.at>
 Created: 2023-10-19 12:35
 Package Version: 
 """
-from ctypes import CDLL, c_int, byref, c_double
+from ctypes import CDLL, c_int
 from dataclasses import dataclass
 
-from controller.DeviceInformation.HWDeviceBase import HWDeviceBase
 from controller.DeviceInformation.WaveFormsAPI import WFAPIChannels
 
 

src/CaptDeviceControl/controller/mp_AD2Capture/MPCaptDevice.py

-import ctypes
-import os
+import sys
 import sys
 import time
-from ctypes import c_int, c_int32, byref, create_string_buffer, cdll, c_double, c_byte, CDLL
+from ctypes import c_int, c_int32, byref, create_string_buffer, cdll, c_double, c_byte
 from multiprocessing import Queue, Value
 
 import cmp
 import numpy as np
 from cmp.CProperty import CProperty
 
+from CaptDeviceControl.model.AD2Constants import AD2Constants
 from constants.dwfconstants import enumfilterType, enumfilterDemo, enumfilterUSB, acqmodeRecord, DwfStateConfig, \
     DwfStatePrefill, DwfStateArmed
-from CaptDeviceControl.model.AD2Constants import AD2Constants
 
 
 class MPCaptDevice(cmp.CProcess, ):

src/CaptDeviceControl/controller/mp_AD2Capture/MPCaptDeviceControl.py

-import logging
 import os
 
 import cmp
 from PySide6.QtCore import Signal
 
-
-from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceSignals, AD2CaptDeviceModel
-from CaptDeviceControl.model.AD2Constants import AD2Constants
 from CaptDeviceControl.controller.mp_AD2Capture.MPCaptDevice import MPCaptDevice
+from CaptDeviceControl.model.AD2CaptDeviceModel import AD2CaptDeviceModel
+from CaptDeviceControl.model.AD2Constants import AD2Constants
 
 
 class MPCaptDeviceControl(cmp.CProcessControl):

src/CaptDeviceControl/model/AD2CaptDeviceModel.py

-from ctypes import c_int, Array
+from ctypes import Array
 
 from PySide6.QtCore import QObject, Signal
 
-from CaptDeviceControl.model.AD2Constants import AD2Constants
 from CaptDeviceControl.CaptDeviceConfig import CaptDeviceConfig as Config
+from CaptDeviceControl.model.AD2Constants import AD2Constants
 from CaptDeviceControl.model.submodels.AD2CaptDeviceAnalogInModel import AD2CaptDeviceAnalogInModel
 from CaptDeviceControl.model.submodels.AD2CaptDeviceCapturingModel import AD2CaptDeviceCapturingModel
 from CaptDeviceControl.model.submodels.AD2CaptDeviceInformationModel import AD2CaptDeviceInformationModel

src/CaptDeviceControl/model/AD2CaptDeviceSignals.py

@@ -9,6 +9,7 @@ from PySide6.QtCore import QObject, Signal
 from CaptDeviceConfig import CaptDeviceConfig as Config
 from CaptDeviceControl.controller.DeviceInformation.HWDeviceInformation import HWDeviceInformation
 
+
 class AD2CaptDeviceSignals(QObject):
     def __init__(self, parent=None):
         super().__init__(parent)

src/CaptDeviceControl/model/submodels/AD2CaptDeviceAnalogInModel.py

 from ctypes import c_int, c_byte
 
 from PySide6.QtCore import QObject, Signal
+
 from CaptDeviceControl.CaptDeviceConfig import CaptDeviceConfig
+
+
 class AD2CaptDeviceAnalogInSignals(QObject):
     def __init__(self, parent=None):
         super().__init__(parent)

src/CaptDeviceControl/model/submodels/AD2CaptDeviceCapturingModel.py

-from ctypes import c_int, Array
-
 from PySide6.QtCore import QObject, Signal
 
 from CaptDeviceConfig import CaptDeviceConfig

src/CaptDeviceControl/resources/icons-svg/cil-media-play.svg

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
      viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:none;stroke:#24D115;stroke-width:1.9944;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}

src/CaptDeviceControl/resources/icons-svg/single_color/cil-media-play.svg

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
      viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#FFFFFF;stroke:#E6E6E6;stroke-width:0.875;stroke-miterlimit:10;}

src/CaptDeviceControl/resources/icons/icon_adc.svg

@@ -15,7 +15,7 @@
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
         xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
+><defs
    id="defs268" /><sodipodi:namedview
    id="namedview266"
    pagecolor="#ffffff"

src/CaptDeviceControl/view/AD2CaptDeviceView.py

 import logging
 import os
-from collections import deque
 
 import numpy as np
-
+import pyqtgraph as pg
 from PySide6.QtCore import QTimer
-from PySide6.QtGui import QStandardItemModel, QStandardItem
 from PySide6.QtWidgets import QMainWindow, QStatusBar
 from pyqtgraph.dockarea import DockArea, Dock
-
-import pyqtgraph as pg
 from rich.logging import RichHandler
 
 from CaptDeviceControl.controller.BaseAD2CaptDevice import BaseAD2CaptDevice
@@ -17,7 +13,6 @@ 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 CaptDeviceControl.model.submodels.AD2CaptDeviceAnalogInModel import AD2CaptDeviceAnalogInModel
 
 
 class ControlWindow(QMainWindow):

src/CaptDeviceControl/view/Ui_AD2ControlWindow.py

@@ -8,20 +8,15 @@
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
 
-from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
-    QMetaObject, QObject, QPoint, QRect,
-    QSize, QTime, QUrl, Qt)
-from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
-    QFont, QFontDatabase, QGradient, QIcon,
-    QImage, QKeySequence, QLinearGradient, QPainter,
-    QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QComboBox, QFrame, QGridLayout,
+from PySide6.QtCore import (QCoreApplication, QMetaObject, QRect,
+                            QSize)
+from PySide6.QtWidgets import (QComboBox, QFrame, QGridLayout,
                                QGroupBox, QLCDNumber, QLabel, QLayout,
-    QMainWindow, QMenuBar, QPushButton, QSizePolicy,
+                               QMenuBar, QPushButton, QSizePolicy,
                                QSpinBox, QStatusBar, QVBoxLayout, QWidget)
 
 from fswidgets import PlayPushButton
-import resources_rc
+
 
 class Ui_AD2ControlWindow(object):
     def setupUi(self, AD2ControlWindow):

src/CaptDeviceControl/view/Ui_AD2ControlWindowNew.py

@@ -8,18 +8,14 @@
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
 
-from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
-    QMetaObject, QObject, QPoint, QRect,
-    QSize, QTime, QUrl, Qt)
-from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
-    QFont, QFontDatabase, QGradient, QIcon,
-    QImage, QKeySequence, QLinearGradient, QPainter,
-    QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QComboBox, QFormLayout, QFrame,
+from PySide6.QtCore import (QCoreApplication, QMetaObject, QRect,
+                            QSize, Qt)
+from PySide6.QtGui import (QFont, QIcon)
+from PySide6.QtWidgets import (QComboBox, QFormLayout, QFrame,
                                QGridLayout, QHBoxLayout, QLabel, QLayout,
-    QMainWindow, QMenuBar, QPushButton, QSizePolicy,
+                               QMenuBar, QPushButton, QSizePolicy,
                                QSpinBox, QToolButton, QWidget)
-import resources_rc
+
 
 class Ui_AD2ControlWindowNew(object):
     def setupUi(self, AD2ControlWindowNew):