zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preview/Download export data changes

Browse Source 
* Preview button now sets data for downloading
This commit is contained in:
usov_i 2021-03-10 11:43:07 +01:00
parent 9c5f7e6284
commit 0e97f44cc7
2 changed files with 54 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
pyzebra/app/panel_ccl_integrate.py
View File

@ -46,19 +46,17 @@ from pyzebra.ccl_io import AREA_METHODS
javaScript = """ javaScript = """
setTimeout(function() { if (js_data.data['content'][0] === "") return 0;
if (js_data.data['cont'][0] === "") return 0; const filename = 'output' + js_data.data['ext'][0]
const filename = 'output' + js_data.data['ext'][0] const blob = new Blob([js_data.data['content'][0]], {type: 'text/plain'})
const blob = new Blob([js_data.data['cont'][0]], {type: 'text/plain'}) const link = document.createElement('a');
const link = document.createElement('a'); document.body.appendChild(link);
document.body.appendChild(link); const url = window.URL.createObjectURL(blob);
const url = window.URL.createObjectURL(blob); link.href = url;
link.href = url; link.download = filename;
link.download = filename; link.click();
link.click(); window.URL.revokeObjectURL(url);
window.URL.revokeObjectURL(url); document.body.removeChild(link);
document.body.removeChild(link);
}, 3000);
""" """
PROPOSAL_PATH = "/afs/psi.ch/project/sinqdata/2020/zebra/" PROPOSAL_PATH = "/afs/psi.ch/project/sinqdata/2020/zebra/"
@ -68,8 +66,8 @@ def create():
det_data = {} det_data = {}
fit_params = {} fit_params = {}
js_data = { js_data = {
".comm": ColumnDataSource(data=dict(cont=[], ext=[])), ".comm": ColumnDataSource(data=dict(content=[], ext=[])),
".incomm": ColumnDataSource(data=dict(cont=[], ext=[])), ".incomm": ColumnDataSource(data=dict(content=[], ext=[])),
} }
def proposal_textinput_callback(_attr, _old, new): def proposal_textinput_callback(_attr, _old, new):
@ -443,9 +441,9 @@ def create():
lorentz_toggle = Toggle(label="Lorentz Correction", default_size=145) lorentz_toggle = Toggle(label="Lorentz Correction", default_size=145)
preview_output_textinput = TextAreaInput(title="Export file preview:", width=500, height=400) export_preview_textinput = TextAreaInput(title="Export preview:", width=500, height=400)
def preview_output_button_callback(): def preview_button_callback():
with tempfile.TemporaryDirectory() as temp_dir: with tempfile.TemporaryDirectory() as temp_dir:
temp_file = temp_dir + "/temp" temp_file = temp_dir + "/temp"
export_data = [] export_data = []
@ -466,44 +464,23 @@ def create():
fname = temp_file + ext fname = temp_file + ext
if os.path.isfile(fname): if os.path.isfile(fname):
with open(fname) as f: with open(fname) as f:
exported_content += f"{ext} file:\n" + f.read() content = f.read()
exported_content += f"{ext} file:\n" + content
else:
content = ""
preview_output_textinput.value = exported_content js_data[ext].data.update(content=[content], ext=[ext])
preview_output_button = Button(label="Preview file", default_size=200) export_preview_textinput.value = exported_content
preview_output_button.on_click(preview_output_button_callback)
preview_button = Button(label="Preview", default_size=200)
preview_button.on_click(preview_button_callback)
hkl_precision_select = Select( hkl_precision_select = Select(
title="hkl precision:", options=["2", "3", "4"], value="2", default_size=80 title="hkl precision:", options=["2", "3", "4"], value="2", default_size=80
) )
def save_button_callback(): save_button = Button(label="Download preview", button_type="success", default_size=200)
with tempfile.TemporaryDirectory() as temp_dir:
temp_file = temp_dir + "/temp"
export_data = []
for s, export in zip(det_data, scan_table_source.data["export"]):
if export:
export_data.append(s)
pyzebra.export_1D(
export_data,
temp_file,
area_method=AREA_METHODS[int(area_method_radiobutton.active)],
lorentz=lorentz_toggle.active,
hkl_precision=int(hkl_precision_select.value),
)
for ext in (".comm", ".incomm"):
fname = temp_file + ext
if os.path.isfile(fname):
with open(fname) as f:
cont = f.read()
else:
cont = ""
js_data[ext].data.update(cont=[cont], ext=[ext])
save_button = Button(label="Download file", button_type="success", default_size=200)
save_button.on_click(save_button_callback)
save_button.js_on_click(CustomJS(args={"js_data": js_data[".comm"]}, code=javaScript)) save_button.js_on_click(CustomJS(args={"js_data": js_data[".comm"]}, code=javaScript))
save_button.js_on_click(CustomJS(args={"js_data": js_data[".incomm"]}, code=javaScript)) save_button.js_on_click(CustomJS(args={"js_data": js_data[".incomm"]}, code=javaScript))
@ -525,10 +502,8 @@ def create():
) )
export_layout = column( export_layout = column(
preview_output_textinput, export_preview_textinput,
row( row(hkl_precision_select, column(Spacer(height=19), row(preview_button, save_button))),
hkl_precision_select, column(Spacer(height=19), row(preview_output_button, save_button))
),
) )
tab_layout = column( tab_layout = column(

76
pyzebra/app/panel_param_study.py
View File

@ -51,19 +51,17 @@ import pyzebra
from pyzebra.ccl_io import AREA_METHODS from pyzebra.ccl_io import AREA_METHODS
javaScript = """ javaScript = """
setTimeout(function() { if (js_data.data['content'][0] === "") return 0;
if (js_data.data['cont'][0] === "") return 0; const filename = 'output' + js_data.data['ext'][0]
const filename = 'output' + js_data.data['ext'][0] const blob = new Blob([js_data.data['content'][0]], {type: 'text/plain'})
const blob = new Blob([js_data.data['cont'][0]], {type: 'text/plain'}) const link = document.createElement('a');
const link = document.createElement('a'); document.body.appendChild(link);
document.body.appendChild(link); const url = window.URL.createObjectURL(blob);
const url = window.URL.createObjectURL(blob); link.href = url;
link.href = url; link.download = filename;
link.download = filename; link.click();
link.click(); window.URL.revokeObjectURL(url);
window.URL.revokeObjectURL(url); document.body.removeChild(link);
document.body.removeChild(link);
}, 3000);
""" """
PROPOSAL_PATH = "/afs/psi.ch/project/sinqdata/2020/zebra/" PROPOSAL_PATH = "/afs/psi.ch/project/sinqdata/2020/zebra/"
@ -78,8 +76,8 @@ def create():
det_data = [] det_data = []
fit_params = {} fit_params = {}
js_data = { js_data = {
".comm": ColumnDataSource(data=dict(cont=[], ext=[])), ".comm": ColumnDataSource(data=dict(content=[], ext=[])),
".incomm": ColumnDataSource(data=dict(cont=[], ext=[])), ".incomm": ColumnDataSource(data=dict(content=[], ext=[])),
} }
def proposal_textinput_callback(_attr, _old, new): def proposal_textinput_callback(_attr, _old, new):
@ -551,9 +549,9 @@ def create():
lorentz_toggle = Toggle(label="Lorentz Correction", default_size=145) lorentz_toggle = Toggle(label="Lorentz Correction", default_size=145)
preview_output_textinput = TextAreaInput(title="Export file preview:", width=450, height=400) export_preview_textinput = TextAreaInput(title="Export preview:", width=450, height=400)
def preview_output_button_callback(): def preview_button_callback():
with tempfile.TemporaryDirectory() as temp_dir: with tempfile.TemporaryDirectory() as temp_dir:
temp_file = temp_dir + "/temp" temp_file = temp_dir + "/temp"
export_data = [] export_data = []
@ -573,39 +571,19 @@ def create():
fname = temp_file + ext fname = temp_file + ext
if os.path.isfile(fname): if os.path.isfile(fname):
with open(fname) as f: with open(fname) as f:
exported_content += f"{ext} file:\n" + f.read() content = f.read()
exported_content += f"{ext} file:\n" + content
preview_output_textinput.value = exported_content
preview_output_button = Button(label="Preview file", default_size=220)
preview_output_button.on_click(preview_output_button_callback)
def save_button_callback():
with tempfile.TemporaryDirectory() as temp_dir:
temp_file = temp_dir + "/temp"
export_data = []
for s, export in zip(det_data, scan_table_source.data["export"]):
if export:
export_data.append(s)
pyzebra.export_1D(
export_data,
temp_file,
area_method=AREA_METHODS[int(area_method_radiobutton.active)],
lorentz=lorentz_toggle.active,
)
for ext in (".comm", ".incomm"):
fname = temp_file + ext
if os.path.isfile(fname):
with open(fname) as f:
cont = f.read()
else: else:
cont = "" content = ""
js_data[ext].data.update(cont=[cont], ext=[ext])
save_button = Button(label="Download file", button_type="success", default_size=220) js_data[ext].data.update(content=[content], ext=[ext])
save_button.on_click(save_button_callback)
export_preview_textinput.value = exported_content
preview_button = Button(label="Preview", default_size=220)
preview_button.on_click(preview_button_callback)
save_button = Button(label="Download preview", button_type="success", default_size=220)
save_button.js_on_click(CustomJS(args={"js_data": js_data[".comm"]}, code=javaScript)) save_button.js_on_click(CustomJS(args={"js_data": js_data[".comm"]}, code=javaScript))
save_button.js_on_click(CustomJS(args={"js_data": js_data[".incomm"]}, code=javaScript)) save_button.js_on_click(CustomJS(args={"js_data": js_data[".incomm"]}, code=javaScript))
@ -633,7 +611,7 @@ def create():
append_upload_button, append_upload_button,
) )
export_layout = column(preview_output_textinput, row(preview_output_button, save_button)) export_layout = column(export_preview_textinput, row(preview_button, save_button))
tab_layout = column( tab_layout = column(
row(import_layout, scan_layout, plots, Spacer(width=30), export_layout), row(import_layout, scan_layout, plots, Spacer(width=30), export_layout),