Fixed imports of StatusVar, Connector and ConfigOption to match the n…

…ew module paths.

core/manager.py

@@ -45,7 +45,8 @@
     from .remote import RemoteObjectManager
 except ImportError:
     RemoteObjectManager = None
-from .module import BaseMixin, Connector
+from .module import BaseMixin
+from .connector import Connector
 
 
 class Manager(QtCore.QObject):

gui/automation/automationgui.py

@@ -21,7 +21,7 @@
 
 import os
 
-from core.module import Connector
+from core.connector import Connector
 from gui.guibase import GUIBase
 from qtpy import QtCore
 from qtpy import QtWidgets

gui/camera/cameragui.py

@@ -22,7 +22,7 @@
 import os
 import pyqtgraph as pg
 
-from core.module import Connector
+from core.connector import Connector
 from gui.colordefs import QudiPalettePale as Palette
 from gui.guibase import GUIBase
 from gui.colordefs import ColorScaleInferno

gui/confocal/confocalgui.py

@@ -25,7 +25,9 @@
 import pyqtgraph as pg
 import time
 
-from core.module import Connector, ConfigOption, StatusVar
+from core.connector import Connector
+from core.configoption import ConfigOption
+from core.statusvariable import StatusVar
 from qtwidgets.scan_plotwidget import ScanImageItem
 from gui.guibase import GUIBase
 from gui.guiutils import ColorBar

gui/counter/countergui.py

@@ -24,7 +24,7 @@
 import os
 import pyqtgraph as pg
 
-from core.module import Connector
+from core.connector import Connector
 from gui.colordefs import QudiPalettePale as palette
 from gui.guibase import GUIBase
 from qtpy import QtCore

gui/gated_counter/gated_counter_gui.py

@@ -24,7 +24,7 @@
 import os
 import pyqtgraph as pg
 
-from core.module import Connector
+from core.connector import Connector
 from core.util import units
 from gui.guibase import GUIBase
 from gui.colordefs import QudiPalettePale as palette

gui/laser/laser.py

@@ -25,7 +25,7 @@
 import pyqtgraph as pg
 import time
 
-from core.module import Connector
+from core.connector import Connector
 from gui.colordefs import QudiPalettePale as palette
 from gui.guibase import GUIBase
 from interface.simple_laser_interface import ControlMode, ShutterState, LaserState

gui/laserscanner/laserscannergui.py

@@ -24,7 +24,7 @@
 import pyqtgraph as pg
 
 from collections import OrderedDict
-from core.module import Connector
+from core.connector import Connector
 from gui.colordefs import ColorScaleInferno
 from gui.guibase import GUIBase
 from gui.guiutils import ColorBar

gui/magnet/magnet_gui.py

@@ -27,7 +27,8 @@
 import pyqtgraph.exporters
 from qtpy import uic
 
-from core.module import Connector, StatusVar
+from core.connector import Connector
+from core.statusvariable import StatusVar
 from gui.colordefs import ColorScaleInferno
 from gui.guibase import GUIBase
 from gui.guiutils import ColorBar

gui/nuclear_operations/nuclear_operations.py

@@ -24,7 +24,7 @@
 import pyqtgraph as pg
 import pyqtgraph.exporters
 
-from core.module import Connector
+from core.connector import Connector
 from gui.guibase import GUIBase
 from qtpy import QtGui, QtWidgets, QtCore, uic
 

gui/odmr/odmrgui.py

@@ -24,7 +24,7 @@
 import os
 import pyqtgraph as pg
 
-from core.module import Connector
+from core.connector import Connector
 from core.util import units
 from gui.guibase import GUIBase
 from gui.guiutils import ColorBar

gui/pidgui/pidgui.py

@@ -24,7 +24,7 @@
 import os
 import pyqtgraph as pg
 
-from core.module import Connector
+from core.connector import Connector
 from gui.colordefs import QudiPalettePale as palette
 from gui.guibase import GUIBase
 from qtpy import QtCore

