modified files to work with the new file structure

MCDAQcontrolsignals.py

@@ -3,7 +3,7 @@
 Here the class of control signals are created. There are two types: analog and digital.
 """
 import numpy as np
-from ADoutputs import daq_AO, daq_DO
+from drivers.ADoutputs import daq_AO, daq_DO
 from PyQt5 import QtCore
 from subclasses.controllayouts import LaserControlLayout
 from subclasses.controllayouts import LaserScanLayout

cameraGui.py

@@ -12,12 +12,12 @@ from pyqtgraph.Qt import QtGui, QtCore
 from pyqtgraph import dockarea
 import pyqtgraph as pg
 from pyqtgraph import console
-from pyqtgraph_subclasses import CustomRectangularROI
+from subclasses.pyqtgraph_subclasses import CustomRectangularROI
 from zylaCameraWorker import CameraWorker
-from cameraParameterTree import CameraParameterTree
+from subclasses.cameraParameterTree import CameraParameterTree
 
 #from drivers.andorzyla import AndorZyla
-from dummyAndor import AndorZyla
+from drivers.dummyAndor import AndorZyla
 
 import sys
 import numpy as np

myGUI.py

@@ -10,14 +10,14 @@ import sys
 
 from pyqtgraph.Qt import QtGui
 
-from myWidgets import anal_control_signal, digital_control_signal, activation_button, burleighWM, coherentWM, kick_ions_hard, kick_ions_soft
+from resources.myWidgets import anal_control_signal, digital_control_signal, activation_button, burleighWM, coherentWM, kick_ions_hard, kick_ions_soft
 from PyQt5.QtWidgets import QMainWindow, QPushButton
 from PyQt5.QtCore import QTimer
 from pyqtgraph import dockarea
 import pyqtgraph as pg
 
 
-from myToolbar import myToolbarMenu
+from resources.myToolbar import myToolbarMenu
 
 import qdarkstyle
 import os

resources/myWidgets.py

@@ -6,16 +6,16 @@ This is a temporary script file.
 """
 
 import pyqtgraph as pg
-from ADoutputs import daq_AO, daq_DO
+from drivers.ADoutputs import daq_AO, daq_DO
 from pyqtgraph.Qt import QtGui, QtCore
 from PyQt5.QtCore import QTimer
 from PyQt5.QtWidgets import (QPushButton, QWidget, QVBoxLayout, QLCDNumber, QProgressBar, QLabel, QCheckBox, QComboBox)
 import telnetlib
 import os, serial, time
-from messages import show_warning
+from resources.messages import show_warning
 
-import scanFunctions 
-import wav_coherent
+import resources.scanFunctions 
+import resources.wav_coherent
 
 
 

subclasses/controllayouts.py

@@ -3,8 +3,8 @@ from pyqtgraph.Qt import QtGui, QtCore
 from PyQt5.QtWidgets import QPushButton, QProgressBar, QLabel
 import pyqtgraph as pg
 import numpy as np
-import scanFunctions 
-from messages import show_warning
+import resources.scanFunctions 
+from resources.messages import show_warning
 
 
 

zylaCameraWorker.py

@@ -11,7 +11,7 @@ Created on Thu Apr  4 11:10:20 2019
 import numpy as np
 from PyQt5 import QtCore
 # from drivers.andorzyla import AndorZyla
-from dummyAndor import AndorZyla
+from drivers.dummyAndor import AndorZyla
 import threading