Rearrange into modules

Author: sburris0

.gitignore

@@ -8,3 +8,6 @@ __pycache__/
 
 # Remove virtualenv directory
 venv/
+
+# Remove python packaging things
+*.egg-info

Pipfile

@@ -0,0 +1,14 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+
+[packages]
+pandas = "*"
+astropy = "*"
+twisted = "*"
+
+[requires]
+python_version = "3.8"

Pipfile.lock

@@ -0,0 +1 @@
+export PYTHONPATH=${PYTHONPATH}:${PWD}

doc/userGuidePics/blue_square.png renamed to docs/userGuidePics/blue_square.png

@@ -0,0 +1 @@
+# placeholder

doc/userGuidePics/evora_binning_ menu.png renamed to docs/userGuidePics/evora_binning_ menu.png

@@ -27,15 +27,14 @@
 from twisted.protocols.ftp import FTPClient
 
 # GUI element imports
-import acquisition_classes as ac
-import gui_elements as gui
+import evora.common.classes.acquisition as ac
+import evora.client.gui.gui_elements as gui
 import enhanced_status_bar
-import log_classes as lc
-import my_logger
-import scripting_classes as sc
-import fits_utils
-import log_utils
-import netconsts
+import evora.common.classes.logs as lc
+import evora.common.logging.my_logger as my_logger
+import evora.common.classes.scripting as sc
+import evora.common.utils.fits as fits_utils
+import evora.common.utils.logs as log_utils
 
 """
 # Comment on documentation:
@@ -202,7 +201,7 @@ def __init__(self):
         self.disableButtons("evora", True)
 
         # Add and set icon
-        ico = wx.Icon("img/evora_logo_circ.ico", wx.BITMAP_TYPE_ICO)
+        ico = wx.Icon("client/gui/img/evora_logo_circ.ico", wx.BITMAP_TYPE_ICO)
         self.SetIcon(ico)
 
         panel.SetSizer(sizer)
@@ -1311,7 +1310,7 @@ def clientConnectionFailed(self, transport, reason):
     # log.startLogging(sys.stdout)
     # sys.stdout = gui.Logger(sys.stdout)
     # sys.stderr = gui.Logger(sys.stderr)
-    ftpClientProc = subprocess.Popen("./transfer_images.py", shell=True, preexec_fn=os.setsid)
+    ftpClientProc = subprocess.Popen("./client/transfer_images.py", shell=True, preexec_fn=os.setsid)
     app = wx.App(False)
     app.frame1 = Evora()
     app.frame1.Show()

doc/userGuidePics/evora_camera_menu.png renamed to docs/userGuidePics/evora_camera_menu.png

@@ -7,7 +7,7 @@
 import time
 import shutil
 from io import BytesIO
-import my_logger
+import evora.common.logging.my_logger as my_logger
 
 # Third-party imports
 import wx

doc/userGuidePics/evora_connected.png renamed to docs/userGuidePics/evora_connected.png

@@ -10,10 +10,10 @@
 from Queue import Queue
 import threading
 import time
-import netconsts
+import evora.common.netconsts as netconsts
 
 # GUI element imports
-import gui_elements as gui
+import evora.client.gui.gui_elements as gui
 
 
 # Global variables

doc/userGuidePics/evora_filter_menu.png renamed to docs/userGuidePics/evora_filter_menu.png

@@ -11,9 +11,9 @@
 
 # allows widgets to be inserted into wxPython status bar probably won't work on wxPython 3.x
 import gui_elements as gui  # get useful methods
-import fits_utils
-import log_utils
-import my_logger
+import evora.common.utils.fits as fits_utils
+import evora.common.utils.logs as log_utils
+import evora.common.logging.my_logger as my_logger
 from Queue import Queue
 
 __author__ = "Tristan J. Hillis"
@@ -1180,7 +1180,7 @@ def __init__(self, parent):
         self.buttonSizer = wx.BoxSizer(wx.HORIZONTAL)
 
         # Variables
-        filters = pd.read_csv(".currentFilters.txt")
+        filters = pd.read_csv("client/currentFilters.txt")
         self.filterNum, self.filterName = filters['position'].values, filters['filter'].values.tolist()
         # self.filterName = self.filterName.tolist()
         # self.filterNum = self.filterNum.astype(int).tolist()

doc/userGuidePics/evora_filter_wheel_homing.png renamed to docs/userGuidePics/evora_filter_wheel_homing.png

@@ -11,7 +11,7 @@
 
 # Imports
 import wx
-import log_utils
+import evora.common.utils.logs as log_utils
 
 
 class logBox(wx.Panel):

doc/userGuidePics/evora_filter_wheel_rotate.png renamed to docs/userGuidePics/evora_filter_wheel_rotate.png

@@ -4,9 +4,9 @@
 
 import wx
 import thread
-import fits_utils
 import gui_elements as gui
-import log_utils
+import evora.common.utils.logs as log_utils
+import evora.common.utils.fits as fits_utils
 
 
 class ScriptStatus(wx.Panel):

doc/userGuidePics/evora_filter_wheel_type_menu.png renamed to docs/userGuidePics/evora_filter_wheel_type_menu.png

@@ -0,0 +1,30 @@
+
+[INFO/photoAcquisitionGUI.py:232] 2020-07-22 20:05:00 (MainProcess/MainThread)
+> Closing down Evora GUI
+
+[INFO/photoAcquisitionGUI.py:262] 2020-07-22 20:05:00 (MainProcess/MainThread)
+> reactor stopped, finished quitting
+
+[INFO/photoAcquisitionGUI.py:232] 2020-07-22 20:05:38 (MainProcess/MainThread)
+> Closing down Evora GUI
+
+[INFO/photoAcquisitionGUI.py:262] 2020-07-22 20:05:38 (MainProcess/MainThread)
+> reactor stopped, finished quitting
+
+[INFO/photoAcquisitionGUI.py:232] 2020-07-22 20:06:46 (MainProcess/MainThread)
+> Closing down Evora GUI
+
+[INFO/photoAcquisitionGUI.py:262] 2020-07-22 20:06:46 (MainProcess/MainThread)
+> reactor stopped, finished quitting
+
+[INFO/photoAcquisitionGUI.py:232] 2020-07-22 20:07:32 (MainProcess/MainThread)
+> Closing down Evora GUI
+
+[INFO/photoAcquisitionGUI.py:262] 2020-07-22 20:07:32 (MainProcess/MainThread)
+> reactor stopped, finished quitting
+
+[INFO/photoAcquisitionGUI.py:232] 2020-07-22 20:08:31 (MainProcess/MainThread)
+> Closing down Evora GUI
+
+[INFO/photoAcquisitionGUI.py:262] 2020-07-22 20:08:31 (MainProcess/MainThread)
+> reactor stopped, finished quitting