gui/poimanager/poimangui.py

@@ -25,7 +25,7 @@
 import pyqtgraph as pg
 import re
 
-from core.module import Connector
+from core.connector import Connector
 from core.util.units import ScaledFloat
 from core.util.helpers import natural_sort
 from gui.guibase import GUIBase

gui/pulsed/pulsed_maingui.py

@@ -25,7 +25,8 @@
 import pyqtgraph as pg
 import datetime
 
-from core.module import Connector, StatusVar
+from core.connector import Connector
+from core.statusvariable import StatusVar
 from core.util import units
 from core.util.helpers import natural_sort
 from gui.colordefs import QudiPalettePale as palette

gui/qdplotter/qdplottergui.py

@@ -27,7 +27,7 @@
 from qtpy import QtCore
 from qtpy import uic
 
-from core.module import Connector
+from core.connector import Connector
 from gui.guibase import GUIBase
 
 

gui/simpledatagui/simpledatagui.py

@@ -23,7 +23,7 @@
 import numpy as np
 import os
 
-from core.module import Connector
+from core.connector import Connector
 from gui.guibase import GUIBase
 from gui.colordefs import QudiPalettePale as palette
 from qtpy import QtWidgets

gui/spectrometer/spectrometergui.py

@@ -23,7 +23,7 @@
 import pyqtgraph as pg
 import numpy as np
 
-from core.module import Connector
+from core.connector import Connector
 from core.util import units
 from gui.colordefs import QudiPalettePale as palette
 from gui.guibase import GUIBase

gui/switcher/switchgui.py

@@ -21,7 +21,7 @@
 
 import os
 
-from core.module import Connector
+from core.connector import Connector
 from gui.guibase import GUIBase
 from qtpy import QtWidgets
 from qtpy import QtCore

gui/taskrunner/taskgui.py

@@ -21,7 +21,7 @@
 
 import os
 
-from core.module import Connector
+from core.connector import Connector
 from gui.guibase import GUIBase
 from qtpy import QtWidgets
 from qtpy import QtCore

gui/wavemeterlogger/wavemeterloggui.py

@@ -27,7 +27,7 @@
 import pyqtgraph as pg
 import pyqtgraph.exporters
 
-from core.module import Connector
+from core.connector import Connector
 from core.util import units
 from gui.guibase import GUIBase
 from gui.colordefs import QudiPalettePale as palette

hardware/CTC100_temperature.py

@@ -20,7 +20,8 @@
 top-level directory of this distribution and at <https://github.com/Ulm-IQO/qudi/>
 """
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 import visa
 
 

hardware/awg/keysight_M3202A.py

@@ -40,7 +40,8 @@
 
 import keysightSD1 as ksd1
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from interface.pulser_interface import PulserInterface, PulserConstraints
 
 

hardware/awg/tektronix_awg5002c.py

@@ -29,7 +29,8 @@
 from fnmatch import fnmatch
 import re
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from interface.pulser_interface import PulserInterface, PulserConstraints
 
 

hardware/awg/tektronix_awg70k.py

@@ -30,7 +30,8 @@
 from ftplib import FTP
 from lxml import etree as ET
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from core.util.modules import get_home_dir
 from core.util.helpers import natural_sort
 from interface.pulser_interface import PulserInterface, PulserConstraints

hardware/awg/tektronix_awg7k.py

@@ -30,7 +30,8 @@
 
 from core.util.modules import get_home_dir
 from core.util.helpers import natural_sort
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from interface.pulser_interface import PulserInterface, PulserConstraints
 
 

hardware/camera/andor/iXon897_ultra.py

@@ -28,7 +28,8 @@
 from ctypes import *
 import numpy as np
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 
 from interface.camera_interface import CameraInterface
 

hardware/camera/camera_dummy.py

@@ -22,7 +22,8 @@
 
 import numpy as np
 import time
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from interface.camera_interface import CameraInterface
 
 

hardware/camera/thorlabs/thorlabs_DCx.py

@@ -30,7 +30,8 @@
 
 import numpy as np
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from interface.camera_interface import CameraInterface
 from .uc480_h import *
 

hardware/confocal_scanner_dummy.py

@@ -22,7 +22,9 @@
 import numpy as np
 import time
 
-from core.module import Base, Connector, ConfigOption
+from core.module import Base
+from core.connector import Connector
+from core.configoption import ConfigOption
 from interface.confocal_scanner_interface import ConfocalScannerInterface
 
 

hardware/dtg/dtg5334.py

@@ -29,7 +29,8 @@
 from core.util.helpers import natural_sort
 
 from interface.pulser_interface import PulserInterface, PulserConstraints
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 
 
 class DTG5334(Base, PulserInterface):

hardware/edwards_vacuum_controller.py

@@ -21,7 +21,8 @@
 top-level directory of this distribution and at <https://github.com/Ulm-IQO/qudi/>
 """
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 import visa
 
 class EdwardsVacuumController(Base):

