Commit e408953c authored by Laurent Claustre's avatar Laurent Claustre

Merge branch 'flint_lima_fix' into 'master'

flint: fixed lima image display

Closes #787

See merge request !1334
parents c1c758d3 affe4a9f
Pipeline #11508 passed with stages
in 32 minutes and 3 seconds
......@@ -466,7 +466,7 @@ class Flint:
channel_data_node = data["channel_data_node"]
channel_data_node.from_stream = True
image_view = channel_data_node.get(-1)
image_data = image_view.get(-1)
image_data = image_view.get_image(-1)
self.update_data(plot.plot_id, channel_name, image_data)
plot_image = plot.getImage(channel_name) # returns last plotted image
if plot_image is None:
......@@ -476,7 +476,7 @@ class Flint:
data_event = (
self.data_event[master_name]
.setdefault(data_type, {})
.setdefault(data["channel_index"], gevent.event.Event())
.setdefault(data.get("channel_index", 0), gevent.event.Event())
)
data_event.set()
......
......@@ -291,7 +291,7 @@ class LivePlot1D(qt.QWidget):
x_axis, y_axis = axis_names
legend = "%s -> %s" % (x_axis, y_axis)
plot = self.silx_plot.getCurve(legend)
if plot is not None:
if plot is not None and plot.isVisible():
# plot is displayed
if self._curves.get(plot, 0) > data_len:
# existing curve need to be removed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment