proper import from base pymodaq modules

Author: seb5g

src/pymodaq_plugins_thorlabs/daq_move_plugins/daq_move_BrushlessDCMotor.py

@@ -1,11 +1,11 @@
 from pymodaq.control_modules.move_utility_classes import (
     DAQ_Move_base, comon_parameters_fun, main, DataActuatorType, DataActuator)
-from pymodaq.utils.daq_utils import ThreadCommand
 
-from pymodaq.utils.parameter import Parameter
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_gui.parameter import Parameter
 
 from pymodaq_plugins_thorlabs.hardware.kinesis import BrushlessDCMotor, serialnumbers_brushless
-from pymodaq.utils.logger import set_logger, get_module_name
 
 logger = set_logger(get_module_name(__file__))
 

src/pymodaq_plugins_thorlabs/daq_move_plugins/daq_move_Elliptec.py

@@ -6,8 +6,9 @@
 """
 
 from pymodaq.control_modules.move_utility_classes import DAQ_Move_base, comon_parameters_fun, main  # common set of parameters for all actuators
-from pymodaq.utils.daq_utils import ThreadCommand # object used to send info back to the main thread
-from pymodaq.utils.parameter import Parameter
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_gui.parameter import Parameter
 
 from elliptec import Controller, Rotator
 from elliptec.scan import find_ports, scan_for_devices

src/pymodaq_plugins_thorlabs/daq_move_plugins/daq_move_KinesisFlipper.py

@@ -1,5 +1,7 @@
 from pymodaq.control_modules.move_utility_classes import DAQ_Move_base, main, comon_parameters_fun
-from pymodaq.utils.logger import set_logger, get_module_name
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_gui.parameter import Parameter
 
 from pymodaq_plugins_thorlabs.hardware.kinesis import serialnumbers_flipper, Flipper
 

src/pymodaq_plugins_thorlabs/daq_move_plugins/daq_move_MFF101_pylablib.py

@@ -1,6 +1,11 @@
 from pymodaq.control_modules.move_utility_classes import DAQ_Move_base
 from pymodaq.control_modules.move_utility_classes import comon_parameters
-from pymodaq.daq_utils.daq_utils import ThreadCommand, getLineInfo
+
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_gui.parameter import Parameter
+
+
 from easydict import EasyDict as edict
 
 import pylablib.devices.Thorlabs as Thorlabs
@@ -127,8 +132,8 @@ def ini_stage(self,controller=None):
             return self.status
         #This is in case something fails
         except Exception as e:
-            self.emit_status(ThreadCommand('Update_Status',[getLineInfo()+ str(e),'log']))
-            self.status.info=getLineInfo()+ str(e)
+            self.emit_status(ThreadCommand('Update_Status',[str(e),'log']))
+            self.status.info=str(e)
             self.status.initialized=False
             return self.status
 

src/pymodaq_plugins_thorlabs/daq_move_plugins/daq_move_PRM1Z8_pylablib.py

@@ -1,7 +1,9 @@
 from pymodaq.control_modules.move_utility_classes import DAQ_Move_base, main
 from pymodaq.control_modules.move_utility_classes import comon_parameters_fun
-from pymodaq.utils.daq_utils import ThreadCommand, getLineInfo
-from easydict import EasyDict as edict
+
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_gui.parameter import Parameter
 
 import pylablib.devices.Thorlabs as Thorlabs
 

src/pymodaq_plugins_thorlabs/daq_viewer_plugins/plugins_0D/daq_0Dviewer_TLPMPowermeter.py

@@ -17,7 +17,12 @@
 plugin using the Instrumental_lib package directly interfacing the C library with the nice Instrument wrapper
 """
 from easydict import EasyDict as edict
-from pymodaq.utils.daq_utils import ThreadCommand, getLineInfo
+from pymodaq.utils.daq_utils import getLineInfo
+
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_gui.parameter import Parameter
+
 from pymodaq.utils.data import DataFromPlugins
 from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_base, main
 

src/pymodaq_plugins_thorlabs/daq_viewer_plugins/plugins_1D/daq_1Dviewer_CCSXXX.py

@@ -1,8 +1,13 @@
 import numpy as np
-from pymodaq.utils.daq_utils import ThreadCommand
+
 from pymodaq.utils.data import DataFromPlugins, Axis, DataToExport
 from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_base, comon_parameters, main
-from pymodaq.utils.parameter import Parameter
+
+
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_gui.parameter import Parameter
+
 from pymodaq_plugins_thorlabs.hardware.ccsxxx import CCSXXX
 
 class DAQ_1DViewer_CCSXXX(DAQ_Viewer_base):

src/pymodaq_plugins_thorlabs/daq_viewer_plugins/plugins_2D/daq_2Dviewer_Thorlabs_DCx.py

@@ -1,5 +1,10 @@
 from easydict import EasyDict as edict
-from pymodaq.utils.daq_utils import ThreadCommand, getLineInfo
+from pymodaq.utils.daq_utils import getLineInfo
+
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_gui.parameter import Parameter
+
 from pymodaq.utils.data import DataFromPlugins, Axis
 from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_base, comon_parameters, main
 from instrumental import instrument, list_instruments, Q_

src/pymodaq_plugins_thorlabs/daq_viewer_plugins/plugins_2D/daq_2Dviewer_Thorlabs_TSI.py

@@ -1,8 +1,12 @@
 import cv2
-from pymodaq.utils.daq_utils import ThreadCommand
+
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_gui.parameter import Parameter
+
 from pymodaq.utils.data import DataFromPlugins, Axis
 from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_base, comon_parameters, main
-from pymodaq.utils.parameter import Parameter
+
 
 from pylablib.devices import Thorlabs
 from qtpy import QtWidgets, QtCore