compact code
This commit is contained in:
@@ -11,7 +11,7 @@ settings = QSettings("Paul Scherrer Institut", "SwissMX")
|
||||
inst_folder = Path(__file__).absolute().parent
|
||||
|
||||
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"]
|
||||
appsconf = configs[endstation]
|
||||
|
||||
|
||||
1224
swissmx.py
1224
swissmx.py
File diff suppressed because it is too large
Load Diff
9
zoom.py
9
zoom.py
@@ -23,14 +23,16 @@ from PyQt5.QtWidgets import (
|
||||
QGridLayout,
|
||||
QLabel,
|
||||
QDoubleSpinBox,
|
||||
QComboBox,
|
||||
QSpinBox,
|
||||
QVBoxLayout,
|
||||
QHBoxLayout,
|
||||
QCheckBox,
|
||||
)
|
||||
from PyQt5.uic import loadUiType
|
||||
|
||||
import backlight, illumination, camera
|
||||
import epics
|
||||
from app_config import settings
|
||||
|
||||
Ui_Zoom, QWidget = loadUiType("zoom.ui")
|
||||
MIN_ZOOM = 1
|
||||
@@ -330,14 +332,11 @@ if __name__ == "__main__":
|
||||
args = parser.parse_args()
|
||||
|
||||
import sys
|
||||
import backlight
|
||||
import illumination
|
||||
import camera
|
||||
|
||||
_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'
|
||||
app = QApplication(sys.argv)
|
||||
from app_config import settings, appsconf
|
||||
from app_config import appsconf
|
||||
|
||||
#from PyQt5 import QtGui
|
||||
#qtawesome.load_font("material","MaterialIcons-Regular.ttf","MaterialIcons-Regular.json","fonts/",)
|
||||
|
||||
Reference in New Issue
Block a user