hardware/fast_counter_dummy.py

@@ -24,7 +24,8 @@
 import os
 import numpy as np
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from core.util.modules import get_main_dir
 from interface.fast_counter_interface import FastCounterInterface
 

hardware/fastcomtec/fastcomtecmcs6.py

@@ -25,7 +25,8 @@
 
 
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from core.util.modules import get_main_dir
 from interface.fast_counter_interface import FastCounterInterface
 import time

hardware/fastcomtec/fastcomtecp7887.py

@@ -24,7 +24,8 @@
 #TODO: What does get status do or need as return?
 #TODO: Check if there are more modules which are missing, and more settings for FastComtec which need to be put, should we include voltage threshold?
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from core.util.modules import get_main_dir
 from interface.fast_counter_interface import FastCounterInterface
 import time

hardware/fpga_fastcounter/fast_counter_fpga_pi3.py

@@ -23,7 +23,8 @@
 import os
 import thirdparty.stuttgart_counter.TimeTagger as tt
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from core.util.modules import get_main_dir
 from interface.fast_counter_interface import FastCounterInterface
 

hardware/fpga_fastcounter/fast_counter_fpga_qo.py

@@ -26,7 +26,8 @@
 import time
 
 from interface.fast_counter_interface import FastCounterInterface
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from core.util.modules import get_main_dir
 import okfrontpanel as ok
 from core.util.mutex import Mutex

hardware/fpga_pulser/ok_fpga_pulser.py

@@ -19,7 +19,9 @@
 top-level directory of this distribution and at <https://github.com/Ulm-IQO/qudi/>
 """
 
-from core.module import Base, ConfigOption, StatusVar
+from core.module import Base
+from core.configoption import ConfigOption
+from core.statusvariable import StatusVar
 from core.util.modules import get_main_dir
 from interface.pulser_interface import PulserInterface, PulserConstraints
 import okfrontpanel as ok

hardware/high_finesse_wavemeter.py

@@ -29,7 +29,8 @@
                 # in pure Python.
 
 from interface.wavemeter_interface import WavemeterInterface
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from core.util.mutex import Mutex
 
 

hardware/influx_data_client.py

@@ -21,7 +21,8 @@
 
 from influxdb import InfluxDBClient
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from interface.process_interface import ProcessInterface
 
 

hardware/influx_data_logger.py

@@ -19,7 +19,8 @@
 top-level directory of this distribution and at <https://github.com/Ulm-IQO/qudi/>
 """
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from interface.data_logger_interface import DataLoggerInterface
 
 from influxdb import InfluxDBClient

hardware/laser/coherent_obis_laser.py

@@ -19,7 +19,8 @@
 top-level directory of this distribution and at <https://github.com/Ulm-IQO/qudi/>
 """
 
-from core.module import Base, ConfigOption
+from core.module import Base
+from core.configoption import ConfigOption
 from interface.simple_laser_interface import SimpleLaserInterface
 from interface.simple_laser_interface import LaserState
 from interface.simple_laser_interface import ShutterState