Skip to content

D
distributed oscilloscope
Commit d1f5837a authored by Milosz Malczak's avatar Milosz Malczak
Browse files
Options

Updated a structure, started packaging

parent 70802805
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 68 deletions
setup.py 0 → 100644
View file @ d1f5837a
from setuptools import setup, find_packages
setup(
name="DistributedOscilloscope",
version="1.0.0",
packages=['DistributedOscilloscope.server',
'DistributedOscilloscope.utilities',
'DistributedOscilloscope.applications.pyqt_app',
'DistributedOscilloscope.applications.tests',
'DistributedOscilloscope.nodes.adc_lib_node',
],
package_dir={'':'software'},
entry_points={
'console_scripts':[
'dist_osc_server = DistributedOscilloscope.server.main_server:main',
'dist_osc_adc_node = DistributedOscilloscope.nodes.adc_lib_node.main:main',
'dist_osc_gui= DistributedOscilloscope.applications.pyqt_app.main:main'
]
},
)
software/DistributedOscilloscope/__init__.py 0 → 100644
View file @ d1f5837a
__name__ = 'DistributedOscilloscope'
__version__ = '1.0.0'
software/applications/pyqt_app/GUI.py → software/DistributedOscilloscope/applications/pyqt_app/GUI.py
View file @ d1f5837a
from plot import *
from channels import ChannelClosure
from triggers import *
from horizontal_settings import *
from run_control import *
from .plot import *
from .channels import ChannelClosure
from .triggers import *
from .horizontal_settings import *
from .run_control import *
import numpy as np
from PyQt5.QtCore import pyqtSlot
import pickle
import logging
logger = logging.getLogger(__name__)
from DistScopeUtilities import serialization
import DistributedOscilloscope.utilities.serialization as serialization
from timeit import default_timer as timer
SAMP_FREQ = 1e8
......
software/applications/pyqt_app/channels.py → software/DistributedOscilloscope/applications/pyqt_app/channels.py
View file @ d1f5837a
......@@ -4,11 +4,11 @@ from PyQt5.QtWidgets import QLabel
from PyQt5.QtGui import QFrame
from PyQt5.QtCore import Qt
from PyQt5.QtCore import QRect
from colors import Colors
from parent_classes import Button
from parent_classes import Menu
from parent_classes import Box
from parent_classes import Dial_Box
from .colors import Colors
from .parent_classes import Button
from .parent_classes import Menu
from .parent_classes import Box
from .parent_classes import Dial_Box
DBG = False
......
software/applications/pyqt_app/horizontal_settings.py → software/DistributedOscilloscope/applications/pyqt_app/horizontal_settings.py
View file @ d1f5837a
from parent_classes import Slider_Box
from parent_classes import Box
from .parent_classes import Slider_Box
from .parent_classes import Box
import sys
sys.path.append('../')
from PyQt5.QtWidgets import QVBoxLayout
......
software/applications/pyqt_app/main.py → software/DistributedOscilloscope/applications/pyqt_app/main.py
View file @ d1f5837a
from PyQt5.QtWidgets import QApplication
from PyQt5.QtWidgets import QMainWindow
from mainwindow import Ui_MainWindow
from .mainwindow import Ui_MainWindow
import argparse
from PyQt5 import QtGui
from server_expose import *
from GUI import *
from DistScopeUtilities.zmq_rpc import ZMQ_RPC
from DistScopeUtilities.addresses import server_expose_to_user_port
from DistScopeUtilities.ipaddr import get_ip
from .server_expose import *
from .GUI import *
from DistributedOscilloscope.utilities.zmq_rpc import ZMQ_RPC
from DistributedOscilloscope.utilities.addresses import server_expose_to_user_port
from DistributedOscilloscope.utilities.ipaddr import get_ip
"""TODO number of ADCs different from data dimension occuring when I
switch off ADC"""
......@@ -29,7 +29,7 @@ class MainWindow(QMainWindow):
def main():
import logging.config
from logging_conf import DEFAULT_CONFIG
from .logging_conf import DEFAULT_CONFIG
logging.config.dictConfig(DEFAULT_CONFIG)
pg.setConfigOption('background', 'k')
......
software/applications/pyqt_app/parent_classes.py → software/DistributedOscilloscope/applications/pyqt_app/parent_classes.py
View file @ d1f5837a
......@@ -4,7 +4,7 @@ from PyQt5.QtWidgets import QSpinBox
from PyQt5.QtWidgets import QLabel
from PyQt5.QtWidgets import QSlider
from PyQt5.QtWidgets import QDial
from colors import Colors
from .colors import Colors
from PyQt5.QtCore import Qt
from PyQt5.QtGui import QFrame
......
software/applications/pyqt_app/plot.py → software/DistributedOscilloscope/applications/pyqt_app/plot.py
View file @ d1f5837a
import pyqtgraph as pg
from colors import Colors
from .colors import Colors
from PyQt5 import QtCore
......
software/applications/pyqt_app/server_expose.py → software/DistributedOscilloscope/applications/pyqt_app/server_expose.py
View file @ d1f5837a
from PyQt5 import QtCore
from PyQt5 import QtGui
import zmq
from DistScopeUtilities.ipaddr import get_ip
from DistributedOscilloscope.utilities.ipaddr import get_ip
class ServerExposeZMQ(QtCore.QObject):
......
software/applications/pyqt_app/triggers.py → software/DistributedOscilloscope/applications/pyqt_app/triggers.py
View file @ d1f5837a
......@@ -2,10 +2,10 @@ from PyQt5.QtWidgets import QMenuBar
from PyQt5.QtWidgets import QVBoxLayout
from PyQt5.QtWidgets import QLabel
from PyQt5.QtCore import Qt
from parent_classes import Box
from parent_classes import Dial_Box
from parent_classes import Button
from parent_classes import Menu
from .parent_classes import Box
from .parent_classes import Dial_Box
from .parent_classes import Button
from .parent_classes import Menu
from PyQt5.QtWidgets import QHBoxLayout
......
software/applications/tests/server_expose_test.py → software/DistributedOscilloscope/applications/tests/server_expose_test.py
View file @ d1f5837a
......@@ -3,10 +3,10 @@ from xmlrpc.server import SimpleXMLRPCServer
from timeit import default_timer as timer
import matplotlib.pyplot as plt
from test_conf import update_data_type
from DistScopeUtilities.ipaddr import get_ip
from DistributedOscilloscope.utilities.ipaddr import get_ip
import zmq
import pickle
from DistScopeUtilities import serialization
from DistributedOscilloscope.utilities import serialization
class ServerExposeTest():
......
software/applications/tests/test_all.py → software/DistributedOscilloscope/applications/tests/test_all.py
View file @ d1f5837a
......@@ -9,9 +9,9 @@ from multiprocessing import Queue
from timeit import default_timer as timer
from test_conf import server_addr
from test_conf import update_data_type
from DistScopeUtilities.zmq_rpc import ZMQ_RPC
from DistScopeUtilities.zmq_rpc import RPC_Error
from DistScopeUtilities.addresses import server_expose_to_user_port
from DistributedOscilloscope.utilities.zmq_rpc import ZMQ_RPC
from DistributedOscilloscope.utilities.zmq_rpc import RPC_Error
from DistributedOscilloscope.utilities.addresses import server_expose_to_user_port
import timeout_decorator
import numpy as np
import matplotlib.pyplot as plt
......
software/DistributedOscilloscope/nodes/__init__.py 0 → 100644
View file @ d1f5837a
__name__ = 'nodes'
__version__ = '1.0.0'
software/DistributedOscilloscope/nodes/adc_lib_node/__init__.py 0 → 100644
View file @ d1f5837a
__name__ = 'adc_lib_node'
__version__ = '1.0.0'
software/nodes/adc_lib_node/main.py → software/DistributedOscilloscope/nodes/adc_lib_node/main.py
View file @ d1f5837a
......@@ -3,8 +3,8 @@ import os
import argparse
from server_expose import ServerExpose
import time
from DistScopeUtilities.ipaddr import get_ip
from DistScopeUtilities.addresses import server_expose_to_device_port
from DistributedOscilloscope.utilities.ipaddr import get_ip
from DistributedOscilloscope.utilities.addresses import server_expose_to_device_port
import logging.config
from logging_conf import DEFAULT_CONFIG
......
software/nodes/adc_lib_node/server_expose.py → software/DistributedOscilloscope/nodes/adc_lib_node/server_expose.py
View file @ d1f5837a
......@@ -5,8 +5,8 @@ from zmq.utils.monitor import recv_monitor_message
from zmq.utils.monitor import parse_monitor_message
import pickle
import time
from DistScopeUtilities.publisher import Publisher
from DistScopeUtilities.ipaddr import get_ip
from DistributedOscilloscope.utilities.publisher import Publisher
from DistributedOscilloscope.utilities.ipaddr import get_ip
from devices_access import DevicesAccess
import logging
logger = logging.getLogger(__name__)
......
software/server/ADC.py → software/DistributedOscilloscope/server/ADC.py
View file @ d1f5837a
from ADC_configs import Channel
from ADC_configs import InternalTrigger
from ADC_configs import ExternalTrigger
from ADC_configs import AcqConf
from conversion import threshold_mV_to_raw
from .ADC_configs import Channel
from .ADC_configs import InternalTrigger
from .ADC_configs import ExternalTrigger
from .ADC_configs import AcqConf
from .conversion import threshold_mV_to_raw
import logging
logger = logging.getLogger(__name__)
from DistScopeUtilities.zmq_rpc import ZMQ_RPC
from DistScopeUtilities.zmq_rpc import RPC_Error
from DistributedOscilloscope.utilities.zmq_rpc import ZMQ_RPC
from DistributedOscilloscope.utilities.zmq_rpc import RPC_Error
import numpy as np
class ADC:
......
software/DistributedOscilloscope/server/__init__.py 0 → 100644
View file @ d1f5837a
__name__ = 'server'
__version__ = '1.0.0'
software/server/connection_manager.py → software/DistributedOscilloscope/server/connection_manager.py
View file @ d1f5837a
from user_app import UserApplication
from ADC import ADC
from .user_app import UserApplication
from .ADC import ADC
import logging
logger = logging.getLogger(__name__)
......
software/server/expose.py → software/DistributedOscilloscope/server/expose.py
View file @ d1f5837a
......@@ -4,8 +4,8 @@ import zmq
import pickle
import logging
logger = logging.getLogger(__name__)
from DistScopeUtilities.ipaddr import get_ip
from DistScopeUtilities import serialization
from DistributedOscilloscope.utilities.ipaddr import get_ip
from DistributedOscilloscope.utilities import serialization
class Expose():
......
software/server/main_server.py → software/DistributedOscilloscope/server/main_server.py
View file @ d1f5837a
import sys
from connection_manager import ConnectionManager
from zeroconf_listener import ThreadZeroConf
from expose import Expose
from .connection_manager import ConnectionManager
from .zeroconf_listener import ThreadZeroConf
from .expose import Expose
import argparse
from DistScopeUtilities.addresses import server_expose_to_user_port
from DistScopeUtilities.addresses import server_expose_to_device_port
from DistributedOscilloscope.utilities.addresses import server_expose_to_user_port
from DistributedOscilloscope.utilities.addresses import server_expose_to_device_port
import logging.config
from logging_conf import DEFAULT_CONFIG
from .logging_conf import DEFAULT_CONFIG
def main():
......
software/server/user_app.py → software/DistributedOscilloscope/server/user_app.py
View file @ d1f5837a
from ADC import ADC
from conversion import threshold_raw_to_mV
from .ADC import ADC
from .conversion import threshold_raw_to_mV
import logging
import time
from DistScopeUtilities.publisher import Publisher
from DistributedOscilloscope.utilities.publisher import Publisher
logger = logging.getLogger(__name__)
......
software/server/zeroconf_listener.py → software/DistributedOscilloscope/server/zeroconf_listener.py
View file @ d1f5837a
......@@ -3,8 +3,8 @@ import threading
import os
import socket
import logging
from DistScopeUtilities.ipaddr import get_ip
from DistScopeUtilities.publisher import PublisherIPC
from DistributedOscilloscope.utilities.ipaddr import get_ip
from DistributedOscilloscope.utilities.publisher import PublisherIPC
logger = logging.getLogger(__name__)
......
software/DistributedOscilloscope/utilities/__init__.py 0 → 100644
View file @ d1f5837a
__name__ = 'utilities'
__version__ = '1.0.0'
software/DistScopeUtilities/publisher.py → software/DistributedOscilloscope/utilities/publisher.py
View file @ d1f5837a
import zmq
from DistScopeUtilities import serialization
import DistributedOscilloscope.utilities.serialization as serialization
import logging
logger = logging.getLogger(__name__)
......
software/setup.py deleted 100644 → 0
View file @ 70802805
from setuptools import setup, find_packages
setup(
name="DistributedOscilloscope",
version="1.0.0",
packages=['DistScopeUtilities'],
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment