Fix and simplify export data content
This commit is contained in:
parent
167e5136b1
commit
9c5f7e6284
@ -3,7 +3,6 @@ import io
|
|||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
import types
|
import types
|
||||||
from copy import deepcopy
|
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from bokeh.layouts import column, row
|
from bokeh.layouts import column, row
|
||||||
@ -449,11 +448,10 @@ def create():
|
|||||||
def preview_output_button_callback():
|
def preview_output_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 = deepcopy(det_data)
|
export_data = []
|
||||||
for s, export in enumerate(scan_table_source.data["export"]):
|
for s, export in zip(det_data, scan_table_source.data["export"]):
|
||||||
if not export:
|
if export:
|
||||||
if "fit" in export_data[s]:
|
export_data.append(s)
|
||||||
del export_data[s]["fit"]
|
|
||||||
|
|
||||||
pyzebra.export_1D(
|
pyzebra.export_1D(
|
||||||
export_data,
|
export_data,
|
||||||
@ -482,10 +480,10 @@ def create():
|
|||||||
def save_button_callback():
|
def save_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 = deepcopy(det_data)
|
export_data = []
|
||||||
for s, export in enumerate(scan_table_source.data["export"]):
|
for s, export in zip(det_data, scan_table_source.data["export"]):
|
||||||
if not export:
|
if export:
|
||||||
del export_data[s]
|
export_data.append(s)
|
||||||
|
|
||||||
pyzebra.export_1D(
|
pyzebra.export_1D(
|
||||||
export_data,
|
export_data,
|
||||||
|
@ -4,7 +4,6 @@ import itertools
|
|||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
import types
|
import types
|
||||||
from copy import deepcopy
|
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from bokeh.layouts import column, row
|
from bokeh.layouts import column, row
|
||||||
@ -557,10 +556,10 @@ def create():
|
|||||||
def preview_output_button_callback():
|
def preview_output_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 = deepcopy(det_data)
|
export_data = []
|
||||||
for s, export in enumerate(scan_table_source.data["export"]):
|
for s, export in zip(det_data, scan_table_source.data["export"]):
|
||||||
if not export:
|
if export:
|
||||||
del export_data[s]
|
export_data.append(s)
|
||||||
|
|
||||||
pyzebra.export_1D(
|
pyzebra.export_1D(
|
||||||
export_data,
|
export_data,
|
||||||
@ -584,11 +583,10 @@ def create():
|
|||||||
def save_button_callback():
|
def save_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 = deepcopy(det_data)
|
export_data = []
|
||||||
for s, export in enumerate(scan_table_source.data["export"]):
|
for s, export in zip(det_data, scan_table_source.data["export"]):
|
||||||
if not export:
|
if export:
|
||||||
if "fit" in export_data[s]:
|
export_data.append(s)
|
||||||
del export_data[s]["fit"]
|
|
||||||
|
|
||||||
pyzebra.export_1D(
|
pyzebra.export_1D(
|
||||||
export_data,
|
export_data,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user