apps4ops/bdbase
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrections to save-to-epics

Browse Source
This commit is contained in:
chrin
2023-07-28 10:13:55 +02:00
parent 7580203c2b
commit 6148e37df2
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
base.py
View File

@@ -146,7 +146,8 @@ class BaseWindow(QMainWindow):
try:
resultsSeq = self.settings.data["GUI"]["resultsSeq"]
titleSeq = self.settings.data["GUI"]["subResultsTabTitle"]
fig_data = self.all_data['Figure data']
if self.all_data:
fig_data = self.all_data['Figure data']
for i, (nfig, name) in enumerate(zip(resultsSeq, titleSeq)):
extract_and_attach(i, nfig, name, fig_data)
except KeyError as ex:
@@ -156,7 +157,8 @@ class BaseWindow(QMainWindow):
try:
resultsSeq = self.settings.data["GUI2"]["resultsSeq"]
titleSeq = self.settings.data["GUI2"]["subResultsTabTitle"]
fig_data = self.all_data_2['Figure data']
if self.all_data_2:
fig_data = self.all_data_2['Figure data']
for i, (nfig, name) in enumerate(zip(resultsSeq, titleSeq)):
extract_and_attach(i, nfig, name, fig_data)
except KeyError as ex:
@@ -1505,7 +1507,18 @@ class BaseWindow(QMainWindow):
self.cafe.open(pv_names)
self.cafe.openNowAndWait(0.4)
status, status_list = self.cafe.setCompoundList(pv_names, pv_values)
status = self.cyca.ICAFE_NORMAL
status_list = []
try:
status, status_list = self.cafe.setCompoundList(pv_names, pv_values)
except:
print("Exception raised in cafe.setCompoundList", flush=True)
status = self.cyca.ICAFE_NORMAL
for pv, val in zip(pv_names, pv_values):
print("pv/val", pv, val, flush=True)
status_list.append(self.cyca.ICAFE_NORMAL)
if status != self.cyca.ICAFE_NORMAL:
ibad = 0