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

cleaner app starting, new application settings class

Browse Source
This commit is contained in:
zamofing_t
2022-07-20 17:52:55 +02:00
parent 4a6db36805
commit 569ce8a78d
8 changed files with 224 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
zoom.py
View File

@@ -32,7 +32,7 @@ from PyQt5.uic import loadUiType
import backlight, illumination, camera
import epics
from app_config import settings
from app_config import AppCfg #settings
Ui_Zoom, QWidget = loadUiType("zoom.ui")
MIN_ZOOM = 1
@@ -50,19 +50,21 @@ class Zoom(QGroupBox, Ui_Zoom):
self.setTitle("Sample Viewing")
def configure(self):
keys = settings.allKeys()
app=QApplication.instance()
cfg=app._cfg
keys=cfg.allKeys()
if "sample_viewing/zoom_buttons" not in keys:
settings.setValue("sample_viewing/zoom_buttons",
cfg.setValue("sample_viewing/zoom_buttons",
json.dumps([(1, "1"),(200, "200"),(400, "400"),(600, "600"),(800, "800"),(1000, "1000"),]),)
buttons = json.loads(settings.value("sample_viewing/zoom_buttons"))
buttons = json.loads(cfg.value("sample_viewing/zoom_buttons"))
if "backlight/backlight_pv" not in keys:
settings.setValue("backlight/backlight_pv", "SAR-EXPMX:MOT_BLGT")
backlight_pv = settings.value("backlight/backlight_pv")
cfg.setValue("backlight/backlight_pv", "SAR-EXPMX:MOT_BLGT")
backlight_pv = cfg.value("backlight/backlight_pv")
if "sample_viewing/zoom_api" not in keys:
settings.setValue("sample_viewing/zoom_api", "rest://pc12818.psi.ch:9999")
zoom_api = settings.value("sample_viewing/zoom_api")
cfg.setValue("sample_viewing/zoom_api", "rest://pc12818.psi.ch:9999")
zoom_api = cfg.value("sample_viewing/zoom_api")
#self.get_zoom_pv = PV(zoom_api + ":ZOOM-RBV", callback=self.zoom_update_cb)
#self.status_pv = PV(zoom_api + ":ZOOM-STATUS", callback=self.zoom_status_cb)