sf-mx/SwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compact code

Browse Source
This commit is contained in:
zamofing_t
2022-07-15 12:29:00 +02:00
parent db7e5e537f
commit d1653e9412
3 changed files with 427 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app_config.py
View File

@@ -11,7 +11,7 @@ settings = QSettings("Paul Scherrer Institut", "SwissMX")
inst_folder = Path(__file__).absolute().parent inst_folder = Path(__file__).absolute().parent
config_file = inst_folder / "swissmx.yaml" config_file = inst_folder / "swissmx.yaml"
configs = yaml.load(config_file.read_text()) configs = yaml.load(config_file.read_text(),Loader=yaml.FullLoader)
endstation = configs["configure_for"] endstation = configs["configure_for"]
appsconf = configs[endstation] appsconf = configs[endstation]

1224
swissmx.py
View File

File diff suppressed because it is too large Load Diff

9
zoom.py
View File

@@ -23,14 +23,16 @@ from PyQt5.QtWidgets import (
QGridLayout, QGridLayout,
QLabel, QLabel,
QDoubleSpinBox, QDoubleSpinBox,
QComboBox,
QSpinBox, QSpinBox,
QVBoxLayout, QVBoxLayout,
QHBoxLayout, QHBoxLayout,
QCheckBox, QCheckBox,
) )
from PyQt5.uic import loadUiType from PyQt5.uic import loadUiType
import backlight, illumination, camera
import epics import epics
from app_config import settings
Ui_Zoom, QWidget = loadUiType("zoom.ui") Ui_Zoom, QWidget = loadUiType("zoom.ui")
MIN_ZOOM = 1 MIN_ZOOM = 1
@@ -330,14 +332,11 @@ if __name__ == "__main__":
args = parser.parse_args() args = parser.parse_args()
import sys import sys
import backlight
import illumination
import camera
_log.info('Arguments:{}'.format(args.__dict__)) _log.info('Arguments:{}'.format(args.__dict__))
os.environ['EPICS_CA_ADDR_LIST'] = '129.129.244.255 sf-saresc-cagw.psi.ch:5062 sf-saresc-cagw.psi.ch:5066' os.environ['EPICS_CA_ADDR_LIST'] = '129.129.244.255 sf-saresc-cagw.psi.ch:5062 sf-saresc-cagw.psi.ch:5066'
app = QApplication(sys.argv) app = QApplication(sys.argv)
from app_config import settings, appsconf from app_config import appsconf
#from PyQt5 import QtGui #from PyQt5 import QtGui
#qtawesome.load_font("material","MaterialIcons-Regular.ttf","MaterialIcons-Regular.json","fonts/",) #qtawesome.load_font("material","MaterialIcons-Regular.ttf","MaterialIcons-Regular.json","fonts/",)