Commit e3684cb2 authored by Maxime Perrotin's avatar Maxime Perrotin

Fix issue with message ordering in MSC streams

parent 7669cba4
......@@ -5,7 +5,7 @@
Main GUI widget
Copyright (c) 2012-2018 European Space Agency
Copyright (c) 2012-2019 European Space Agency
Designed and implemented by Maxime Perrotin
......@@ -16,7 +16,7 @@
__author__ = "Maxime Perrotin"
__license__ = "LGPLv3"
__version__ = "1.7.5"
__version__ = "1.7.6"
__url__ = "https://taste.tools"
import sys
......
......@@ -5,7 +5,7 @@
Tool main entry point (when used standalone)
Copyright (c) 2012-2018 European Space Agency
Copyright (c) 2012-2019 European Space Agency
Designed and implemented by Maxime Perrotin
......@@ -113,9 +113,12 @@ class MsgQ_Poller(QThread):
time.sleep(0.005)
continue
self.log.debug('MsgQ poller: received message')
while (g_tmPool[messageReceivedType].pendingTM):
# Wait until possible previous message has been consumed
time.sleep(0.005)
# make sure any previous messages is consumed first
for tmEditor in g_tmPool.viewvalues():
while tmEditor.pendingTM:
time.sleep(0.005)
# Copy the message into the ASN.1 type instance of the editor
g_tmPool[messageReceivedType].asn1Instance.SetData(pDataFromMQ)
g_tmPool[messageReceivedType].pendingTM = True
......@@ -310,7 +313,7 @@ def gui():
editMSC.pressed.connect(msc.edit)
myWidget.mscStop.connect(msc.stopMscRecording)
# Create toolbar with a button to start/stop MSC recording and streamind
# Create toolbar with a button to start/stop MSC recording and streaming
toolbar = myWidget.addToolBar('toolbar')
toolbar.setObjectName('toolbar')
mscButton = toolbar.addAction('MSC')
......
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